OZG-725 e2e test

alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component.ts

@@ -2,12 +2,12 @@ export class ForwardingDialogE2EComponent {
   private readonly root: string = 'forwarding-dialog';
   private readonly cancelButton: string = 'cancel-dialog-button';
   private readonly cancelIconButton: string = 'cancel-dialog-icon-button';
-  private readonly forwardingButton: string = 'forwarding-button';
+  private readonly forwardingButton: string = 'forwarding-dialog-button';
   private readonly searchText: string = 'instant_search-text-input';
   private readonly searchEntry: string = 'item-button';
   private readonly forwardingItem: string = 'forwarding-item';
   private readonly changeButton: string = 'forwarding-item-change-button';
-  private readonly zufiSearch: string = 'zufi-search';
+  private readonly organisationsEinheitSearch: string = 'organisations-einheit-search';
 
   public getRoot() {
     return cy.getTestElement(this.root);
@@ -45,7 +45,7 @@ export class ForwardingDialogE2EComponent {
     return cy.getTestElement(this.changeButton);
   }
 
-  public getZufiSearch() {
-    return cy.getTestElement(this.zufiSearch);
+  public getOrganisationsEinheitSearch() {
+    return cy.getTestElement(this.organisationsEinheitSearch);
   }
 }

alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-forwarding.cy.ts

@@ -2,6 +2,7 @@ import { registerLocaleData } from '@angular/common';
 import localeDe from '@angular/common/locales/de';
 import localeDeExtra from '@angular/common/locales/extra/de';
 import { VorgangFormularButtonsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components';
+import { ForwardingDialogE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component';
 import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
 import { E2EVorgangNavigator } from '../../../helper/vorgang/vorgang.navigator';
 import { E2EVorgangVerifier } from '../../../helper/vorgang/vorgang.verifier';
@@ -9,10 +10,9 @@ import { VorgangE2E } from '../../../model/vorgang';
 import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
 import { VorgangPage } from '../../../page-objects/vorgang.po';
 import { dropCollections } from '../../../support/cypress-helper';
-import { beDisabled, contains, exist, notBeDisabled, notExist } from '../../../support/cypress.util';
+import { beAriaDisabled, contains, exist, notBeAriaDisabled, notExist } from '../../../support/cypress.util';
 import { loginAsPeter, loginAsSabine } from '../../../support/user-util';
 import { createVorgang, initVorgaenge } from '../../../support/vorgang-util';
-import { ForwardingDialogE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-forwarding-dialog.e2e.component';
 
 registerLocaleData(localeDe, 'de', localeDeExtra);
 
@@ -59,12 +59,12 @@ describe('Vorgang weiterleiten', () => {
       exist(forwardingDialog.getRoot());
     });
 
-    it('should have zufi search', () => {
-      exist(forwardingDialog.getZufiSearch());
+    it('should have organisations einheit search', () => {
+      exist(forwardingDialog.getOrganisationsEinheitSearch());
     });
 
     it('should have disabled forwarding button', () => {
-      beDisabled(forwardingDialog.getForwardingButton());
+      beAriaDisabled(forwardingDialog.getForwardingButton());
     });
 
     it('should close dialog on escape', () => {
@@ -98,19 +98,19 @@ describe('Vorgang weiterleiten', () => {
     });
 
     it('should not show zufi search on search select', () => {
-      notExist(forwardingDialog.getZufiSearch());
+      notExist(forwardingDialog.getOrganisationsEinheitSearch());
     });
 
     it('should not disable forwarding button on search select', () => {
-      notBeDisabled(forwardingDialog.getForwardingButton());
+      notBeAriaDisabled(forwardingDialog.getForwardingButton());
     });
 
     it('should clear forwarding item on change button click', () => {
       forwardingDialog.getChangeButton().click();
 
       notExist(forwardingDialog.getForwardingItem());
-      exist(forwardingDialog.getZufiSearch());
-      beDisabled(forwardingDialog.getForwardingButton());
+      exist(forwardingDialog.getOrganisationsEinheitSearch());
+      beAriaDisabled(forwardingDialog.getForwardingButton());
     });
 
     it('should not display Weiterleiten button in status Angenommen', () => {

alfa-client/apps/alfa-e2e/src/support/cypress.util.ts

@@ -97,12 +97,12 @@ export function notBeChecked(element: any): void {
   element.should('not.be.checked');
 }
 
-export function beDisabled(element: any): void {
-  element.should('be.disabled');
+export function beAriaDisabled(element: any): void {
+  element.should('have.attr', 'aria-disabled', 'true');
 }
 
-export function notBeDisabled(element: any): void {
-  element.should('not.be.disabled');
+export function notBeAriaDisabled(element: any): void {
+  element.should('have.attr', 'aria-disabled', 'false');
 }
 
 //TODO: "first()" rausnehmen -> im html eine entprechende data-test-id ansprechen?! | trennen in "get" und "verify"

alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-button/forwarding-button.component.html

@@ -3,7 +3,7 @@
   text="Weiterleiten"
   [tooltip]="tooltip"
   tooltipPosition="above"
-  dataTestId="forwarding-button"
+  dataTestId="forwarding-dialog-button"
 >
   <ods-forward-vorgang-icon icon class="fill-whitetext" />
 </ods-button-with-spinner>