From f03fdd26411fbdc8fb6a321e199c57021c5e9860 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 26 Sep 2024 14:08:43 +0200
Subject: [PATCH] OZG-6592: Add missing config
---
alfa-client/Jenkinsfile.e2e | 2 +-
.../admin-e2e/cypress-ci-main-tests.config.ts | 25 +++++++++++++++++++
alfa-client/apps/admin-e2e/cypress-ci.json | 22 ++++++++++++++++
3 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 alfa-client/apps/admin-e2e/cypress-ci-main-tests.config.ts
create mode 100644 alfa-client/apps/admin-e2e/cypress-ci.json
diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index da6cb44df7..c13f8975dc 100644
--- a/alfa-client/Jenkinsfile.e2e
+++ b/alfa-client/Jenkinsfile.e2e
@@ -684,7 +684,7 @@ String generateCypressConfig(String bezeichner, String appName, String appVarian
def namespace = generateNamespace(bezeichner)
def configName = "cypress-ci-"+appVariant+".json"
- dir('alfa-client/apps/${appName}/'){
+ dir("alfa-client/apps/${appName}/"){
def config = readJSON file: 'cypress-ci.json'
def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace);
diff --git a/alfa-client/apps/admin-e2e/cypress-ci-main-tests.config.ts b/alfa-client/apps/admin-e2e/cypress-ci-main-tests.config.ts
new file mode 100644
index 0000000000..debc5e3e19
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/cypress-ci-main-tests.config.ts
@@ -0,0 +1,25 @@
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
+import { defineConfig } from 'cypress';
+
+//Cypress config is generated by JenkinsFile
+const cypressConfig = require('./cypress-ci-main-tests.json');
+const cypressEvents = require('./src/support/cypress-tasks.ts');
+
+export default defineConfig({
+ e2e: {
+ ...nxE2EPreset(__dirname),
+ ...cypressConfig,
+ setupNodeEvents(on, config) {
+ return cypressEvents(on, config);
+ },
+ },
+ retries: {
+ experimentalStrategy: 'detect-flake-and-pass-on-threshold',
+ experimentalOptions: {
+ maxRetries: 2,
+ passesRequired: 1,
+ },
+ openMode: true,
+ runMode: true,
+ },
+});
diff --git a/alfa-client/apps/admin-e2e/cypress-ci.json b/alfa-client/apps/admin-e2e/cypress-ci.json
new file mode 100644
index 0000000000..b7768dbc3a
--- /dev/null
+++ b/alfa-client/apps/admin-e2e/cypress-ci.json
@@ -0,0 +1,22 @@
+{
+ "env": {
+ "database": "vorgang-manager-database",
+ "keycloakClient": "alfa"
+ },
+ "fileServerFolder": ".",
+ "fixturesFolder": "./src/fixtures",
+ "modifyObstructiveCode": false,
+ "video": true,
+ "chromeWebSecurity": false,
+ "reporter": "../../node_modules/cypress-mochawesome-reporter",
+ "defaultCommandTimeout": 10000,
+ "supportFile": "./src/support/e2e.ts",
+ "testIsolation": false,
+ "reporterOptions": {
+ "html": false,
+ "json": true,
+ "quite": true,
+ "reportFilename": "report",
+ "overwrite": false
+ }
+}
--
GitLab