From 8714d035dfe1f6eac2fe88df97e1103f59884713 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 5 Jan 2024 13:16:00 +0100
Subject: [PATCH] OZG-4653 E2E: set required passes to 1

And some refactoring
---
 .../alfa-e2e/cypress-ci-einheitlicher-ansprechpartner.config.ts | 2 +-
 alfa-client/apps/alfa-e2e/cypress-ci-main-tests.config.ts       | 2 +-
 alfa-client/apps/alfa-e2e/cypress.config.ts                     | 2 +-
 .../apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts    | 1 -
 .../user-profile/user-profile-icon-in-kommentar-error.cy.ts     | 2 +-
 .../vorgang-detailansicht/vorgang-detailansicht-formdata.cy.ts  | 2 +-
 .../src/e2e/main-tests/vorgang-list/vorgang-list.search.cy.ts   | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/alfa-client/apps/alfa-e2e/cypress-ci-einheitlicher-ansprechpartner.config.ts b/alfa-client/apps/alfa-e2e/cypress-ci-einheitlicher-ansprechpartner.config.ts
index 13cefd098a..4644281380 100644
--- a/alfa-client/apps/alfa-e2e/cypress-ci-einheitlicher-ansprechpartner.config.ts
+++ b/alfa-client/apps/alfa-e2e/cypress-ci-einheitlicher-ansprechpartner.config.ts
@@ -17,7 +17,7 @@ export default defineConfig({
 		experimentalStrategy: 'detect-flake-and-pass-on-threshold',
 		experimentalOptions: {
 		  maxRetries: 2,
-		  passesRequired: 2,
+		  passesRequired: 1,
 		},
 		openMode: true,
 		runMode: true,
diff --git a/alfa-client/apps/alfa-e2e/cypress-ci-main-tests.config.ts b/alfa-client/apps/alfa-e2e/cypress-ci-main-tests.config.ts
index 9e90e297f1..daf52b9902 100644
--- a/alfa-client/apps/alfa-e2e/cypress-ci-main-tests.config.ts
+++ b/alfa-client/apps/alfa-e2e/cypress-ci-main-tests.config.ts
@@ -17,7 +17,7 @@ export default defineConfig({
 		experimentalStrategy: 'detect-flake-and-pass-on-threshold',
 		experimentalOptions: {
 		  maxRetries: 2,
-		  passesRequired: 2,
+		  passesRequired: 1,
 		},
 		openMode: true,
 		runMode: true,
diff --git a/alfa-client/apps/alfa-e2e/cypress.config.ts b/alfa-client/apps/alfa-e2e/cypress.config.ts
index a39449b9c9..a72d797635 100644
--- a/alfa-client/apps/alfa-e2e/cypress.config.ts
+++ b/alfa-client/apps/alfa-e2e/cypress.config.ts
@@ -16,7 +16,7 @@ export default defineConfig({
 		experimentalStrategy: 'detect-flake-and-pass-on-threshold',
 		experimentalOptions: {
 		  maxRetries: 2,
-		  passesRequired: 2,
+		  passesRequired: 1,
 		},
 		openMode: true,
 		runMode: true,
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts
index 55dc7090bb..493a03c501 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts
@@ -46,7 +46,6 @@ import { createVorgang, initVorgang } from '../../../support/vorgang-util';
 
 registerLocaleData(localeDe, 'de', localeDeExtra);
 
-// TODO getUser*() funktionieren nicht länger
 describe('Historie', () => {
 	const mainPage: MainPage = new MainPage();
 	const vorgangList: VorgangListE2EComponent = mainPage.getVorgangList();
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-in-kommentar-error.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-in-kommentar-error.cy.ts
index 53ad50e9a9..115d402bf2 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-in-kommentar-error.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-in-kommentar-error.cy.ts
@@ -31,7 +31,7 @@ import { VorgangPage } from '../../../page-objects/vorgang.po';
 import { dropCollections, interceptWithResponse, scrollToWindowBottom, waitOfInterceptor } from '../../../support/cypress-helper';
 import { exist, notExist } from '../../../support/cypress.util';
 import { createKommentar } from '../../../support/kommentar.util';
-import { getUserManagerUserSabine, initUsermanagerUsers, loginAsSabine } from '../../../support/user-util';
+import { loginAsSabine } from '../../../support/user-util';
 import { createVorgang, initVorgang } from '../../../support/vorgang-util';
 
 // TODO Deaktiviert, weil die beiden Testfälle in user-profile-icon-in-postfach-nachricht-error.e2e-spec.ts abgedeckt sind.
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-formdata.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-formdata.cy.ts
index 33e9789c46..e401220efc 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-formdata.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-formdata.cy.ts
@@ -32,7 +32,7 @@ import { VorgangE2E } from '../../../model/vorgang';
 import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
 import { VorgangPage } from '../../../page-objects/vorgang.po';
 import { dropCollections } from '../../../support/cypress-helper';
-import { getUserManagerUserSabine, initUsermanagerUsers, loginAsSabine } from '../../../support/user-util';
+import { loginAsSabine } from '../../../support/user-util';
 import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
 
 registerLocaleData(localeDe, 'de', localeDeExtra);
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list.search.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list.search.cy.ts
index ebabefff3c..b292f316cf 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list.search.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list.search.cy.ts
@@ -30,7 +30,7 @@ import { UserE2E } from 'apps/alfa-e2e/src/model/user';
 import { EingangE2E, VorgangE2E, VorgangStatusE2E } from 'apps/alfa-e2e/src/model/vorgang';
 import { HeaderE2EComponent } from 'apps/alfa-e2e/src/page-objects/header.po';
 import { VorgangPage } from 'apps/alfa-e2e/src/page-objects/vorgang.po';
-import { dropCollections, dropSearchIndex, wait } from 'apps/alfa-e2e/src/support/cypress-helper';
+import { dropCollections, dropSearchIndex } from 'apps/alfa-e2e/src/support/cypress-helper';
 import { AntragstellerE2ETestData, EingangE2ETestData, EingangHeaderE2ETestData, buildVorgang, createVorgang, initSearchIndex, initVorgaenge, objectIds } from 'apps/alfa-e2e/src/support/vorgang-util';
 import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
 import { backspaceOn, enterWith, exist, haveText, haveValue, notExist } from '../../../support/cypress.util';
-- 
GitLab