diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml index a21f0a0ed9380828cc69ea16ca78f305e108b18b..ced13a62dd1812016bb37302ae40ba047132197a 100644 --- a/alfa-client/apps/alfa-e2e/docker-compose.yml +++ b/alfa-client/apps/alfa-e2e/docker-compose.yml @@ -92,6 +92,8 @@ services: - GRPC_CLIENT_VORGANG-MANAGER_NEGOTIATIONTYPE=PLAINTEXT - GRPC_CLIENT_COLLABORATION-MANAGER_ADDRESS=static://vorgang-manager:9090 - GRPC_CLIENT_COLLABORATION-MANAGER_NEGOTIATIONTYPE=PLAINTEXT + - GRPC_CLIENT_ARCHIVE-MANAGER_ADDRESS=static://vorgang-manager:9090 + - GRPC_CLIENT_ARCHIVE-MANAGER_NEGOTIATIONTYPE=PLAINTEXT - GRPC_CLIENT_ZUFI-MANAGER_ADDRESS=static://zufi-manager-server:9190 - GRPC_CLIENT_ZUFI-MANAGER_NEGOTIATIONTYPE=PLAINTEXT - KEYCLOAK_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de diff --git a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-zusammenarbeit.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-zusammenarbeit.e2e.component.ts index 1a2f7205e5ce7174db1f50d4ddee33e7c512d06d..c2ea2acc8ce6afd516c4bc3bdf3bfe40f3cb63e8 100644 --- a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-zusammenarbeit.e2e.component.ts +++ b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-zusammenarbeit.e2e.component.ts @@ -134,6 +134,12 @@ export class VorgangZusammenarbeitE2EComponent { }); } + public expectNumberOfEntriesToBeGreaterThan(entries: number): void { + this.countSearchEntries().then((count) => { + expect(count).to.greaterThan(entries); + }); + } + public clickSearchEntry(index: number): void { cy.getTestElement(this.searchEntry).eq(index).click(); } diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts index 90432c2f5f5ebff2149483a5d4bd51344d6bc49e..b5325689ff01c2b61199ae06ef1e07ebc483a5b1 100644 --- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts +++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/init-users.cy.ts @@ -46,7 +46,7 @@ describe('Init users', () => { it('should login peter', () => { syncUser(DatabaseUser.PETER); }); - it('should login emil', () => { + xit('should login emil', () => { syncUser(DatabaseUser.EMIL); }); it('should login adelheit', () => { diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-xdomea/vorgang-archivieren.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-xdomea/vorgang-archivieren.cy.ts index abc019ef91238fa47685a5c00e8920d10581a000..a2a5a7c8b38cdfe441ad42110c91d5a14effbc4f 100644 --- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-xdomea/vorgang-archivieren.cy.ts +++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-xdomea/vorgang-archivieren.cy.ts @@ -64,14 +64,7 @@ describe('Vorgang archivieren', () => { exist(vorgangPage.getVorgangDetailHeader().getRoot()); }); - it('should not show "Archivieren" entry in Beschieden status', () => { - vorgangMoreMenu.getButton().click(); - - notExist(archivierenItem.getRoot()); - }); - it('should show "Archivieren" button in Abgeschlossen status', () => { - vorgangMoreMenu.getButton().click({ force: true }); vorgangFormularButtons.getAbschliessenButton().click(); waitForSpinnerToDisappear(); diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-xdomea/vorgang-exportieren.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-xdomea/vorgang-exportieren.cy.ts index 4f9097c8d1bbd8cfa37f87a86c9f00b81e3f16d6..73f039ec49b9edd6f277c6d78ba220b2447e8c1a 100644 --- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-xdomea/vorgang-exportieren.cy.ts +++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-xdomea/vorgang-exportieren.cy.ts @@ -26,19 +26,12 @@ import localeDe from '@angular/common/locales/de'; import localeDeExtra from '@angular/common/locales/extra/de'; import { SnackBarE2EComponent } from 'apps/alfa-e2e/src/components/ui/snackbar.e2e.component'; import { VorgangFormularButtonsE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-formular-buttons.e2e.components'; -import { - VorgangMoreMenuE2EComponent, - VorgangMoreMenuExportierenItemE2EComponent, -} from 'apps/alfa-e2e/src/components/vorgang/vorgang-more-menu.e2e.components'; +import { VorgangMoreMenuE2EComponent, VorgangMoreMenuExportierenItemE2EComponent } from 'apps/alfa-e2e/src/components/vorgang/vorgang-more-menu.e2e.components'; import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component'; import { VorgangE2E, VorgangStatusE2E } from '../../../model/vorgang'; import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po'; import { VorgangPage } from '../../../page-objects/vorgang.po'; -import { - countDownloadFiles, - deleteDownloadFolder, - dropCollections, -} from '../../../support/cypress-helper'; +import { countDownloadFiles, deleteDownloadFolder, dropCollections } from '../../../support/cypress-helper'; import { exist, notExist } from '../../../support/cypress.util'; import { loginAsSabine } from '../../../support/user-util'; import { createVorgang, initVorgaenge } from '../../../support/vorgang-util'; @@ -54,8 +47,7 @@ describe('Vorgang exportieren', () => { const vorgangPage: VorgangPage = new VorgangPage(); const vorgangMoreMenu: VorgangMoreMenuE2EComponent = vorgangPage.getMoreMenu(); - const vorgangFormularButtons: VorgangFormularButtonsE2EComponent = - vorgangPage.getFormularButtons(); + const vorgangFormularButtons: VorgangFormularButtonsE2EComponent = vorgangPage.getFormularButtons(); const vorgangExportieren: VorgangE2E = { ...createVorgang(), @@ -77,8 +69,7 @@ describe('Vorgang exportieren', () => { }); describe('export file', () => { - const menuItem: VorgangMoreMenuExportierenItemE2EComponent = - vorgangMoreMenu.getExportierenItem(); + const menuItem: VorgangMoreMenuExportierenItemE2EComponent = vorgangMoreMenu.getExportierenItem(); it('Open Vorgang-Detail-Page', () => { vorgangList.getListItem(vorgangExportieren.name).getRoot().click(); @@ -87,22 +78,6 @@ describe('Vorgang exportieren', () => { exist(vorgangPage.getVorgangDetailHeader().getRoot()); }); - it('open "more menu"', () => { - vorgangMoreMenu.getButton().click(); - - exist(vorgangMoreMenu.getRoot()); - }); - - it('should show menu contents', () => { - exist(menuItem.getRoot()); - }); - - it('should not show "Herunterladen" button in Beschieden status', () => { - notExist(menuItem.getButton()); - - vorgangMoreMenu.getButton().click({ force: true }); - }); - it('should show "Herunterladen" button in Abgeschlossen status', () => { vorgangFormularButtons.getAbschliessenButton().click(); waitForSpinnerToDisappear(); diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-zusammenarbeit/vorgang-zusammenarbeit-anfragen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-zusammenarbeit/vorgang-zusammenarbeit-anfragen.cy.ts index bc50ac53034f5dfa50c1506f27757bfe7d8bcc68..dafbaa8b123fb6be6ea913c592fa6bd9fb0b5af4 100644 --- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-zusammenarbeit/vorgang-zusammenarbeit-anfragen.cy.ts +++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-zusammenarbeit/vorgang-zusammenarbeit-anfragen.cy.ts @@ -124,10 +124,10 @@ describe('Vorgang Zusammenarbeit anfragen', () => { zusammenarbeitContainer.hasSearchText(''); }); - it('TODO: Setup Jenkins --- should find 2 results after entering kiel', () => { + it('should find more than 300 results after entering kiel', () => { zusammenarbeitContainer.enterSearchInput(stelleSearch2); - zusammenarbeitContainer.expectNumberOfEntriesToBe(2); + zusammenarbeitContainer.expectNumberOfEntriesToBeGreaterThan(300); }); it('should close layer after click on search entry', () => { diff --git a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.html b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.html index 7f5b31b5baabe5172e38e7fd8f4ee3913f272c91..949ac16d0afaa3ad4da2a68ff68531b002868682 100644 --- a/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.html +++ b/alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-list-container/collaboration-request/collaboration-request.component.html @@ -23,7 +23,7 @@ unter der Lizenz sind dem Lizenztext zu entnehmen. --> -<div class="m-2 mt-4 block bg-whitetext p-4" role="region" aria-labelledby="collaboration-title"> +<div class="m-2 mt-4 block bg-whitetext p-4" role="region" aria-labelledby="collaboration-title" data-test-id="collaboration-request-result"> <h2 id="collaboration-title" class="mb-4 text-xl text-text"> <span class="font-semibold">{{ collaboration.titel }}</span> </h2>