jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-11-06 09:09:19 +02:00
Code Issues Releases Activity

Revert changes from PR #3982 (#4015)

Browse Source
This commit is contained in:
Srinikitha Kondreddy
2022-09-16 13:12:29 +02:00
committed by GitHub
parent 4da4ced95e
commit 25bfc61e95
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/groovy/templates/PiperPipelineStageAcceptanceTest.groovy
View File

@@ -76,11 +76,6 @@ class PiperPipelineStageAcceptanceTest extends BasePiperTest {
stepParameters.uiVeri5ExecuteTests = m stepParameters.uiVeri5ExecuteTests = m
}) })
helper.registerAllowedMethod('npmExecuteScripts', [Map.class], {m ->
stepsCalled.add('npmExecuteScripts')
stepParameters.npmExecuteScripts = m
})
helper.registerAllowedMethod('npmExecuteEndToEndTests', [Map.class], {m -> helper.registerAllowedMethod('npmExecuteEndToEndTests', [Map.class], {m ->
stepsCalled.add('npmExecuteEndToEndTests') stepsCalled.add('npmExecuteEndToEndTests')
stepParameters.npmExecuteEndToEndTests = m stepParameters.npmExecuteEndToEndTests = m
@@ -99,7 +94,7 @@ class PiperPipelineStageAcceptanceTest extends BasePiperTest {
script: nullScript, script: nullScript,
juStabUtils: utils juStabUtils: utils
) )
assertThat(stepsCalled, not(anyOf(hasItem('cloudFoundryDeploy'), hasItem('neoDeploy'), hasItem('kubernetesDeploy'), hasItem('healthExecuteCheck'), hasItem('newmanExecute'), hasItem('uiVeri5ExecuteTests'), hasItem('npmExecuteScripts'), hasItem('gaugeExecuteTests')))) assertThat(stepsCalled, not(anyOf(hasItem('cloudFoundryDeploy'), hasItem('neoDeploy'), hasItem('kubernetesDeploy'), hasItem('healthExecuteCheck'), hasItem('newmanExecute'), hasItem('uiVeri5ExecuteTests'), hasItem('gaugeExecuteTests'))))
} }
@@ -189,18 +184,6 @@ class PiperPipelineStageAcceptanceTest extends BasePiperTest {
assertThat(stepsCalled, hasItems('uiVeri5ExecuteTests', 'testsPublishResults')) assertThat(stepsCalled, hasItems('uiVeri5ExecuteTests', 'testsPublishResults'))
} }
@Test
void testAcceptanceStageNpmExecuteScripts() {
jsr.step.piperPipelineStageAcceptance(
script: nullScript,
juStabUtils: utils,
npmExecuteScripts: true
)
assertThat(stepsCalled, hasItem('npmExecuteScripts'))
}
@Test @Test
void testAcceptanceNpmExecuteEndToEndTests() { void testAcceptanceNpmExecuteEndToEndTests() {

10
vars/piperPipelineStageAcceptance.groovy
View File

@@ -32,8 +32,6 @@ import static com.sap.piper.Prerequisites.checkScript
'testsPublishResults', 'testsPublishResults',
/** Performs end-to-end UI testing using UIVeri5 test framework against the deployed application/service. */ /** Performs end-to-end UI testing using UIVeri5 test framework against the deployed application/service. */
'uiVeri5ExecuteTests', 'uiVeri5ExecuteTests',
/** Executes npm scripts to run frontend unit tests. */
'npmExecuteScripts',
/** Executes end to end tests by running the npm script 'ci-e2e' defined in the project's package.json file. */ /** Executes end to end tests by running the npm script 'ci-e2e' defined in the project's package.json file. */
'npmExecuteEndToEndTests' 'npmExecuteEndToEndTests'
] ]
@@ -68,7 +66,6 @@ void call(Map parameters = [:]) {
.addIfEmpty('neoDeploy', script.commonPipelineEnvironment.configuration.runStep?.get(stageName)?.neoDeploy) .addIfEmpty('neoDeploy', script.commonPipelineEnvironment.configuration.runStep?.get(stageName)?.neoDeploy)
.addIfEmpty('newmanExecute', script.commonPipelineEnvironment.configuration.runStep?.get(stageName)?.newmanExecute) .addIfEmpty('newmanExecute', script.commonPipelineEnvironment.configuration.runStep?.get(stageName)?.newmanExecute)
.addIfEmpty('uiVeri5ExecuteTests', script.commonPipelineEnvironment.configuration.runStep?.get(stageName)?.uiVeri5ExecuteTests) .addIfEmpty('uiVeri5ExecuteTests', script.commonPipelineEnvironment.configuration.runStep?.get(stageName)?.uiVeri5ExecuteTests)
.addIfEmpty('npmExecuteScripts', script.commonPipelineEnvironment.configuration.runStep?.get(stageName)?.npmExecuteScripts)
.addIfEmpty('npmExecuteEndToEndTests', script.commonPipelineEnvironment.configuration.runStep?.get(stageName)?.npmExecuteEndToEndTests) .addIfEmpty('npmExecuteEndToEndTests', script.commonPipelineEnvironment.configuration.runStep?.get(stageName)?.npmExecuteEndToEndTests)
.use() .use()
@@ -132,13 +129,6 @@ void call(Map parameters = [:]) {
} }
} }
if (config.npmExecuteScripts) {
durationMeasure(script: script, measurementName: 'npmExecuteScripts_duration') {
publishResults = true
npmExecuteScripts script: script
}
}
if (config.npmExecuteEndToEndTests) { if (config.npmExecuteEndToEndTests) {
durationMeasure(script: script, measurementName: 'npmExecuteEndToEndTests_duration') { durationMeasure(script: script, measurementName: 'npmExecuteEndToEndTests_duration') {
npmExecuteEndToEndTests script: script, stageName: stageName npmExecuteEndToEndTests script: script, stageName: stageName