OZG-449 OZG-2293 Add E2E Test; rename meineVorgaenge -> myVorgaenge

goofy-client/apps/goofy-e2e/src/components/navigation/navigation.e2e.component.ts

+export class NavigationE2EComponent {
+
+	private readonly locatorAllVorgaengeItem: string = 'all-vorgaenge-navigation-item';
+	private readonly locatorMyVorgaengeItem: string = 'my-vorgaenge-navigation-item';
+
+	private readonly locatorRoot: string = 'navigation';
+
+	public getRoot() {
+		return cy.getTestElement(this.locatorRoot);
+	}
+
+	public getAllVorgaengeItem() {
+		return cy.getTestElement(this.locatorAllVorgaengeItem);
+	}
+
+	public getMyVorgaengeItem() {
+		return cy.getTestElement(this.locatorMyVorgaengeItem);
+	}
+}
\ No newline at end of file

goofy-client/apps/goofy-e2e/src/integration/main-tests/navigation/navigation.e2e-spec.ts

+import { NavigationE2EComponent } from 'apps/goofy-e2e/src/components/navigation/navigation.e2e.component';
+import { VorgangListE2EComponent } from 'apps/goofy-e2e/src/components/vorgang/vorgang-list.e2e.component';
+import { VorgangE2E } from 'apps/goofy-e2e/src/model/vorgang';
+import { MainPage } from 'apps/goofy-e2e/src/page-objects/main.po';
+import { dropCollections } from 'apps/goofy-e2e/src/support/cypress-helper';
+import { CypressKeyboardActions, exist, notExist } from 'apps/goofy-e2e/src/support/cypress.util';
+import { getUserSabineUuid, loginAsSabine } from 'apps/goofy-e2e/src/support/user-util';
+import { buildVorgang, createVorgang, initVorgaenge, objectIds } from 'apps/goofy-e2e/src/support/vorgang-util';
+
+describe('Navigation', () => {
+	const mainPage: MainPage = new MainPage();
+	const vorgangList: VorgangListE2EComponent = mainPage.getVorgangList();
+
+	const navigation: NavigationE2EComponent = mainPage.getNavigation();
+
+	const vorgang: VorgangE2E = createVorgang();
+	const vorgangNotBeFiltered: VorgangE2E = { ...buildVorgang(objectIds[0], 'vorgangNotBeFiltered') };
+	const vorgangAssigned: VorgangE2E = { ...buildVorgang(objectIds[1], 'vorgangAssigned'), assignedTo: getUserSabineUuid() };
+	const vorgangAssignedNotBeFiltered: VorgangE2E = { ...buildVorgang(objectIds[2], 'vorgangAssignedNotBeFiltered'), assignedTo: getUserSabineUuid() };
+
+	const searchString: string = 'NotBeFiltered';
+
+	before(() => {
+		initVorgaenge([vorgang, vorgangNotBeFiltered, vorgangAssigned, vorgangAssignedNotBeFiltered]);
+
+		loginAsSabine();
+
+		exist(vorgangList.getRoot());
+	})
+
+	after(() => {
+		dropCollections();
+	})
+
+	describe('click on my vorgaenge', () => {
+
+		it('should hide not to user assigned vorgaenge', () => {
+			navigation.getMyVorgaengeItem().click();
+
+			notExist(vorgangList.getListItem(vorgang.name).getRoot());
+			notExist(vorgangList.getListItem(vorgangNotBeFiltered.name).getRoot());
+			exist(vorgangList.getListItem(vorgangAssigned.name).getRoot());
+			exist(vorgangList.getListItem(vorgangAssignedNotBeFiltered.name).getRoot());
+		})
+
+		it('should hide not matching vorgaenge after do search', () => {
+			doSearch(searchString);
+
+			notExist(vorgangList.getListItem(vorgang.name).getRoot());
+			notExist(vorgangList.getListItem(vorgangNotBeFiltered.name).getRoot());
+			notExist(vorgangList.getListItem(vorgangAssigned.name).getRoot());
+			exist(vorgangList.getListItem(vorgangAssignedNotBeFiltered.name).getRoot());
+		})
+	})
+
+	describe('click on all vorgaenge', () => {
+
+		it('should show all vorgaenge', () => {
+			navigation.getAllVorgaengeItem().click();
+
+			exist(vorgangList.getListItem(vorgang.name).getRoot());
+			exist(vorgangList.getListItem(vorgangNotBeFiltered.name).getRoot());
+			exist(vorgangList.getListItem(vorgangAssigned.name).getRoot());
+			exist(vorgangList.getListItem(vorgangAssignedNotBeFiltered.name).getRoot());
+		})
+
+		it('should hide not matching vorgaenge after do search', () => {
+			doSearch(searchString);
+
+			notExist(vorgangList.getListItem(vorgang.name).getRoot());
+			exist(vorgangList.getListItem(vorgangNotBeFiltered.name).getRoot());
+			notExist(vorgangList.getListItem(vorgangAssigned.name).getRoot());
+			exist(vorgangList.getListItem(vorgangAssignedNotBeFiltered.name).getRoot());
+		})
+	})
+
+	function doSearch(searchString: string): void {
+		mainPage.getVorgangSearch().getInput().clear().type(searchString + CypressKeyboardActions.ENTER);
+	}
+})
\ No newline at end of file

