From 10f8de3f5ee7693cfd27af663786ae750f584e60 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 27 Jan 2022 14:56:50 +0100
Subject: [PATCH] OZG-1784 pr anmerkungen

---
 Jenkinsfile                                   | 70 +++++++++----------
 ...ltered-by-organisationseinheit.e2e-spec.ts | 47 ++-----------
 ...ltered-by-organisationseinheit.e2e-spec.ts | 65 +++--------------
 ...ltered-by-organisationseinheit.e2e-spec.ts | 44 ++----------
 .../goofy-e2e/src/support/cypress-helper.ts   |  6 --
 5 files changed, 59 insertions(+), 173 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3917dc0026..0a23aec953 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -151,16 +151,7 @@ pipeline {
                             def stageName = env.STAGE_NAME
                             def namespace = generateNamespaceName(stageName)
 
-                            checkIfNamespaceExists(namespace)
-
-                            parallel(
-                                startGoofy: {
-        							startGoofy(namespace, 'ea-values.yaml', IMAGE_TAG)
-                                },
-                                startPluto: {
-		        					startPluto(namespace, 'ea-values.yaml')
-                                }
-                            )
+                            startEnvironment(namespace, 'ea-values.yaml', 'ea-values.yaml', IMAGE_TAG)
                     
                             def testResult = runTests(stageName, 'einheitlicher-ansprechpartner')
                             
@@ -174,14 +165,9 @@ pipeline {
                     }
                     post {
                         always {
-                            publishHTML (target: [
-                            allowMissing: false,
-                            alwaysLinkToLastBuild: false,
-                            keepAll: true,
-                            reportDir: 'goofy-client/apps/goofy-e2e/reports/einheitlicher-ansprechpartner',
-                            reportFiles: 'report.html',
-                            reportName: "Goofy E2E-Tests EA"
-                            ])
+                            script {
+                                publishE2ETestResult("einheitlicher-ansprechpartner", "Goofy E2E-Tests EA")
+                            }
                         }
                     }
                 }
@@ -191,16 +177,7 @@ pipeline {
                             def stageName = env.STAGE_NAME
                             def namespace = generateNamespaceName(stageName)
 
-                            checkIfNamespaceExists(namespace)
-
-                            parallel(
-                                startGoofy: {
-								    startGoofy(namespace, 'values.yaml', IMAGE_TAG)
-                                },
-                                startPluto: {
-								    startPluto(namespace, 'values.yaml')
-                                }
-                            )
+                            startEnvironment(namespace, 'values.yaml', 'values.yaml', IMAGE_TAG)
 
                             def testResult = runTests(stageName, 'main-tests')
                             
@@ -214,14 +191,9 @@ pipeline {
                     }
                     post {
                         always {
-                            publishHTML (target: [
-                            allowMissing: false,
-                            alwaysLinkToLastBuild: false,
-                            keepAll: true,
-                            reportDir: 'goofy-client/apps/goofy-e2e/reports/main-tests',
-                            reportFiles: 'report.html',
-                            reportName: "Goofy E2E-Tests main"
-                            ])
+                            script {
+                                publishE2ETestResult("main-tests", "Goofy E2E-Tests main")
+                            }
                         }
                     }
                 }
@@ -332,6 +304,32 @@ pipeline {
     }
 }
 
