Commit 228a72f9 authored by ourfbht's avatar ourfbht
Browse files

Merge branch 'master' into validators

parents b450342a 86de61ab

Jenkinsfile

+9 −11
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ pipeline { 
                script {

                    docker.image('maven:3-alpine').inside { c ->

                        checkout scm

						sh 'rm src/main/resources/application.properties'

                        sh 'mv src/main/resources/application.properties.production src/main/resources/application.properties'

                        sh 'mvn -B -DskipTests clean package'

						stash name: 'mentorarc', includes: '**'
@@ -68,18 +69,15 @@ pipeline { 
                            sh 'while ! mysqladmin ping -hdb --silent; do sleep 1; done'

                        }



						docker.image('maven:3-alpine').withRun("--link ${c.id}:db") { d ->

							docker.image('maven:3-alpine').inside("--link ${c.id}:db") { e ->

								unstash 'mentorarc'

								sh 'java -jar ./MentorArc/target/MentorArc-0.0.1-SNAPSHOT.jar >/dev/null 2>&1 &'



								docker.image('lucienmoor/katalon-for-jenkins:latest').inside("--link ${e.id}:mentorarc") { 

									sh 'sleep 20'

									sh 'curl mentorarc:8081'

								}

							}

						docker.image('lucienmoor/katalon-for-jenkins:latest').inside("--link ${c.id}:db") {

							unstash "mentorarc"

							sh 'java -jar target/MentorArc-0.0.1-SNAPSHOT.jar >/dev/null 2>&1 &'

							sh 'sleep 30'



							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="Chrome (headless)" -Djava.awt.headless'



							cleanWs()

						}

                    }

                }

Katalon/Scripts/CreateHelpRequest/Script1587486079269.groovy

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ import com.kms.katalon.core.testdata.TestData as TestData 
import com.kms.katalon.core.testobject.TestObject as TestObject

import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS

import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI

import com.kms.katalon.core.windows.keyword.WindowsBuiltinKeywords as Windows

import internal.GlobalVariable as GlobalVariable



WebUI.click(findTestObject('Page_MentorArc/Page_MentorArc/a_Create a request'))

Katalon/Scripts/CreateProposition/Script1587478327767.groovy

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ import com.kms.katalon.core.testdata.TestData as TestData 
import com.kms.katalon.core.testobject.TestObject as TestObject

import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS

import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI

import com.kms.katalon.core.windows.keyword.WindowsBuiltinKeywords as Windows

import internal.GlobalVariable as GlobalVariable



WebUI.click(findTestObject('Page_MentorArc/Page_MentorArc/a_Create a proposition'))

Katalon/Scripts/Register-Login-Poulain-Mentor/Script1587477779396.groovy

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ import com.kms.katalon.core.testdata.TestData as TestData 
import com.kms.katalon.core.testobject.TestObject as TestObject

import com.kms.katalon.core.webservice.keyword.WSBuiltInKeywords as WS

import com.kms.katalon.core.webui.keyword.WebUiBuiltInKeywords as WebUI

import com.kms.katalon.core.windows.keyword.WindowsBuiltinKeywords as Windows

import internal.GlobalVariable as GlobalVariable



WebUI.openBrowser('')