From 9c31aa5b15deaa01f670b4ac6bb8ae4e2d2eacac Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 31 Oct 2024 15:36:12 +0100
Subject: [PATCH] OZG-6423 improve test structure
---
.../navigation/navigation.e2e.component.ts | 6 +-
.../accessibility/vorgang-list.cy.ts | 2 +-
.../vorgang-list-views-pages.cy.ts | 543 ++++--------------
.../vorgang-view-wiedervorlagen.pages.cy.ts | 118 +---
.../vorgang-list/vorgang-views-filter.cy.ts | 38 +-
.../button-toggle-group.component.spec.ts | 102 ++--
.../button-toggle-group.component.ts | 10 +-
7 files changed, 223 insertions(+), 596 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/src/components/navigation/navigation.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/navigation/navigation.e2e.component.ts
index df2981235e..9154bd84e7 100644
--- a/alfa-client/apps/alfa-e2e/src/components/navigation/navigation.e2e.component.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/navigation/navigation.e2e.component.ts
@@ -24,7 +24,7 @@
export class NavigationE2EComponent {
private readonly alleFilterToggleButton: string = 'alle-filter-toggle-button';
private readonly meineVorgaengeToggleButton: string = 'meine-vorgaenge-filter-toggle-button';
- private readonly nichtZugewiesenToggleButton: string = 'unassigned-filter-toggle-button';
+ private readonly unassignedToggleButton: string = 'unassigned-filter-toggle-button';
private readonly locatorRoot: string = 'navigation';
@@ -40,7 +40,7 @@ export class NavigationE2EComponent {
return cy.getTestElement(this.meineVorgaengeToggleButton);
}
- public getNichtZugewiesenFilter() {
- return cy.getTestElement(this.nichtZugewiesenToggleButton);
+ public getUnassignedFilter() {
+ return cy.getTestElement(this.unassignedToggleButton);
}
}
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/accessibility/vorgang-list.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/accessibility/vorgang-list.cy.ts
index 06c0631eb0..471fb34173 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/accessibility/vorgang-list.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/accessibility/vorgang-list.cy.ts
@@ -89,7 +89,7 @@ describe('VorgangList Page', () => {
it('should focus Nicht zugewiesen filter', () => {
pressTab();
- isOdsFocused(navigation.getNichtZugewiesenFilter());
+ isOdsFocused(navigation.getUnassignedFilter());
});
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-views-pages.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-views-pages.cy.ts
index bd7f73d4ef..177e634b4a 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-views-pages.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-views-pages.cy.ts
@@ -29,12 +29,7 @@ import { exist } from 'apps/alfa-e2e/src/support/cypress.util';
import { Interception } from 'cypress/types/net-stubbing';
import { HttpMethodE2E } from '../../../model/util';
import { VorgangE2E, VorgangStatusE2E } from '../../../model/vorgang';
-import {
- dropCollections,
- intercept,
- scrollToWindowBottom,
- waitOfInterceptor,
-} from '../../../support/cypress-helper';
+import { dropCollections, intercept, scrollToWindowBottom, waitOfInterceptor } from '../../../support/cypress-helper';
import { generateIds } from '../../../support/tech.util';
import { getUserSabineId, initUsermanagerUsers, loginAsSabine } from '../../../support/user-util';
import { buildVorgang, initVorgaenge } from '../../../support/vorgang-util';
@@ -94,14 +89,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -118,14 +107,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -142,14 +125,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 20);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 80,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[19].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 80);
+ assert(interception.response.body._embedded.vorgangHeaderList[19].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -172,14 +149,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -196,14 +167,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- MEINE_VORGAENGE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, MEINE_VORGAENGE_NAME_PREFIX + 110);
});
});
});
@@ -222,18 +187,12 @@ describe('VorgangList View Pages', () => {
});
it('should show page 1 with 100 vorgaenge NEU', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -250,14 +209,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- ALLE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, ALLE_NAME_PREFIX + 110);
});
});
});
@@ -287,14 +240,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -311,14 +258,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -335,14 +276,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 20);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 80,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[19].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 80);
+ assert(interception.response.body._embedded.vorgangHeaderList[19].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -357,9 +292,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangAngenommenAssignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangAngenommenAssignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge ANGENOMMEN', () => {
@@ -367,14 +300,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -383,9 +310,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangAngenommenAssignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangAngenommenAssignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge ANGENOMMEN and 90 vorgaenge ASSIGNED on scrolling to bottom', () => {
@@ -393,14 +318,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- MEINE_VORGAENGE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, MEINE_VORGAENGE_NAME_PREFIX + 110);
});
});
});
@@ -415,24 +334,16 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangAngenommenUnassignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangAngenommenUnassignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge ANGENOMMEN', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -441,9 +352,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangAngenommenUnassignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangAngenommenUnassignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge on scrolling to bottom', () => {
@@ -451,14 +360,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- ALLE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, ALLE_NAME_PREFIX + 110);
});
});
});
@@ -480,9 +383,7 @@ describe('VorgangList View Pages', () => {
beforeEach(() => {
navigation.getAlleFilter().click();
waitForSpinnerToDisappear();
- intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge IN_BEARBEITUNG', () => {
@@ -490,14 +391,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -506,9 +401,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge IN_BEARBEITUNG and 90 vorgaenge ASSIGNED on scrolling to bottom', () => {
@@ -516,14 +409,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -532,9 +419,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungPageLink(3)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungPageLink(3)).as(loadPageInterceptor);
});
it('should show page 3 with 10 vorgaenge IN_BEARBEITUNG ASSIGNED on scrolling to bottom', () => {
@@ -542,14 +427,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 20);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 80,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[19].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 80);
+ assert(interception.response.body._embedded.vorgangHeaderList[19].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -564,9 +443,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungAssignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungAssignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge IN_BEARBEITUNG', () => {
@@ -574,14 +451,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -590,9 +461,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungAssignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungAssignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge IN_BEARBEITUNG and 90 vorgaenge ASSIGNED on scrolling to bottom', () => {
@@ -600,14 +469,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- MEINE_VORGAENGE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, MEINE_VORGAENGE_NAME_PREFIX + 110);
});
});
});
@@ -622,24 +485,16 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungUnassignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungUnassignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge IN_BEARBEITUNG', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -648,9 +503,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungUnassignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBearbeitungUnassignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge on scrolling to bottom', () => {
@@ -658,14 +511,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- ALLE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, ALLE_NAME_PREFIX + 110);
});
});
});
@@ -695,14 +542,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -719,14 +560,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -743,14 +578,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 20);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 80,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[19].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 80);
+ assert(interception.response.body._embedded.vorgangHeaderList[19].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -765,9 +594,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBescheidenAssignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBescheidenAssignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge BESCHIEDEN', () => {
@@ -775,14 +602,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -791,9 +612,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBescheidenAssignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBescheidenAssignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge BESCHIEDEN and 90 vorgaenge ASSIGNED on scrolling to bottom', () => {
@@ -801,14 +620,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- MEINE_VORGAENGE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, MEINE_VORGAENGE_NAME_PREFIX + 110);
});
});
});
@@ -823,24 +636,16 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBescheidenUnassignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBescheidenUnassignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge BESCHIEDEN', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -849,9 +654,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInBescheidenUnassignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInBescheidenUnassignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge on scrolling to bottom', () => {
@@ -859,14 +662,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- ALLE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, ALLE_NAME_PREFIX + 110);
});
});
});
@@ -888,9 +685,7 @@ describe('VorgangList View Pages', () => {
beforeEach(() => {
navigation.getAlleFilter().click();
waitForSpinnerToDisappear();
- intercept(HttpMethodE2E.GET, buildVorgangAbgeschlossenPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangAbgeschlossenPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge ABGESCHLOSSEN', () => {
@@ -898,14 +693,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -914,9 +703,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangAbgeschlossenPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangAbgeschlossenPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge ABGESCHLOSSEN and 90 vorgaenge ASSIGNED on scrolling to bottom', () => {
@@ -924,14 +711,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -940,9 +721,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangAbgeschlossenPageLink(3)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangAbgeschlossenPageLink(3)).as(loadPageInterceptor);
});
it('should show page 3 with 10 vorgaenge ABGESCHLOSSEN ASSIGNED on scrolling to bottom', () => {
@@ -950,14 +729,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 20);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 80,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[19].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 80);
+ assert(interception.response.body._embedded.vorgangHeaderList[19].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -972,9 +745,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInAbgeschlossenAssignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInAbgeschlossenAssignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge ABGESCHLOSSEN', () => {
@@ -982,14 +753,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -998,9 +763,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInAbgeschlossenAssignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInAbgeschlossenAssignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge ABGESCHLOSSEN and 90 vorgaenge ASSIGNED on scrolling to bottom', () => {
@@ -1008,14 +771,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- MEINE_VORGAENGE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, MEINE_VORGAENGE_NAME_PREFIX + 110);
});
});
});
@@ -1030,24 +787,16 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInAbgeschlossenUnassignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInAbgeschlossenUnassignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge ABGESCHLOSSEN', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -1056,9 +805,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInAbgeschlossenUnassignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInAbgeschlossenUnassignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge on scrolling to bottom', () => {
@@ -1066,14 +813,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- MEINE_VORGAENGE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, MEINE_VORGAENGE_NAME_PREFIX + 110);
});
});
});
@@ -1103,14 +844,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -1127,14 +862,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -1151,14 +880,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 20);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 80,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[19].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 80);
+ assert(interception.response.body._embedded.vorgangHeaderList[19].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -1173,9 +896,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInVerworfenAssignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInVerworfenAssignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge VERWORFEN', () => {
@@ -1183,14 +904,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -1199,9 +914,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInVerworfenAssignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInVerworfenAssignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge VERWORFEN and 90 vorgaenge ASSIGNED on scrolling to bottom', () => {
@@ -1209,14 +922,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- MEINE_VORGAENGE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, MEINE_VORGAENGE_NAME_PREFIX + 110);
});
});
});
@@ -1231,24 +938,16 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInVerworfenUnassignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInVerworfenUnassignedPageLink(1)).as(loadPageInterceptor);
});
it('should show page 1 with 100 vorgaenge VERWORFEN', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === PAGE_SIZE);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME_PREFIX + PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME_PREFIX + PAGE_SIZE);
});
});
});
@@ -1257,9 +956,7 @@ describe('VorgangList View Pages', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangInVerworfenUnassignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangInVerworfenUnassignedPageLink(2)).as(loadPageInterceptor);
});
it('should show page 2 with 10 vorgaenge on scrolling to bottom', () => {
@@ -1267,14 +964,8 @@ describe('VorgangList View Pages', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- ALLE_NAME_PREFIX + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- ALLE_NAME_PREFIX + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME_PREFIX + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, ALLE_NAME_PREFIX + 110);
});
});
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-view-wiedervorlagen.pages.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-view-wiedervorlagen.pages.cy.ts
index 78b04e5ac5..35c9b4c199 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-view-wiedervorlagen.pages.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-view-wiedervorlagen.pages.cy.ts
@@ -8,19 +8,10 @@ import { VorgangViewsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/v
import { HttpMethodE2E } from 'apps/alfa-e2e/src/model/util';
import { ClientAttributeNameE2E, VorgangE2E } from 'apps/alfa-e2e/src/model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from 'apps/alfa-e2e/src/page-objects/main.po';
-import {
- dropCollections,
- intercept,
- scrollToWindowBottom,
- waitOfInterceptor,
-} from 'apps/alfa-e2e/src/support/cypress-helper';
+import { dropCollections, intercept, scrollToWindowBottom, waitOfInterceptor } from 'apps/alfa-e2e/src/support/cypress-helper';
import { exist } from 'apps/alfa-e2e/src/support/cypress.util';
import { createDateToday, generateIds } from 'apps/alfa-e2e/src/support/tech.util';
-import {
- getUserSabineId,
- initUsermanagerUsers,
- loginAsSabine,
-} from 'apps/alfa-e2e/src/support/user-util';
+import { getUserSabineId, initUsermanagerUsers, loginAsSabine } from 'apps/alfa-e2e/src/support/user-util';
import {
VORGANG_LIST_NEXT_FRIST_PARAM,
VORGANG_LIST_PAGE_SIZE,
@@ -71,10 +62,7 @@ describe('VorgangList View Wiedervorlagen', () => {
dropCollections();
});
- function createVorgaenge(
- namePrefix: string,
- buildFunction: (id: string, name: string) => VorgangE2E,
- ): VorgangE2E[] {
+ function createVorgaenge(namePrefix: string, buildFunction: (id: string, name: string) => VorgangE2E): VorgangE2E[] {
let count = 1;
return generateIds(110).map((randomId) => {
const vorgang: VorgangE2E = buildFunction(randomId, `${namePrefix}_${count}`);
@@ -111,24 +99,16 @@ describe('VorgangList View Wiedervorlagen', () => {
beforeEach(() => {
navigation.getAlleFilter().click();
waitForSpinnerToDisappear();
- intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenPageLink(1)).as(loadPageInterceptor);
});
it('should show 1 page with 100 vorgaenge with open wiedervorlagen', () => {
views.getWiedervorlagen().getRoot().click();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
- assert(
- interception.response.body._embedded.vorgangHeaderList.length ===
- VORGANG_LIST_PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList.length === VORGANG_LIST_PAGE_SIZE);
assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME + 1);
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME + VORGANG_LIST_PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME + VORGANG_LIST_PAGE_SIZE);
});
});
});
@@ -137,27 +117,16 @@ describe('VorgangList View Wiedervorlagen', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenPageLink(2)).as(loadPageInterceptor);
});
it('should show 2 page with 10 vorgaenge with open wiedervorlagen and 90 vorgaenge with open wiedervorlagen ASSIGNED on scrolling to bottom', () => {
scrollToWindowBottom();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
- assert(
- interception.response.body._embedded.vorgangHeaderList.length ===
- VORGANG_LIST_PAGE_SIZE,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME + VORGANG_LIST_PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList.length === VORGANG_LIST_PAGE_SIZE);
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME + VORGANG_LIST_PAGE_SIZE);
});
});
});
@@ -166,9 +135,7 @@ describe('VorgangList View Wiedervorlagen', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenPageLink(3)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenPageLink(3)).as(loadPageInterceptor);
});
it('should show 3 page with 10 vorgaenge with open wiedervorlagen ASSIGNED on scrolling to bottom', () => {
@@ -176,14 +143,8 @@ describe('VorgangList View Wiedervorlagen', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 20);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME + 80,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[19].name,
- MEINE_VORGAENGE_NAME + VORGANG_LIST_PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME + 80);
+ assert(interception.response.body._embedded.vorgangHeaderList[19].name, MEINE_VORGAENGE_NAME + VORGANG_LIST_PAGE_SIZE);
});
});
});
@@ -198,27 +159,16 @@ describe('VorgangList View Wiedervorlagen', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenAssignedPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenAssignedPageLink(1)).as(loadPageInterceptor);
});
it('should show 1 page with 100 vorgaenge with open wiedervorlagen', () => {
navigation.getMeineVorgaengeFilter().click();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
- assert(
- interception.response.body._embedded.vorgangHeaderList.length ===
- VORGANG_LIST_PAGE_SIZE,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME + 1,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- MEINE_VORGAENGE_NAME + VORGANG_LIST_PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList.length === VORGANG_LIST_PAGE_SIZE);
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME + 1);
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, MEINE_VORGAENGE_NAME + VORGANG_LIST_PAGE_SIZE);
});
});
});
@@ -227,9 +177,7 @@ describe('VorgangList View Wiedervorlagen', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenAssignedPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildVorgangWithOpenWiedervorlagenAssignedPageLink(2)).as(loadPageInterceptor);
});
it('should show 2 page with 10 vorgaenge with open wiedervorlagen and 90 vorgaenge with open wiedervorlagen ASSIGNED on scrolling to bottom', () => {
@@ -237,14 +185,8 @@ describe('VorgangList View Wiedervorlagen', () => {
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
assert(interception.response.body._embedded.vorgangHeaderList.length === 10);
- assert(
- interception.response.body._embedded.vorgangHeaderList[0].name,
- MEINE_VORGAENGE_NAME + 101,
- );
- assert(
- interception.response.body._embedded.vorgangHeaderList[9].name,
- MEINE_VORGAENGE_NAME + 110,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[0].name, MEINE_VORGAENGE_NAME + 101);
+ assert(interception.response.body._embedded.vorgangHeaderList[9].name, MEINE_VORGAENGE_NAME + 110);
});
});
});
@@ -259,24 +201,16 @@ describe('VorgangList View Wiedervorlagen', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildUnassignedVorgangWithOpenWiedervorlagenPageLink(1)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildUnassignedVorgangWithOpenWiedervorlagenPageLink(1)).as(loadPageInterceptor);
});
it('should show 1 page with 100 vorgaenge with open wiedervorlagen', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitOfInterceptor(loadPageInterceptor).then((interception: Interception) => {
- assert(
- interception.response.body._embedded.vorgangHeaderList.length ===
- VORGANG_LIST_PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList.length === VORGANG_LIST_PAGE_SIZE);
assert(interception.response.body._embedded.vorgangHeaderList[0].name, ALLE_NAME + 1);
- assert(
- interception.response.body._embedded.vorgangHeaderList[99].name,
- ALLE_NAME + VORGANG_LIST_PAGE_SIZE,
- );
+ assert(interception.response.body._embedded.vorgangHeaderList[99].name, ALLE_NAME + VORGANG_LIST_PAGE_SIZE);
});
});
});
@@ -285,9 +219,7 @@ describe('VorgangList View Wiedervorlagen', () => {
const loadPageInterceptor: string = 'loadPage';
beforeEach(() => {
- intercept(HttpMethodE2E.GET, buildUnassignedVorgangWithOpenWiedervorlagenPageLink(2)).as(
- loadPageInterceptor,
- );
+ intercept(HttpMethodE2E.GET, buildUnassignedVorgangWithOpenWiedervorlagenPageLink(2)).as(loadPageInterceptor);
});
it('should show 2 page with 10 vorgaenge on scrolling to bottom', () => {
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-views-filter.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-views-filter.cy.ts
index bb51750c8c..8eff4b160a 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-views-filter.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-views-filter.cy.ts
@@ -219,7 +219,7 @@ describe('Vorgang views and filter', () => {
});
it('Nicht zugewiesen should not be selected', () => {
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
});
@@ -298,7 +298,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should filter List', () => {
@@ -330,7 +330,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should filter List', () => {
@@ -362,7 +362,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should filter List', () => {
@@ -394,7 +394,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should filter List', () => {
@@ -426,7 +426,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should filter List', () => {
@@ -458,7 +458,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should filter List', () => {
@@ -490,7 +490,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should filter List', () => {
@@ -523,7 +523,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should filter List', () => {
@@ -556,7 +556,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should show full List', () => {
@@ -586,7 +586,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
isOdsButtonToggleNotChecked(navigation.getMeineVorgaengeFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should show message', () => {
@@ -598,10 +598,10 @@ describe('Vorgang views and filter', () => {
describe('Select Filter', () => {
describe('Nicht zugewiesen', () => {
it('should set selected after click', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitForSpinnerToDisappear();
- isOdsButtonToggleChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleChecked(navigation.getUnassignedFilter());
});
it('should unselect Meine Vorgänge', () => {
@@ -674,7 +674,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getMeineVorgaengeFilter());
isOdsButtonToggleNotChecked(navigation.getAlleFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should keep view selection', () => {
@@ -725,7 +725,7 @@ describe('Vorgang views and filter', () => {
describe('on Nicht zugewiesen filter selection', () => {
it('should show filtered list', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitForSpinnerToDisappear();
haveLength(vorgangList.getItems(), 1);
@@ -733,7 +733,7 @@ describe('Vorgang views and filter', () => {
});
it('should show Nicht zugewiesen as selected', () => {
- isOdsButtonToggleChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleChecked(navigation.getUnassignedFilter());
});
it('should unselect Alle filter', () => {
@@ -775,7 +775,7 @@ describe('Vorgang views and filter', () => {
it('should keep filter selection', () => {
isOdsButtonToggleChecked(navigation.getAlleFilter());
- isOdsButtonToggleNotChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleNotChecked(navigation.getUnassignedFilter());
});
it('should unselect Meine Vorgänge filter', () => {
@@ -830,7 +830,7 @@ describe('Vorgang views and filter', () => {
describe('on Nicht zugewiesen filter selection', () => {
it('should show filtered list', () => {
- navigation.getNichtZugewiesenFilter().click();
+ navigation.getUnassignedFilter().click();
waitForSpinnerToDisappear();
haveLength(vorgangList.getItems(), 2);
@@ -839,7 +839,7 @@ describe('Vorgang views and filter', () => {
});
it('should select', () => {
- isOdsButtonToggleChecked(navigation.getNichtZugewiesenFilter());
+ isOdsButtonToggleChecked(navigation.getUnassignedFilter());
});
it('should unselect Meine Vorgänge filter', () => {
diff --git a/alfa-client/libs/design-component/src/lib/form/button-toggle-group/button-toggle-group.component.spec.ts b/alfa-client/libs/design-component/src/lib/form/button-toggle-group/button-toggle-group.component.spec.ts
index 4838223aeb..5b489dad32 100644
--- a/alfa-client/libs/design-component/src/lib/form/button-toggle-group/button-toggle-group.component.spec.ts
+++ b/alfa-client/libs/design-component/src/lib/form/button-toggle-group/button-toggle-group.component.spec.ts
@@ -22,56 +22,31 @@ describe('ButtonToggleGroupComponent', () => {
});
describe('component', () => {
- describe('setFormControlValue', () => {
+ describe('ngAfterContentInit', () => {
beforeEach(() => {
- component.fieldControl.setValue = jest.fn();
- fixture.detectChanges();
- });
-
- it('should return function', () => {
- const result: Function = component.setFormControlValue('test');
-
- expect(typeof result).toBe('function');
- });
-
- it('should set value if values are not equal', () => {
- component.setFormControlValue('test')();
-
- expect(component.fieldControl.setValue).toHaveBeenCalledWith('test');
- });
-
- it('should not set value if values are equal', () => {
- component.setFormControlValue(null)();
-
- expect(component.fieldControl.setValue).not.toHaveBeenCalled();
- });
- });
-
- describe('isValueSelected', () => {
- it('should return function', () => {
- const result: Function = component.isValueSelected();
-
- expect(typeof result).toBe('function');
+ component.passPropsToChild = jest.fn();
});
- it('should return true', () => {
- const result: boolean = component.isValueSelected()(null);
-
- expect(result).toBe(true);
- });
+ it('should pass props to children', () => {
+ const queryList: QueryList<ButtonToggleComponent> = new QueryList();
+ queryList.reset([new ButtonToggleComponent(), new ButtonToggleComponent()]);
+ component.buttonToggles = queryList;
- it('should return false', () => {
- const result: boolean = component.isValueSelected()('whatever');
+ component.ngAfterContentInit();
- expect(result).toBe(false);
+ expect(component.passPropsToChild).toHaveBeenCalledTimes(2);
});
});
describe('passPropsToChild', () => {
+ const funcOne: () => number = jest.fn().mockReturnValue(1);
+ const funcTwo: () => number = jest.fn().mockReturnValue(2);
+
beforeEach(() => {
- component.setFormControlValue = jest.fn().mockReturnValue(1);
- component.isValueSelected = jest.fn().mockReturnValue(2);
+ component.setFormControlValue = jest.fn().mockReturnValue(funcOne);
+ component.isValueSelected = jest.fn().mockReturnValue(funcTwo);
});
+
it('should call setFormControlValue', () => {
const buttonToggle = new ButtonToggleComponent();
buttonToggle.value = 'test';
@@ -86,7 +61,7 @@ describe('ButtonToggleGroupComponent', () => {
component.passPropsToChild(buttonToggle);
- expect(buttonToggle.onClick).toBe(1);
+ expect(buttonToggle.onClick).toBe(funcOne);
});
it('should call isValueSelected', () => {
@@ -102,23 +77,52 @@ describe('ButtonToggleGroupComponent', () => {
component.passPropsToChild(buttonToggle);
- expect(buttonToggle.isSelected).toBe(2);
+ expect(buttonToggle.isSelected).toBe(funcTwo);
});
});
- describe('ngAfterContentInit', () => {
+ describe('setFormControlValue', () => {
beforeEach(() => {
- component.passPropsToChild = jest.fn();
+ component.fieldControl.setValue = jest.fn();
+ fixture.detectChanges();
});
- it('should pass props to children', () => {
- const queryList: QueryList<ButtonToggleComponent> = new QueryList();
- queryList.reset([new ButtonToggleComponent(), new ButtonToggleComponent()]);
- component.buttonToggles = queryList;
+ it('should return function', () => {
+ const result: Function = component.setFormControlValue('test');
- component.ngAfterContentInit();
+ expect(typeof result).toBe('function');
+ });
- expect(component.passPropsToChild).toHaveBeenCalledTimes(2);
+ it('should set value if values are not equal', () => {
+ component.setFormControlValue('test')();
+
+ expect(component.fieldControl.setValue).toHaveBeenCalledWith('test');
+ });
+
+ it('should not set value if values are equal', () => {
+ component.setFormControlValue(null)();
+
+ expect(component.fieldControl.setValue).not.toHaveBeenCalled();
+ });
+ });
+
+ describe('isValueSelected', () => {
+ it('should return function', () => {
+ const result: Function = component.isValueSelected();
+
+ expect(typeof result).toBe('function');
+ });
+
+ it('should return true', () => {
+ const result: boolean = component.isValueSelected()(null);
+
+ expect(result).toBe(true);
+ });
+
+ it('should return false', () => {
+ const result: boolean = component.isValueSelected()('whatever');
+
+ expect(result).toBe(false);
});
});
});
diff --git a/alfa-client/libs/design-component/src/lib/form/button-toggle-group/button-toggle-group.component.ts b/alfa-client/libs/design-component/src/lib/form/button-toggle-group/button-toggle-group.component.ts
index ba2b8429ee..075a003b1b 100644
--- a/alfa-client/libs/design-component/src/lib/form/button-toggle-group/button-toggle-group.component.ts
+++ b/alfa-client/libs/design-component/src/lib/form/button-toggle-group/button-toggle-group.component.ts
@@ -22,6 +22,11 @@ export class ButtonToggleGroupComponent extends FormControlEditorAbstractCompone
this.buttonToggles.forEach((toggleButton: ButtonToggleComponent) => this.passPropsToChild(toggleButton));
}
+ passPropsToChild(toggleButton: ButtonToggleComponent): void {
+ toggleButton.onClick = this.setFormControlValue(toggleButton.value);
+ toggleButton.isSelected = this.isValueSelected();
+ }
+
setFormControlValue(value: string): () => void {
const formControl: FormControl = this.fieldControl;
return () => {
@@ -29,11 +34,6 @@ export class ButtonToggleGroupComponent extends FormControlEditorAbstractCompone
};
}
- passPropsToChild(toggleButton: ButtonToggleComponent): void {
- toggleButton.onClick = this.setFormControlValue(toggleButton.value);
- toggleButton.isSelected = this.isValueSelected();
- }
-
isValueSelected(): (value: string) => boolean {
const formControl: FormControl = this.fieldControl;
return (value: string) => formControl.value === value;
--
GitLab