From dff1a2d15c006ec23d0d627b93540b37ef4c78f0 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 28 Sep 2023 15:08:44 +0200
Subject: [PATCH] OZG-3934 Use new Cypress configuration parameter (2)
---
goofy-client/apps/goofy-e2e/Jenkinsfile | 5 +++--
goofy-client/package.json | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile
index 50fd697a3f..40bbc31562 100644
--- a/goofy-client/apps/goofy-e2e/Jenkinsfile
+++ b/goofy-client/apps/goofy-e2e/Jenkinsfile
@@ -615,11 +615,12 @@ Void publishE2ETestResult(String reportFolder, String reportName) {
String runTests(String bezeichner, String reportFolder, Integer dbPort, String stageName) {
def config = generateCypressConfig(bezeichner, reportFolder, dbPort)
+ def specFolder = "apps/goofy-e2e/src/e2e/${reportFolder}"
try {
dir("goofy-client") {
sh "npm run cypress:version"
- sh "npm run cypress:ci-run --CONFIG='${config}' --REPORT_FOLDER=${reportFolder}"
+ sh "npm run cypress:ci-run --CONFIG='${config}' --REPORT_FOLDER=${reportFolder} --SPEC=${specFolder}"
}
} catch (Exception e) {
printNpmDebugLog()
@@ -669,7 +670,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
config.env.keycloakRealm = namespace as String
config.env.keycloakClient = "alfa" as String
config.env.sabineUuid = getKeycloakUuid(namespace, "sabine") as String
- config.integrationFolder = "./src/integration/${testFolder}" as String
+ config.integrationFolder = "./src/e2e/${testFolder}" as String
config.videosFolder = "./reports/${testFolder}/videos" as String
config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String
config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
diff --git a/goofy-client/package.json b/goofy-client/package.json
index f3cc6f84ca..8ad5147e3d 100644
--- a/goofy-client/package.json
+++ b/goofy-client/package.json
@@ -39,7 +39,7 @@
"cypress:version": "npx cypress version",
"cypress:install": "npx cypress install",
"cypress:open": "npx cypress open --project apps/goofy-e2e",
- "cypress:ci-run": "npm run cypress:delete-old-reports --REPORT_FOLDER=${npm_config_report_folder} ; NO_COLOR=1 npm run cypress:run -- --config=${npm_config_config} ; test=$(echo \"$?\") ; npm run cypress:pre-merge --REPORT_FOLDER=${npm_config_report_folder} ; npm run cypress:generate-report --REPORT_FOLDER=${npm_config_report_folder} ; exit $test",
+ "cypress:ci-run": "npm run cypress:delete-old-reports --REPORT_FOLDER=${npm_config_report_folder} ; NO_COLOR=1 npm run cypress:run -- --spec ${npm_config_spec} --config=${npm_config_config} ; test=$(echo \"$?\") ; npm run cypress:pre-merge --REPORT_FOLDER=${npm_config_report_folder} ; npm run cypress:generate-report --REPORT_FOLDER=${npm_config_report_folder} ; exit $test",
"cypress:delete-old-reports": "REPORT_FOLDER=${npm_config_report_folder} node apps/goofy-e2e/src/support/delete-old-reports.ts",
"cypress:pre-merge": "REPORT_FOLDER=${npm_config_report_folder} node apps/goofy-e2e/src/support/pre-merge.ts",
"cypress:generate-report": "npm run cypress:merge-report --REPORT_FOLDER=${npm_config_report_folder} ; npm run cypress:generate-html --REPORT_FOLDER=${npm_config_report_folder}",
--
GitLab