From a0d767cfeb97de4bf9fac55fea513277357ba72b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Sun, 7 Jan 2024 19:11:03 +0100
Subject: [PATCH] OZG-4653 OZG-4708 fix test
---
.../vorgang-detailansicht-formdata.cy.ts | 43 ++++++++++++-------
.../apps/alfa-e2e/src/support/cypress.util.ts | 2 +-
2 files changed, 29 insertions(+), 16 deletions(-)
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..9d37472daf 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
@@ -37,7 +37,7 @@ import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../
registerLocaleData(localeDe, 'de', localeDeExtra);
-describe.skip('Vorgang Detailansicht with formData', () => {
+describe('Vorgang Detailansicht with formData', () => {
const mainPage: MainPage = new MainPage();
const vorgangList: VorgangListE2EComponent = mainPage.getVorgangList();
@@ -46,17 +46,17 @@ describe.skip('Vorgang Detailansicht with formData', () => {
const vorgangHeader: VorgangDetailHeaderE2EComponent = vorgangPage.getVorgangDetailHeader();
- const vorgang: VorgangE2E = { ...createVorgang(), name: 'TestVorgang' };
- const vorgangWithLabels: VorgangE2E = buildVorgang(objectIds[0], 'TestVorgangWithLabels');
-
const ort: string = 'Ort';
const sh_strasse: string = 'Strasse';
const sh_hausnummer: string = 'Hausnummer';
const emailadresse: string = 'E-Mail Adresse';
const postleitzahl: string = 'PLZ';
+ const vorgang: VorgangE2E = { ...createVorgang(), name: 'TestVorgang' };
+ const vorgangWithLabels: VorgangE2E = createVorgangWithLabels();
+
before(() => {
- initVorgaenge([vorgang]);//, createVorgangWithLabels()]);
+ initVorgaenge([vorgang, vorgangWithLabels]);
loginAsSabine();
@@ -65,16 +65,29 @@ describe.skip('Vorgang Detailansicht with formData', () => {
})
function createVorgangWithLabels(){
- vorgangWithLabels.eingangs[0].formData._kopControlData = {
- metaData: true,
- labels: { ort, sh_strasse, sh_hausnummer }
- };
-
- vorgangWithLabels.eingangs[0].formData.empfangendestelle._kopControlData.labels = {
- emailadresse,
- postleitzahl
- };
- return vorgangWithLabels;
+ var vorgang = buildVorgang(objectIds[0], 'TestVorgangWithLabels');
+ return {
+ ...vorgang,
+ eingangs: [{
+ ...vorgang.eingangs[0],
+ formData: {
+ ...vorgang.eingangs[0].formData,
+ _kopControlData: {
+ metaData: true,
+ labels: { ort, sh_strasse, sh_hausnummer }
+ },
+ empfangendestelle: {
+ ...vorgang.eingangs[0].formData.empfangendestelle,
+ _kopControlData: {
+ labels: {
+ emailadresse,
+ postleitzahl
+ }
+ }
+ }
+ }
+ }]
+ }
}
after(() => {
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
index ee3a1ea7f0..19c0f9759b 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress.util.ts
@@ -65,7 +65,7 @@ export function contains(element: any, containing: string): void {
}
export function notContains(element: any, containing: string): void {
- element.should('exist').not.contains(containing);
+ element.contains(containing).should('not.exist');
}
export function haveLength(element: any, length: number): void {
--
GitLab