From baa7327fd39fa2e43e66ba820a92a890b070699b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 30 Nov 2022 09:26:30 +0100
Subject: [PATCH] OZG-2958 OZG-3245 Fix Parameterization for NPM 8
---
goofy-client/package.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/goofy-client/package.json b/goofy-client/package.json
index 6746edb6cd..5b767ad4d6 100644
--- a/goofy-client/package.json
+++ b/goofy-client/package.json
@@ -37,12 +37,12 @@
"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 ; npm run cypress:run -- --config-file ./$npm_config_CONFIG_FILE ; 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",
- "cypress:merge-report": "mochawesome-merge apps/goofy-e2e/reports/$npm_config_REPORT_FOLDER/mochawesome-report/**/*.json > apps/goofy-e2e/reports/$npm_config_REPORT_FOLDER/report.json",
- "cypress:generate-html": "marge apps/goofy-e2e/reports/$npm_config_REPORT_FOLDER/report.json -f report -o apps/goofy-e2e/reports/$npm_config_REPORT_FOLDER",
+ "cypress:ci-run": "npm run cypress:delete-old-reports --REPORT_FOLDER=${npm_config_report_folder} ; npm run cypress:run -- --config-file ./$npm_config_CONFIG_FILE ; 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}",
+ "cypress:merge-report": "mochawesome-merge apps/goofy-e2e/reports/${npm_config_report_folder}/mochawesome-report/**/*.json > apps/goofy-e2e/reports/${npm_config_report_folder}/report.json",
+ "cypress:generate-html": "marge apps/goofy-e2e/reports/${npm_config_report_folder}/report.json -f report -o apps/goofy-e2e/reports/$npm_config_report_folder",
"workspace-generator": "nx workspace-generator",
"sonar-scanner": "npm test -- --testResultsProcessor='jest-sonar-reporter' && sonar-scanner -Dsonar.host.url=https://sonarqube.ozg-sh.de/ -Dsonar.login=364c6e09430714838730a83f55d3369a7ffda0e9"
},
--
GitLab