+Void startEnvironment(String namespace, String goofyValues, String plutoValuesString imageTa){
+    checkIfNamespaceExists(namespace)
+
+    parallel(
+        startGoofy: {
+		    startGoofy(namespace, goofyValues, imageTag)
+        },
+        startPluto: {
+		    startPluto(namespace, plutoValues)
+        }
+    )
+}
+
+Void publishE2ETestResult(String reportFolder, String reportName) {
+    publishHTML (
+        target: [
+            allowMissing: false,
+            alwaysLinkToLastBuild: false,
+            keepAll: true,
+            reportDir: "goofy-client/apps/goofy-e2e/reports/${reportFolder}",
+            reportFiles: 'report.html',
+            reportName: reportName
+        ]
+    )
+}
+
 Void checkIfNamespaceExists(String namespace) {
     container("k8s") {
         def namespaceList = sh (script: 'kubectl get namespaces', returnStdout: true)
diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail.filtered-by-organisationseinheit.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail.filtered-by-organisationseinheit.e2e-spec.ts
index 19d21fa388..de4ac88ff0 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail.filtered-by-organisationseinheit.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail.filtered-by-organisationseinheit.e2e-spec.ts
@@ -3,7 +3,7 @@ import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-lis
 import { EingangE2E, VorgangE2E } from '../../../model/vorgang';
 import { MainPage } from '../../../page-objects/main.po';
 import { PostfachMailPage } from '../../../page-objects/postfach-mail.component.po';
-import { buildVorgangUrl, dropCollections, encodeVorgangUrl, isLocalEnvironment, visitUrl } from '../../../support/cypress-helper';
+import { buildVorgangUrl, dropCollections, encodeVorgangUrl, visitUrl } from '../../../support/cypress-helper';
 import { contains, exist, notExist } from '../../../support/cypress.util';
 import { ORGANISATIONSEINHEITEN_ID_FOR_KFINDER, ORGANISATIONSEINHEITEN_ID_FOR_KORDNER } from '../../../support/data.util';
 import { MessagesE2E } from '../../../support/messages';
@@ -18,16 +18,12 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => {
 
 	const postfachMailPage: PostfachMailPage = new PostfachMailPage();
 
-	const vorgangUrlVisibleToKFinderLocal: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('601bc78eabc134051570aab8')).replace('=', '')}/postfach`;
-	// const vorgangUrlVisibleToKFinderLocal: string = '/vorgang/aHR0cDovL2xvY2FsaG9zdDo0MzAwL2FwaS92b3JnYW5ncy82MDFiYzc4ZWFiYzEzNDA1MTU3MGFhYjg%3D/postfach';
-	const vorgangUrlVisibleToKFinderDev: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('601bc78eabc134051570aab8')).replace('=', '')}/postfach`;
+	const vorgangUrlVisibleToKFinder: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('601bc78eabc134051570aab8')).replace('=', '')}/postfach`;
 
 	const eingangForKFinder: EingangE2E = { ...createVorgang().eingangs[0], zustaendigeStelle: { organisationseinheitenId: ORGANISATIONSEINHEITEN_ID_FOR_KFINDER } };
 	const vorgangForKFinder: VorgangE2E = { ...buildVorgang('601bc78eabc134051570aab8', 'VorgangVisibleToKFinder'), eingangs: [eingangForKFinder] };
 	
-	const vorgangUrlVisibleToKOrdnerLocal: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('60250b9d383c182943f6ba79')).replace('=', '')}/postfach`;
-	// const vorgangUrlVisibleToKOrdnerLocal: string = '/vorgang/aHR0cDovL2xvY2FsaG9zdDo0MzAwL2FwaS92b3JnYW5ncy82MDI1MGI5ZDM4M2MxODI5NDNmNmJhNzk%3D/postfach';
-	const vorgangUrlVisibleToKOrdnerDev: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('60250b9d383c182943f6ba79')).replace('=', '')}/postfach`;
+	const vorgangUrlVisibleToKOrdner: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('60250b9d383c182943f6ba79')).replace('=', '')}/postfach`;
 
 	const eingangForKOrdner: EingangE2E = { ...createVorgang().eingangs[0], zustaendigeStelle: { organisationseinheitenId: ORGANISATIONSEINHEITEN_ID_FOR_KORDNER } };
 	const vorgangForKOrdner: VorgangE2E = { ...buildVorgang('60250b9d383c182943f6ba79', 'VorgangVisibleToKOrdner'), eingangs: [eingangForKOrdner] };
