Merge branch 'master' into OZG-6375-remove-wait-for-command

alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-subnavigation.ts

@@ -45,6 +45,10 @@ export class VorgangSubnavigationE2EComponent {
     return cy.getTestElement(this.backIconButton);
   }
 
+  public back(): void {
+    this.getBackButton().click();
+  }
+
   public getAnnehmenIconButton() {
     return cy.getTestElement(this.annehmenIconButton);
   }

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

@@ -18,6 +18,9 @@ export class VorgangViewsE2EComponent {
   private readonly zuLoeschenViewItem: VorgangViewE2EComponent = new VorgangViewE2EComponent(
     'Zu_Loschen',
   );
+  private readonly ungelesenViewItem: VorgangViewE2EComponent = new VorgangViewE2EComponent(
+    'Ungelesen',
+  );
   private readonly wiedervorlagenViewItem: VorgangViewE2EComponent = new VorgangViewE2EComponent(
     'Wiedervorlagen',
   );
@@ -54,6 +57,10 @@ export class VorgangViewsE2EComponent {
     return this.zuLoeschenViewItem;
   }
 
+  public getUngelesen(): VorgangViewE2EComponent {
+    return this.ungelesenViewItem;
+  }
+
   public getWiedervorlagen(): VorgangViewE2EComponent {
     return this.wiedervorlagenViewItem;
   }

alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-automatisch-erstellen.cy.ts

@@ -28,7 +28,7 @@ import {
 registerLocaleData(localeDe, 'de', localeDeExtra);
 
 //TODO: Jenkins konfigurieren
-describe.skip('Upload automatic Bescheid', () => {
+describe('Upload automatic Bescheid', () => {
   const mainPage: MainPage = new MainPage();
   const vorgangList: VorgangListE2EComponent = mainPage.getVorgangList();
 
@@ -77,7 +77,7 @@ describe.skip('Upload automatic Bescheid', () => {
     dropCollections();
   });
 
-  describe.skip('Upload automatic Bescheid document', () => {
+  describe('Upload automatic Bescheid document', () => {
     it('should show automatic Bescheid button', () => {
       vorgangList.getListItem(bescheidAutomatik.name).getRoot().click();
       waitForSpinnerToDisappear();

alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-ungelesen.cy.ts

+import {
+  PostfachMailE2EComponent,
+  PostfachMailListItem,
+} from 'apps/alfa-e2e/src/components/postfach/postfach-mail.e2e.component';
+import { VorgangSubnavigationE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-subnavigation';
+import {
+  VorgangViewE2EComponent,
+  VorgangViewsE2EComponent,
+} from 'apps/alfa-e2e/src/components/vorgang/vorgang-views.e2e.component';
+import {
+  PostfachMailItemE2E,
+  VorgangAttachedItemClientE2E,
+  VorgangAttachedItemE2E,
+} from 'apps/alfa-e2e/src/model/vorgang-attached-item';
+import { VorgangPage } from 'apps/alfa-e2e/src/page-objects/vorgang.po';
+import { exist, haveLength } from 'apps/alfa-e2e/src/support/cypress.util';
+import {
+  createPostfachNachrichtAttachedItem,
+  createPostfachNachrichtReplyItem,
+  initVorgangAttachedItem,
+} from 'apps/alfa-e2e/src/support/vorgang-attached-item-util';
+import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
+import { ClientAttributeNameE2E, ClientAttributesE2E, VorgangE2E } from '../../../model/vorgang';
+import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
+import { dropCollections } from '../../../support/cypress-helper';
+import { initUsermanagerUsers, loginAsSabine } from '../../../support/user-util';
+import {
+  buildVorgang,
+  createHasNewPostfachNachrichtClientAttribute,
+  createHasPostfachNachrichtClientAttribute,
+  initVorgaenge,
+  objectIds,
+} from '../../../support/vorgang-util';
+
+describe('Ungelesene Nachrichten', () => {
+  const mainPage: MainPage = new MainPage();
+  const vorgangList: VorgangListE2EComponent = mainPage.getVorgangList();
+  const vorgangPage: VorgangPage = new VorgangPage();
+  const subnavigation: VorgangSubnavigationE2EComponent = vorgangPage.getSubnavigation();
+  const views: VorgangViewsE2EComponent = mainPage.getViews();
+  const ungelesenView: VorgangViewE2EComponent = views.getUngelesen();
+  const postfachMailContainer: PostfachMailE2EComponent = vorgangPage.getPostfachMailcontainer();
+
+  const clientAttributes: ClientAttributesE2E = {
+    [VorgangAttachedItemClientE2E.OZGCLOUD_NACHRICHTEN_MANAGER]: {
+      [ClientAttributeNameE2E.HAS_NEW_POSTFACH_NACHRICHT]:
+        createHasNewPostfachNachrichtClientAttribute(true),
+      [ClientAttributeNameE2E.HAS_POSTFACH_NACHRICHT]:
+        createHasPostfachNachrichtClientAttribute(true),
+    },
+  };
+
+  const vorgangWithReply1: VorgangE2E = {
+    ...buildVorgang(objectIds[0], 'VorgangWithReply'),
+    clientAttributes,
+  };
+
+  const vorgangWithReply2: VorgangE2E = {
+    ...buildVorgang(objectIds[1], 'VorgangWithReply 2'),
+    clientAttributes,
+  };
+
+  const postfachMailReply1: PostfachMailItemE2E = createPostfachNachrichtReplyItem();
+  const postfachMailReply2: PostfachMailItemE2E = createPostfachNachrichtReplyItem();
+
+  const postfachNachrichtAttachedItem1: VorgangAttachedItemE2E = {
+    ...createPostfachNachrichtAttachedItem(objectIds[0], vorgangWithReply1._id.$oid),
+    item: postfachMailReply1,
+  };
+  const postfachNachrichtAttachedItem2: VorgangAttachedItemE2E = {
+    ...createPostfachNachrichtAttachedItem(objectIds[1], vorgangWithReply2._id.$oid),
+    item: postfachMailReply2,
+  };
+
+  before(() => {
+    initVorgaenge([vorgangWithReply1, vorgangWithReply2]);
+    initVorgangAttachedItem([postfachNachrichtAttachedItem1]);
+    initVorgangAttachedItem([postfachNachrichtAttachedItem2]);
+    initUsermanagerUsers();
+
+    loginAsSabine();
+
+    waitForSpinnerToDisappear();
+    exist(vorgangList.getRoot());
+  });
+
+  after(() => {
+    dropCollections();
+  });
+
+  describe('Show number of unread messages', () => {
+    it('should show 2 unread messages in filter', () => {
+      ungelesenView.getRoot().click();
+      waitForSpinnerToDisappear();
+
+      haveLength(vorgangList.getItems(), 2);
+    });
+
+    it('should show 1 unread message after viewing first message', () => {
+      vorgangList.getListItem(vorgangWithReply1.name).getRoot().click();
+      waitForSpinnerToDisappear();
+
+      const postfachMailItem: PostfachMailListItem = postfachMailContainer.getListItem('Subject');
+      postfachMailItem.getRoot().click();
+      waitForSpinnerToDisappear();
+
+      subnavigation.back();
+      subnavigation.back();
+
+      haveLength(vorgangList.getItems(), 1);
+    });
+
+    it('should show 0 unread messages after viewing second message', () => {
+      vorgangList.getListItem(vorgangWithReply2.name).getRoot().click();
+      waitForSpinnerToDisappear();
+
+      const postfachMailItem: PostfachMailListItem = postfachMailContainer.getListItem('Subject');
+      postfachMailItem.getRoot().click();
+      waitForSpinnerToDisappear();
+
+      subnavigation.back();
+      subnavigation.back();
+
+      haveLength(vorgangList.getItems(), 0);
+    });
+  });
+});

alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml

@@ -9,6 +9,8 @@ project:
 alfa:
   env:
     overrideSpringProfiles: "oc,e2e,dev"
+  customList:
+    ozgcloud_feature_bescheid-wizard: "true"
   ingress:
     use_staging_cert: true
   ozgcloud:
@@ -20,6 +22,7 @@ alfa:
 vorgang_manager:
   env:
     overrideSpringProfiles: "oc,e2e,dev"
+    customList:
       ozgcloud_bescheid_smart_documents_url: http://smocker:8080/smartdocuments
       ozgcloud_bescheid_smart_documents_basic_auth_username: MGM
       ozgcloud_bescheid_smart_documents_basic_auth_password: MGM