From 305ae510c866d84d919048d4d888cfb00431db98 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 12 Oct 2023 15:20:49 +0200
Subject: [PATCH] remove --spec
---
goofy-client/apps/goofy-e2e/Jenkinsfile | 6 ++++--
goofy-client/package.json | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile
index c3aae82fdf..ae5d40ce8f 100644
--- a/goofy-client/apps/goofy-e2e/Jenkinsfile
+++ b/goofy-client/apps/goofy-e2e/Jenkinsfile
@@ -611,7 +611,7 @@ String runTests(String bezeichner, String reportFolder, Integer dbPort, String s
try {
dir('goofy-client'){
sh "npm run cypress:version"
- sh "npm run cypress:ci-run --CONFIG=${configFile} --REPORT_FOLDER=${reportFolder} --SPEC=${spec}"
+ sh "npm run cypress:ci-run --CONFIG=${configFile} --REPORT_FOLDER=${reportFolder}"
}
} catch (Exception e) {
printNpmDebugLog()
@@ -670,6 +670,8 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
config.screenshotsFolder = "./reports/${testFolder}/screenshots" as String
config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
+ config.specPattern = "src/e2e/${testFolder}/*.cy.{js,jsx,ts,tsx}" as String
+
config.env.put("search", getElasticsearchEnv(namespace))
config.env.put("userManager", getUserManagerEnv(namespace, dbPort))
@@ -678,7 +680,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
sh "cat ${configName}"
}
- return "cypress-ci-"+testFolder+".config.ts"
+ return configName
}
String makePasswordUrlConform(String password) {
diff --git a/goofy-client/package.json b/goofy-client/package.json
index 0ab653f8d9..2845ef85f7 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 -- --spec ${npm_config_spec} --config-file=${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 -- --config-file=${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