goofy-client/apps/goofy-e2e/src/integration/main-tests/postfach-mail/postfach-mail-error.e2e-spec.ts

@@ -9,7 +9,7 @@ import { PostfachMailPage } from '../../../page-objects/postfach-mail.component.
 import { VorgangPage } from '../../../page-objects/vorgang.po';
 import { dropCollections } from '../../../support/cypress-helper';
 import { contains, exist, notExist } from '../../../support/cypress.util';
-import { loginAsSabine } from '../../../support/user-util';
+import { getUserSabineUuid, loginAsSabine } from '../../../support/user-util';
 import { createPostfachNachrichtReplyItem, createVorgangAttachedItem, initVorgangAttachedItem } from '../../../support/vorgang-attached-item-util';
 import { createVorgang, initVorgang } from '../../../support/vorgang-util';
 
@@ -27,7 +27,7 @@ describe('PostfachMail error', () => {
 	const vorgang: VorgangE2E = createVorgang();
 	const postfachMailItem: PostfachMailItemE2E = {
 		...createPostfachNachrichtReplyItem(),
-		createdBy: Cypress.env("sabineUuid"),
+		createdBy: getUserSabineUuid(),
 		direction: DirectionE2E.OUT,
 		sentAt: '2022-12-02T15:00:00.790Z[UTC]',
 		sentSuccessful: false,

goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-detailansicht/vorgang-zurueckstellen.e2e-spec.ts

@@ -9,7 +9,7 @@ import { MainPage } from '../../../page-objects/main.po';
 import { VorgangPage } from '../../../page-objects/vorgang.po';
 import { dropCollections } from '../../../support/cypress-helper';
 import { contains, exist, haveText, notExist } from '../../../support/cypress.util';
-import { getUserSabine, loginAsSabine } from '../../../support/user-util';
+import { getUserSabineUuid, loginAsSabine } from '../../../support/user-util';
 import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
 
 registerLocaleData(localeDe, 'de', localeDeExtra);
@@ -22,7 +22,7 @@ describe('Vorgang Zurueckstellen', () => {
 	const vorgangPage: VorgangPage = new VorgangPage();
 	const userContainer: UserProfileE2EComponent = vorgangPage.getVorgangDetailHeader().getUserContainer();
 
-	const vorgangZurueckstellen: VorgangE2E = { ...createVorgang(), name: 'DoBescheiden', status: VorgangStatusE2E.IN_BEARBEITUNG, assignedTo: Cypress.env("sabineUuid") };
+	const vorgangZurueckstellen: VorgangE2E = { ...createVorgang(), name: 'DoBescheiden', status: VorgangStatusE2E.IN_BEARBEITUNG, assignedTo: getUserSabineUuid() };
 	const vorgangZurueckstellenRevoke: VorgangE2E = { ...buildVorgang(objectIds[0], 'DoRevokeBescheiden'), status: VorgangStatusE2E.IN_BEARBEITUNG };
 
 	before(() => {

goofy-client/apps/goofy-e2e/src/page-objects/header.po.ts

 export class HeaderE2EComponent {
+
 	private readonly locatorUserIconButton: string = 'user-icon-button';
 	private readonly locatorLogoutButton: string = 'logout-button';
 	private readonly locatorTitle: string = 'title';

goofy-client/apps/goofy-e2e/src/page-objects/main.po.ts

+import { NavigationE2EComponent } from '../components/navigation/navigation.e2e.component';
 import { ConnectionTimeoutRetryDialogE2EComponent, ConnectionTimeoutRetryFailDialogE2EComponent } from '../components/ui/connection-timeout-retry-dialog.e2e.component';
 import { InternalServerErrorDialogE2EComponent } from '../components/ui/internal-server-error-diaog.e2e.component';
 import { SnackBarE2EComponent } from '../components/ui/snackbar.e2e.component';
@@ -7,22 +8,22 @@ import { HeaderE2EComponent } from './header.po';
 
 export class MainPage {
 	private readonly header: HeaderE2EComponent = new HeaderE2EComponent();
-	private readonly vorgangSearch: VorgangSearchE2EComponent = new VorgangSearchE2EComponent();
-	private readonly vorgangList: VorgangListE2EComponent = new VorgangListE2EComponent();
-
+	private readonly navigation: NavigationE2EComponent = new NavigationE2EComponent();
 	private readonly snackBar: SnackBarE2EComponent = new SnackBarE2EComponent();
+	private readonly vorgangList: VorgangListE2EComponent = new VorgangListE2EComponent();
+	private readonly vorgangSearch: VorgangSearchE2EComponent = new VorgangSearchE2EComponent();
 	private readonly internalServerErrorDialog: InternalServerErrorDialogE2EComponent = new InternalServerErrorDialogE2EComponent();
 	private readonly connectionTimeoutRetryDialog: ConnectionTimeoutRetryDialogE2EComponent = new ConnectionTimeoutRetryDialogE2EComponent();
 	private readonly connectionTimeoutRetryFailDialog: ConnectionTimeoutRetryFailDialogE2EComponent = new ConnectionTimeoutRetryFailDialogE2EComponent();
 
-	public open() {
-		cy.visit('/');
-	}
-
 	public getHeader(): HeaderE2EComponent {
 		return this.header;
 	}
 
+	public getNavigation(): NavigationE2EComponent {
+		return this.navigation;
+	}
+
 	public getSnackBar(): SnackBarE2EComponent {
 		return this.snackBar;
 	}

goofy-client/apps/goofy-e2e/src/support/cypress-helper.ts

@@ -80,3 +80,10 @@ export function readFileFromDownloads(fileName: string) {
 export function getBaseUrl() {
 	return Cypress.config().baseUrl;
 }
+
+
+
+//Env
+export function getCypressEnv(value: string) {
+	return Cypress.env(value);
+}
\ No newline at end of file

goofy-client/apps/goofy-e2e/src/support/user-util.ts

 import { UserE2E } from '../model/user';
-import { login } from './cypress-helper';
+import { getCypressEnv, login } from './cypress-helper';
 
 const sabineFixture: UserE2E = require('../fixtures/user/user_sabine.json');
 const emilFixture: UserE2E = require('../fixtures/user/user_emil.json');
@@ -12,6 +12,10 @@ export function getUserSabine(): UserE2E {
 	return sabineFixture;
 }
 
+export function getUserSabineUuid(): string {
+	return getCypressEnv('sabineUuid');
+}
+
 enum DatabaseUser {
 	EMIL = 'user/user_emil.json',
 	KFINDER = 'user/user_kfinder.json',

goofy-client/libs/navigation/src/lib/header-container/header/header.component.html

@@ -2,6 +2,7 @@
 	<div class="left">
 		<goofy-client-icon-button-with-spinner icon="menu" toolTip="Hauptmenü umschalten" (clickEmitter)="toggleMenuEvent.emit(!this.navigationCollapse)">
 		</goofy-client-icon-button-with-spinner>
+		<!-- TODO: Logo in eigene Componente auslagern -->
 		<a routerLink="/" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
 			<img src="/assets/img/logo.svg" alt="Goofy Logo"/>
 			<div class="title" data-test-id='title'>Goofy</div>
@@ -16,6 +17,7 @@
 
 		<goofy-client-settings [darkMode]="darkMode" (darkModeEmitter)="darkModeEmitter.emit($event)"></goofy-client-settings>
 
+		<!-- TODO: User Profile in eigene Componente auslagern -->
 		<button mat-icon-button [matMenuTriggerFor]="accountMenu" class="big-button" aria-label="Benutzerkonto" data-test-id="user-icon-button"
 				matTooltip="Benutzerkonto Icon/Initialen">
 			<goofy-client-user-icon></goofy-client-user-icon>

goofy-client/libs/navigation/src/lib/navigation/my-vorgaenge-navigation-item/my-vorgaenge-navigation-item.component.html

-<a #home="routerLinkActive" routerLink="/meineVorgaenge"
+<a #home="routerLinkActive" routerLink="/myVorgaenge"
 		routerLinkActive="active"
 		[routerLinkActiveOptions]="{ exact: true }"
 		[matTooltip]="navigationCollapse ? label: null"

goofy-client/libs/navigation/src/lib/navigation/navigation.component.html

 <ng-container *ngIf="apiRootStateResource$ | async as apiRootStateResource">
-	<nav [ngClass]="{ small: navigationCollapse$ | async }">
+	<nav [ngClass]="{ small: navigationCollapse$ | async }" data-test-id="navigation">
 		<ul>
 			<li>
 				<goofy-client-all-vorgaenge-navigation-item *ngIf="apiRootStateResource.resource | hasLink: apiRootLinkRel.VORGAENGE" data-test-id="all-vorgaenge-navigation-item"

goofy-client/libs/tech-shared/src/lib/service/navigation.service.spec.ts

@@ -47,9 +47,9 @@ describe('NavigationService', () => {
 	describe('isMeineVorgaengeNavigation', () => {
 
 		it('should return true', () => {
-			router.url = '/meineVorgaenge';
+			router.url = '/myVorgaenge';
 
-			const isMeineVorgaenge: boolean = service.isMeineVorgaengeNavigation();
+			const isMeineVorgaenge: boolean = service.isMyVorgaengeNavigation();
 
 			expect(isMeineVorgaenge).toBeTruthy();
 		})
@@ -57,7 +57,7 @@ describe('NavigationService', () => {
 		it('should return false', () => {
 			router.url = '/';
 
-			const isMeineVorgaenge: boolean = service.isMeineVorgaengeNavigation();
+			const isMeineVorgaenge: boolean = service.isMyVorgaengeNavigation();
 
 			expect(isMeineVorgaenge).toBeFalsy();
 		})
@@ -68,11 +68,11 @@ describe('NavigationService', () => {
 		describe('to vorganglist', () => {
 
 			it('should navigate to vorganglist on navigation my vorgaenge', () => {
-				router.url = '/meineVorgaenge';
+				router.url = '/myVorgaenge';
 
 				service.navigateToVorgangList();
 
-				expect(router.navigate).toHaveBeenCalledWith(['/meineVorgaenge/']);
+				expect(router.navigate).toHaveBeenCalledWith(['/myVorgaenge/']);
 			})
 
 			it('should navigate to vorganglist on navigation all vorgaenge', () => {

goofy-client/libs/tech-shared/src/lib/service/navigation.service.ts

@@ -110,12 +110,12 @@ export class NavigationService {
 	}
 
 	private getRootPath(): string {
-		return this.isMeineVorgaengeNavigation() ? '/meineVorgaenge/' : '/';
+		return this.isMyVorgaengeNavigation() ? '/myVorgaenge/' : '/';
 	}
 
-	public isMeineVorgaengeNavigation(): boolean {
+	public isMyVorgaengeNavigation(): boolean {
 		const url: string = this.router.url;
-		return url.includes('meineVorgaenge');
+		return url.includes('myVorgaenge');
 	}
 
 	public navigateToVorgang(linkUri: ResourceUri): void {

goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.spec.ts

@@ -223,11 +223,11 @@ describe('VorgangListService', () => {
 
 	describe('onNavigation', () => {
 
-		describe('to meineVorgaenge', () => {
+		describe('to myVorgaenge', () => {
 
 			it('should set vorgang list to reload', () => {
 				service.setVorgangListToReload = jest.fn();
-				navigationService.isMeineVorgaengeNavigation.mockReturnValue(true);
+				navigationService.isMyVorgaengeNavigation.mockReturnValue(true);
 
 				service.onNavigation({});
 
@@ -336,7 +336,7 @@ describe('VorgangListService', () => {
 				service.searchInfo$.next(<SearchInfo>{ searchString, changedAfterSearchDone: false });
 			})
 			it('should call repository loadVorgangList with "' + ApiRootLinkRel.SEARCH_MY_VORGAENGE + '" link', () => {
-				navigationService.isMeineVorgaengeNavigation.mockReturnValue(true);
+				navigationService.isMyVorgaengeNavigation.mockReturnValue(true);
 
 				service.loadVorgangList(apiRootResource);
 
@@ -344,7 +344,7 @@ describe('VorgangListService', () => {
 			})
 
 			it('should call repository searchVorgaengeBy with "' + ApiRootLinkRel.SEARCH + '" link', () => {
-				navigationService.isMeineVorgaengeNavigation.mockReturnValue(false);
+				navigationService.isMyVorgaengeNavigation.mockReturnValue(false);
 
 				service.loadVorgangList(apiRootResource);
 
@@ -355,7 +355,7 @@ describe('VorgangListService', () => {
 		describe('on empty search string', () => {
 
 			it('should call repository loadMyVorgaengeList on "myVorgange" navigation', () => {
-				navigationService.isMeineVorgaengeNavigation.mockReturnValue(true);
+				navigationService.isMyVorgaengeNavigation.mockReturnValue(true);
 				repository.loadMyVorgaengeList.mockReturnValue(of(vorgangListResource));
 
 				service.loadVorgangList(apiRootResource);
@@ -364,7 +364,7 @@ describe('VorgangListService', () => {
 			})
 
 			it('should call repository loadVorgangList on "allVorgange" navigation', () => {
-				navigationService.isMeineVorgaengeNavigation.mockReturnValue(false);
+				navigationService.isMyVorgaengeNavigation.mockReturnValue(false);
 				repository.loadVorgangList.mockReturnValue(of(vorgangListResource));
 
 				service.loadVorgangList(apiRootResource);
@@ -402,7 +402,7 @@ describe('VorgangListService', () => {
 		describe('loadVorgangSearchPreviewList', () => {
 
 			it('should call repository', () => {
-				navigationService.isMeineVorgaengeNavigation.mockReturnValue(false);
+				navigationService.isMyVorgaengeNavigation.mockReturnValue(false);
 
 				service.loadVorgangSearchPreviewList(apiRootResource, SEARCH_STRING);
 

goofy-client/libs/vorgang-shared/src/lib/vorgang-list.service.ts

@@ -40,7 +40,7 @@ export class VorgangListService {
 	}
 
 	onNavigation(params: Params): void {
-		if (this.navigationService.isMeineVorgaengeNavigation()) {
+		if (this.navigationService.isMyVorgaengeNavigation()) {
 			this.setVorgangListToReload();
 		}
 		if (NavigationService.isVorgangListPage(params)) {
@@ -106,7 +106,7 @@ export class VorgangListService {
 		this.setVorgangListLoading();
 
 		if (isEmpty(this.searchInfo$.value.searchString)) {
-			if (this.navigationService.isMeineVorgaengeNavigation()) {
+			if (this.navigationService.isMyVorgaengeNavigation()) {
 				return this.vorgangRepository.loadMyVorgaengeList(apiRootResource);
 			} else {
 				return this.vorgangRepository.loadVorgangList(apiRootResource);
@@ -191,7 +191,7 @@ export class VorgangListService {
 	}
 
 	private getSearchLinkRel(): string {
-		return this.navigationService.isMeineVorgaengeNavigation() ? ApiRootLinkRel.SEARCH_MY_VORGAENGE : ApiRootLinkRel.SEARCH;
+		return this.navigationService.isMyVorgaengeNavigation() ? ApiRootLinkRel.SEARCH_MY_VORGAENGE : ApiRootLinkRel.SEARCH;
 	}
 
 	private updateVorgangSearchPreviewList(vorgangList: VorgangListResource): void {

goofy-client/libs/vorgang/src/lib/vorgang.module.ts

@@ -25,11 +25,11 @@ const routes: Routes = [
 		component: VorgangListPageComponent
 	},
 	{
-		path: 'meineVorgaenge',
+		path: 'myVorgaenge',
 		component: VorgangListPageComponent
 	},
 	{
-		path: 'meineVorgaenge/search/:search',
+		path: 'myVorgaenge/search/:search',
 		component: VorgangListPageComponent
 	},
 	{