@@ -41,29 +37,16 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => {
 	})
 
 	describe('on user kfinder', () => {
-
-		let authorizedUrl: string;
-		let forbiddenUrl: string;
+		const authorizedUrl = vorgangUrlVisibleToKFinder;
+		const forbiddenUrl = vorgangUrlVisibleToKOrdner;
 
 		before(() => {
 			loginAsKfinder();
 
-			initUrls();
-
 			exist(vorgangList.getRoot());
 			vorgangList.waitForSpinnerToDisappear();
 		})
 
-		function initUrls(): void {
-			if (isLocalEnvironment()) {
-				authorizedUrl = vorgangUrlVisibleToKFinderLocal
-				forbiddenUrl = vorgangUrlVisibleToKOrdnerLocal;
-			} else {
-				authorizedUrl = vorgangUrlVisibleToKFinderDev;
-				forbiddenUrl = vorgangUrlVisibleToKOrdnerDev;
-			}
-		}
-
 		it('should open postfachNachrichten page', () => {
 			visitUrl(authorizedUrl);
 
@@ -79,32 +62,16 @@ describe('PostfachNachrichten filtered by organisationseinheit', () => {
 	})
 
 	describe('on user kordner', () => {
-
-		let authorizedUrl: string;
-		let forbiddenUrl: string;
+		const authorizedUrl = vorgangUrlVisibleToKOrdner;
+		const forbiddenUrl = vorgangUrlVisibleToKFinder;
 
 		before(() => {
 			loginAsKordner();
 
-			initUrls();
-
 			exist(vorgangList.getRoot());
 			vorgangList.waitForSpinnerToDisappear();
 		})
 
-		function initUrls(): void {
-			if (isLocalEnvironment()) {
-				authorizedUrl = vorgangUrlVisibleToKOrdnerLocal
-				forbiddenUrl = vorgangUrlVisibleToKFinderLocal;
-			} else {
-				authorizedUrl = vorgangUrlVisibleToKOrdnerDev;
-				forbiddenUrl = vorgangUrlVisibleToKFinderDev;
-			}
-
-			console.log(`authorizedUrl: ${authorizedUrl}`)
-			console.log(`forbiddenUrl: ${forbiddenUrl}`)
-		}
-
 		it('should open postfachNachrichten page', () => {
 			visitUrl(authorizedUrl);
 
diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-detailansicht.filtered-by-organisationseinheit.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-detailansicht.filtered-by-organisationseinheit.e2e-spec.ts
index 9b3ddff57e..88d6123381 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-detailansicht.filtered-by-organisationseinheit.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-detailansicht.filtered-by-organisationseinheit.e2e-spec.ts
@@ -3,7 +3,7 @@ import { VorgangDetailHeaderE2EComponent } from '../../../components/vorgang/vor
 import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
 import { EingangE2E, VorgangE2E } from '../../../model/vorgang';
 import { MainPage } from '../../../page-objects/main.po';
-import { buildVorgangUrl, dropCollections, encodeVorgangUrl, isLocalEnvironment, visitUrl } from '../../../support/cypress-helper';
+import { buildVorgangUrl, dropCollections, encodeVorgangUrl, visitUrl } from '../../../support/cypress-helper';
 import { contains, exist, notExist } from '../../../support/cypress.util';
 import { ORGANISATIONSEINHEITEN_ID_FOR_KFINDER, ORGANISATIONSEINHEITEN_ID_FOR_KORDNER } from '../../../support/data.util';
 import { MessagesE2E } from '../../../support/messages';
@@ -16,16 +16,12 @@ describe('Vorgang-detailansicht filtered by organisationseinheit', () => {
 	const detailPage: VorgangDetailHeaderE2EComponent = new VorgangDetailHeaderE2EComponent();
 	const snackbar: SnackBarE2EComponent = mainPage.getSnackBar();
 
-	const vorgangUrlVisibleToKFinderLocal: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('601bc78eabc134051570aab8')).replace('=', '')}`;
-	// const vorgangUrlVisibleToKFinderLocal: string = '/vorgang/aHR0cDovL2xvY2FsaG9zdDo0MzAwL2FwaS92b3JnYW5ncy82MDFiYzc4ZWFiYzEzNDA1MTU3MGFhYjg%3D';
-	const vorgangUrlVisibleToKFinderDev: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('601bc78eabc134051570aab8')).replace('=', '')}`;
+	const vorgangUrlVisibleToKFinder: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('601bc78eabc134051570aab8')).replace('=', '')}`;
 
 	const eingangForKFinder: EingangE2E = { ...createVorgang().eingangs[0], zustaendigeStelle: { organisationseinheitenId: ORGANISATIONSEINHEITEN_ID_FOR_KFINDER } };
 	const vorgangForKFinder: VorgangE2E = { ...buildVorgang('601bc78eabc134051570aab8', 'VorgangVisibleToKFinder'), eingangs: [eingangForKFinder] };
 
-	const vorgangUrlVisibleToKOrdnerLocal: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('60250b9d383c182943f6ba79')).replace('=', '')}`;
-	// const vorgangUrlVisibleToKOrdnerLocal: string = '/vorgang/aHR0cDovL2xvY2FsaG9zdDo0MzAwL2FwaS92b3JnYW5ncy82MDI1MGI5ZDM4M2MxODI5NDNmNmJhNzk%3D';
-	const vorgangUrlVisibleToKOrdnerDev: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('60250b9d383c182943f6ba79')).replace('=', '')}`;
+	const vorgangUrlVisibleToKOrdner: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('60250b9d383c182943f6ba79')).replace('=', '')}`;
 
 	const eingangForKOrdner: EingangE2E = { ...createVorgang().eingangs[0], zustaendigeStelle: { organisationseinheitenId: ORGANISATIONSEINHEITEN_ID_FOR_KORDNER } };
 	const vorgangForKOrdner: VorgangE2E = { ...buildVorgang('60250b9d383c182943f6ba79', 'VorgangVisibleToKOrdner'), eingangs: [eingangForKOrdner] };
@@ -39,29 +35,16 @@ describe('Vorgang-detailansicht filtered by organisationseinheit', () => {
 	})
 
 	describe('on user kfinder', () => {
-
-		let authorizedUrl: string;
-		let forbiddenUrl: string;
+		const authorizedUrl = vorgangUrlVisibleToKFinder;
+		const forbiddenUrl = vorgangUrlVisibleToKOrdner;
 
 		before(() => {
 			loginAsKfinder();
 
-			initUrls();
-
 			exist(vorgangList.getRoot());
 			vorgangList.waitForSpinnerToDisappear();
 		})
 
-		function initUrls(): void {
-			if (isLocalEnvironment()) {
-				authorizedUrl = vorgangUrlVisibleToKFinderLocal
-				forbiddenUrl = vorgangUrlVisibleToKOrdnerLocal;
-			} else {
-				authorizedUrl = vorgangUrlVisibleToKFinderDev;
-				forbiddenUrl = vorgangUrlVisibleToKOrdnerDev;
-			}
-		}
-
 		it('should open detailpage', () => {
 			visitUrl(authorizedUrl)
 
@@ -77,29 +60,16 @@ describe('Vorgang-detailansicht filtered by organisationseinheit', () => {
 	})
 
 	describe('on user kordner', () => {
-
-		let authorizedUrl: string;
-		let forbiddenUrl: string;
+		const authorizedUrl = vorgangUrlVisibleToKOrdner;
+		const forbiddenUrl = vorgangUrlVisibleToKFinder;
 
 		before(() => {
 			loginAsKordner();
 
-			initUrls();
-
 			exist(vorgangList.getRoot());
 			vorgangList.waitForSpinnerToDisappear();
 		})
 
-		function initUrls(): void {
-			if (isLocalEnvironment()) {
-				authorizedUrl = vorgangUrlVisibleToKOrdnerLocal
-				forbiddenUrl = vorgangUrlVisibleToKFinderLocal;
-			} else {
-				authorizedUrl = vorgangUrlVisibleToKOrdnerDev;
-				forbiddenUrl = vorgangUrlVisibleToKFinderDev;
-			}
-		}
-
 		it('should open detailpage', () => {
 			visitUrl(authorizedUrl)
 
@@ -115,40 +85,27 @@ describe('Vorgang-detailansicht filtered by organisationseinheit', () => {
 	})
 
 	describe('on user zonk', () => {
-
-		let kOrdnerVorgangUrl: string;
-		let kFinderVorgangUrl: string;
+		const authorizedUrl = vorgangUrlVisibleToKOrdner;
+		const forbiddenUrl = vorgangUrlVisibleToKFinder;
 
 		before(() => {
 			loginAsZonk();
 
-			initUrls();
-
 			exist(vorgangList.getRoot());
 			vorgangList.waitForSpinnerToDisappear();
 		})
 
-		function initUrls(): void {
-			if (isLocalEnvironment()) {
-				kOrdnerVorgangUrl = vorgangUrlVisibleToKOrdnerLocal
-				kFinderVorgangUrl = vorgangUrlVisibleToKFinderLocal;
-			} else {
-				kOrdnerVorgangUrl = vorgangUrlVisibleToKOrdnerDev;
-				kFinderVorgangUrl = vorgangUrlVisibleToKFinderDev;
-			}
-		}
-
 		describe('for vorgang with assigned organisationseinheitenId', () => {
 
 			it('should not open detailpage (for kordner)', () => {
-				visitUrl(kOrdnerVorgangUrl)
+				visitUrl(authorizedUrl)
 
 				notExist(detailPage.getRoot());
 				contains(snackbar.getMessage(), MessagesE2E.HTTP_STATUS_FORBIDDEN);
 			})
 
 			it('should not open detailpage (for kfinder)', () => {
-				visitUrl(kFinderVorgangUrl)
+				visitUrl(forbiddenUrl)
 
 				notExist(detailPage.getRoot());
 				contains(snackbar.getMessage(), MessagesE2E.HTTP_STATUS_FORBIDDEN);
diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/wiedervorlage/wiedervorlage.filtered-by-organisationseinheit.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/wiedervorlage/wiedervorlage.filtered-by-organisationseinheit.e2e-spec.ts
index fd9c727fcd..1e258218d8 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/wiedervorlage/wiedervorlage.filtered-by-organisationseinheit.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/wiedervorlage/wiedervorlage.filtered-by-organisationseinheit.e2e-spec.ts
@@ -6,7 +6,7 @@ import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-lis
 import { EingangE2E, VorgangE2E } from '../../../model/vorgang';
 import { MainPage } from '../../../page-objects/main.po';
 import { WiedervorlagePage } from '../../../page-objects/wiedervorlage.po';
-import { buildVorgangUrl, dropCollections, encodeVorgangUrl, isLocalEnvironment, visitUrl } from '../../../support/cypress-helper';
+import { buildVorgangUrl, dropCollections, encodeVorgangUrl, visitUrl } from '../../../support/cypress-helper';
 import { contains, exist, notExist } from '../../../support/cypress.util';
 import { ORGANISATIONSEINHEITEN_ID_FOR_KFINDER, ORGANISATIONSEINHEITEN_ID_FOR_KORDNER } from '../../../support/data.util';
 import { MessagesE2E } from '../../../support/messages';
@@ -22,17 +22,13 @@ describe('Wiedervorlage neu filtered by organisationseinheit', () => {
 
 	const wiedervorlagePage: WiedervorlagePage = new WiedervorlagePage();
 
-	const vorgangUrlVisibleToKFinderLocal: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('601bc78eabc134051570aab8')).replace('=', '')}/wiedervorlage/neu`;
-	// const vorgangUrlVisibleToKFinderLocal: string = '/vorgang/aHR0cDovL2xvY2FsaG9zdDo0MzAwL2FwaS92b3JnYW5ncy82MDFiYzc4ZWFiYzEzNDA1MTU3MGFhYjg%3D/wiedervorlage/neu';
-	const vorgangUrlVisibleToKFinderDev: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('601bc78eabc134051570aab8')).replace('=', '')}/wiedervorlage/neu`;
+	const vorgangUrlVisibleToKFinder: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('601bc78eabc134051570aab8')).replace('=', '')}/wiedervorlage/neu`;
 
 	const eingangForKFinder: EingangE2E = { ...createVorgang().eingangs[0], zustaendigeStelle: { organisationseinheitenId: ORGANISATIONSEINHEITEN_ID_FOR_KFINDER } };
 	const vorgangForKFinder: VorgangE2E = { ...buildVorgang('601bc78eabc134051570aab8', 'VorgangVisibleToKFinder'), eingangs: [eingangForKFinder] };
 
 
-	const vorgangUrlVisibleToKOrdnerLocal: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('60250b9d383c182943f6ba79')).replace('=', '')}/wiedervorlage/neu`;
-	// const vorgangUrlVisibleToKOrdnerLocal: string = '/vorgang/aHR0cDovL2xvY2FsaG9zdDo0MzAwL2FwaS92b3JnYW5ncy82MDI1MGI5ZDM4M2MxODI5NDNmNmJhNzk%3D/wiedervorlage/neu';
-	const vorgangUrlVisibleToKOrdnerDev: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('60250b9d383c182943f6ba79')).replace('=', '')}/wiedervorlage/neu`;
+	const vorgangUrlVisibleToKOrdner: string = `/vorgang/${encodeVorgangUrl(buildVorgangUrl('60250b9d383c182943f6ba79')).replace('=', '')}/wiedervorlage/neu`;
 
 	const eingangForKOrdner: EingangE2E = { ...createVorgang().eingangs[0], zustaendigeStelle: { organisationseinheitenId: ORGANISATIONSEINHEITEN_ID_FOR_KORDNER } };
 	const vorgangForKOrdner: VorgangE2E = { ...buildVorgang('60250b9d383c182943f6ba79', 'VorgangVisibleToKOrdner'), eingangs: [eingangForKOrdner] };
@@ -46,29 +42,16 @@ describe('Wiedervorlage neu filtered by organisationseinheit', () => {
 	})
 
 	describe('on user kfinder', () => {
-
-		let authorizedUrl: string;
-		let forbiddenUrl: string;
+		const authorizedUrl = vorgangUrlVisibleToKFinder;
+		const forbiddenUrl = vorgangUrlVisibleToKOrdner;
 
 		before(() => {
 			loginAsKfinder();
 
-			initUrls();
-
 			exist(vorgangList.getRoot());
 			vorgangList.waitForSpinnerToDisappear();
 		})
 
-		function initUrls(): void {
-			if (isLocalEnvironment()) {
-				authorizedUrl = vorgangUrlVisibleToKFinderLocal
-				forbiddenUrl = vorgangUrlVisibleToKOrdnerLocal;
-			} else {
-				authorizedUrl = vorgangUrlVisibleToKFinderDev;
-				forbiddenUrl = vorgangUrlVisibleToKOrdnerDev;
-			}
-		}
-
 		it('should open new wiedervorlage page', () => {
 			visitUrl(authorizedUrl);
 
@@ -84,29 +67,16 @@ describe('Wiedervorlage neu filtered by organisationseinheit', () => {
 	})
 
 	describe('on user kordner', () => {
-
-		let authorizedUrl: string;
-		let forbiddenUrl: string;
+		const authorizedUrl = vorgangUrlVisibleToKOrdner;
+		const forbiddenUrl = vorgangUrlVisibleToKFinder;
 
 		before(() => {
 			loginAsKordner();
 
-			initUrls();
-
 			exist(vorgangList.getRoot());
 			vorgangList.waitForSpinnerToDisappear();
 		})
 
-		function initUrls(): void {
-			if (isLocalEnvironment()) {
-				authorizedUrl = vorgangUrlVisibleToKOrdnerLocal
-				forbiddenUrl = vorgangUrlVisibleToKFinderLocal;
-			} else {
-				authorizedUrl = vorgangUrlVisibleToKOrdnerDev;
-				forbiddenUrl = vorgangUrlVisibleToKFinderDev;
-			}
-		}
-
 		it('should open new wiedervorlage page', () => {
 			visitUrl(authorizedUrl);
 
diff --git a/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts b/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts
index 75df30293e..af7890b307 100644
--- a/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts
+++ b/goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts
@@ -3,8 +3,6 @@ import { BinaryFilePersistanceWrapperE2E } from '../model/binary-file';
 import { VorgangE2E } from '../model/vorgang';
 import { VorgangAttachedItemE2E } from '../model/vorgang-attached-item';
 
-const localBaseUrl = 'http://localhost:4300';
-
 enum CypressTasks {
 	INIT_VORGANG_DATA = 'initVorgangData',
 	INIT_BINARY_FILE_DATA = 'initBinaryFileData',
@@ -34,10 +32,6 @@ export function encodeVorgangUrl(vorgangUrl: string) {
 	return btoa(vorgangUrl).replace('/', '_');
 }
 
-export function isLocalEnvironment(): boolean {
-	return Cypress.config().baseUrl === localBaseUrl;
-}
-
 export function visitUrl(url: string): void {
 	cy.visit(url);
 }
-- 
GitLab