Commit fbcd93ca authored by roxane.carraux's avatar roxane.carraux
Browse files

Merge branch 'master' into search

parents f5d02d21 cd95eb1e

Jenkinsfile

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ pipeline { 
							sh 'cat /test.log'

							sh 'wget localhost:8081 -O test && cat test'

							sh 'Xvfb :99 &'

							sh '/Katalon_Studio_Linux_64-5.7.1/katalon -noSplash  -runMode=console -projectPath="$(pwd)/Katalon/Mentorarc-Katalon.prj" -retry=1 -testSuitePath="Test Suites/Test Suite" -executionProfile="default" -browserType="Firefox (headless)" -Djava.awt.headless'

							sh '/Katalon_Studio_Linux_64-5.7.1/katalon -noSplash  -runMode=console -projectPath="$(pwd)/Katalon/Mentorarc-Katalon.prj" -retry=1 -testSuitePath="Test Suites/Test Suite" -executionProfile="default" -browserType="Chrome (headless)" -Djava.awt.headless'



							cleanWs()

						}

src/main/resources/data.sql

+1 −11
Original line number Diff line number Diff line
@@ -9,13 +9,3 @@ WHERE NOT EXISTS (SELECT * FROM `auth_role` WHERE `auth_role_id`=2); 
INSERT INTO `auth_role` (`auth_role_id`, `role_desc`, `role_name`)

Select 3, 'This user can offer help', 'MENTOR'

WHERE NOT EXISTS (SELECT * FROM `auth_role` WHERE `auth_role_id`=3);
 
 No newline at end of file
 


INSERT INTO `auth_user` (`auth_user_id`, `email`, `password`, `username`) VALUES

(1, 'admin@admin.admin', '$2a$10$mHJ3ElBZ.BZkneNA25fEVOJdqEjwnXS9MduHsO5Dpr2R0.4W0/o0G', 'admin'),

(2, 'poulain@poulain.poulain', '$2a$10$TWx7iNFOOgJpcp2.o56Sf.H0d9Qj/JQErrUSpVO.R9ilfckDEd18a', 'poulain'),

(3, 'mentor@mentor.mentor', '$2a$10$isiJ7bXkYi7.6SHW9XRcAeQGXO1bWSLYZBVFr7Oljwn3BjzIBcPEm', 'mentor');



INSERT INTO `auth_user_role` (`auth_user_id`, `auth_role_id`) VALUES

(1, 1),

(2, 2),

(3, 3);
 
 No newline at end of file