Skip to content
Snippets Groups Projects
Commit d9959e46 authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'OZG-4994-ungelesene-Nachrichten-E2E' (#732) from...

Merge pull request 'OZG-4994-ungelesene-Nachrichten-E2E' (#732) from OZG-4994-ungelesene-Nachrichten-E2E into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/732


Reviewed-by: default avatarOZGCloud <ozgcloud@mgm-tp.com>
parents ed57145b 62435be4
No related branches found
No related tags found
No related merge requests found
...@@ -45,6 +45,10 @@ export class VorgangSubnavigationE2EComponent { ...@@ -45,6 +45,10 @@ export class VorgangSubnavigationE2EComponent {
return cy.getTestElement(this.backIconButton); return cy.getTestElement(this.backIconButton);
} }
public back(): void {
this.getBackButton().click();
}
public getAnnehmenIconButton() { public getAnnehmenIconButton() {
return cy.getTestElement(this.annehmenIconButton); return cy.getTestElement(this.annehmenIconButton);
} }
......
...@@ -18,6 +18,9 @@ export class VorgangViewsE2EComponent { ...@@ -18,6 +18,9 @@ export class VorgangViewsE2EComponent {
private readonly zuLoeschenViewItem: VorgangViewE2EComponent = new VorgangViewE2EComponent( private readonly zuLoeschenViewItem: VorgangViewE2EComponent = new VorgangViewE2EComponent(
'Zu_Loschen', 'Zu_Loschen',
); );
private readonly ungelesenViewItem: VorgangViewE2EComponent = new VorgangViewE2EComponent(
'Ungelesen',
);
private readonly wiedervorlagenViewItem: VorgangViewE2EComponent = new VorgangViewE2EComponent( private readonly wiedervorlagenViewItem: VorgangViewE2EComponent = new VorgangViewE2EComponent(
'Wiedervorlagen', 'Wiedervorlagen',
); );
...@@ -54,6 +57,10 @@ export class VorgangViewsE2EComponent { ...@@ -54,6 +57,10 @@ export class VorgangViewsE2EComponent {
return this.zuLoeschenViewItem; return this.zuLoeschenViewItem;
} }
public getUngelesen(): VorgangViewE2EComponent {
return this.ungelesenViewItem;
}
public getWiedervorlagen(): VorgangViewE2EComponent { public getWiedervorlagen(): VorgangViewE2EComponent {
return this.wiedervorlagenViewItem; return this.wiedervorlagenViewItem;
} }
......
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);
});
});
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment