diff --git a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-bescheid-wizard.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-bescheid-wizard.e2e.component.ts
index 5399b2b0e7a3b32a59e241125032d7c3e784419b..7f98c1f4d53a45670495bcef72fb05647a025e30 100644
--- a/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-bescheid-wizard.e2e.component.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/vorgang/vorgang-bescheid-wizard.e2e.component.ts
@@ -141,11 +141,11 @@ export class VorgangBescheidWizardE2EComponent {
}
public getFileBescheidValid() {
- return cy.getTestElement(this.fileBescheidValid);
+ return cy.getTestElement(this.locatorRoot).find(`[data-test-id=${this.fileBescheidValid}]`);
}
public getFileAnhangValid() {
- return cy.getTestElement(this.fileAnhangValid);
+ return cy.getTestElement(this.locatorRoot).find(`[data-test-id=${this.fileAnhangValid}]`);
}
public getDeleteButtonOfElement(element: string) {
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-dokumente-hochladen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-dokumente-hochladen.cy.ts
index 932fc5fd0e692547533094f918843432cf895304..3d11a1a9baa58f0c1bcba190014d42679ac4682c 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-dokumente-hochladen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-dokumente-hochladen.cy.ts
@@ -42,6 +42,7 @@ describe('Bescheid Wizard', () => {
const documentError: string = 'Erlaubte Dateiendungen';
const sizeError: string = 'Anhänge größer';
+ const missingBescheidError: string = 'Bitte fügen Sie';
before(() => {
initVorgaenge([bescheidVorgang]);
@@ -136,4 +137,11 @@ describe('Bescheid Wizard', () => {
contains(bescheidWizard.getAttachmentDocument(), sizeError);
});
});
+
+ describe('do not continue without attached Bescheid', () => {
+ it('should show error if no Bescheid is attached and step 3 is clicked', () => {
+ bescheidWizard.getWeiterButton().click();
+ contains(bescheidWizard.getBescheidDocument(), missingBescheidError);
+ });
+ });
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-wizard.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-wizard.cy.ts
index 2176cc6513a43aab869e060775e3f0218ebb57ca..66bbf7006ffa9fadf26b4daf4bbef2a296cd00b3 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-wizard.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-bescheid/vorgang-bescheid-wizard.cy.ts
@@ -13,7 +13,7 @@ import 'cypress-real-events/support';
import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
-import { dropCollections } from '../../../support/cypress-helper';
+import { dropCollections, wait } from '../../../support/cypress-helper';
import { contains, enterWith, exist, haveText, notExist } from '../../../support/cypress.util';
import { TEST_FILE_BESCHEID_VALID } from '../../../support/data.util';
import { getAdjustedDateEnglish, getAdjustedDateGerman } from '../../../support/tech.util';
@@ -131,7 +131,7 @@ describe('Bescheid Wizard', () => {
bescheidWizard.getUeberspringenAbschliessen().click();
notExist(bescheidWizard.getRoot());
- cy.wait(1000);
+ wait(1000);
haveText(
vorgangPage.getVorgangDetailHeader().getStatus(),
vorgangStatusLabelE2E[VorgangStatusE2E.ABGESCHLOSSEN],
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-exportieren.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-exportieren.cy.ts
index 21df29a9ff630ddbcfbce10277b1b078ac7c2bd2..9e3acf7d570c338c411dabff1d0ac698e56982ad 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-exportieren.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-exportieren.cy.ts
@@ -36,7 +36,6 @@ import {
countDownloadFiles,
deleteDownloadFolder,
dropCollections,
- wait,
} from '../../../support/cypress-helper';
import { exist, notExist } from '../../../support/cypress.util';
import { loginAsSabine } from '../../../support/user-util';
@@ -89,16 +88,19 @@ describe('Vorgang exportieren', () => {
it('should show "Herunterladen" button', () => {
exist(menuItem.getButton());
+
+ vorgangMoreMenu.getButton().click({ force: true });
});
it('should have 1 file in download folder after download', () => {
- deleteDownloadFolder();
- wait(1000);
- menuItem.getButton().click();
-
- waitForSpinnerToDisappear();
- countDownloadFiles().then((count) => {
- expect(count).to.eq(1);
+ deleteDownloadFolder().then(() => {
+ vorgangMoreMenu.getButton().click();
+ menuItem.getButton().click();
+ waitForSpinnerToDisappear();
+
+ countDownloadFiles().then((count) => {
+ expect(count).to.eq(1);
+ });
});
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-verwerfen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-verwerfen.cy.ts
index 8cd389a16c1377c4e7fa938b20773466f9f568da..08eb091172c0888911b99f3f0d82e77e5bb4c627 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-verwerfen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-verwerfen.cy.ts
@@ -60,15 +60,11 @@ describe('Vorgang Verwerfen', () => {
const vorgangVerwerfenRevoke: VorgangE2E = { ...buildVorgang(objectIds[0], 'DoRevokeVerwerfen') };
before(() => {
- console.log('initVorgaenge');
initVorgaenge([vorgangVerwerfen, vorgangVerwerfenRevoke]);
- console.log('loginAsSabine');
loginAsSabine();
- console.log('waitforspinner');
waitForSpinnerToDisappear();
- console.log('exists vorganglist.root');
exist(vorgangList.getRoot());
});
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts b/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts
index 4525d7046bc7a7fd97852478e4aee4154dcef3f7..a2b56d8fccb2e5069dfcecdd72375aae9c9ba949 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts
@@ -131,8 +131,8 @@ export function countDownloadFiles(): Cypress.Chainable<number> {
return cy.task(CypressTasks.COUNT_FILES, DOWNLOAD_FOLDER);
}
-export function deleteDownloadFolder(): void {
- cy.task(CypressTasks.DELETE_FOLDER, DOWNLOAD_FOLDER);
+export function deleteDownloadFolder() {
+ return cy.task(CypressTasks.DELETE_FOLDER, DOWNLOAD_FOLDER);
}
export function scrollToWindowBottom(): void {
diff --git a/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts b/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
index 553cb733d4b8ef0c47cb64e79b6116011df16888..1e965a342e415f6825afaa78d27a684a8a125bfa 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
@@ -1,6 +1,5 @@
-import { rmdir } from 'fs';
+import { readdir, remove } from 'fs-extra';
import { Db, Long, MongoClient, ObjectId } from 'mongodb';
-const fs = require('fs');
const Binary = require('mongodb').Binary;
@@ -317,26 +316,20 @@ function dropCollections(databaseUrl, databaseName, collections) {
});
}
-function countFiles(folderName: string): Promise<number> {
- return new Promise((resolve, reject) => {
- fs.readdir(folderName, (err, files) => {
- if (err) {
- console.error(err);
- return reject(err);
- }
- resolve(files.length);
+function countFiles(folderName) {
+ return readdir(folderName)
+ .then((files) => files.length)
+ .catch((err) => {
+ throw new Error(`Counting files failed: ${err.message}`);
});
- });
}
function deleteFolder(folderName: string): void {
- new Promise((resolve, reject) => {
- rmdir(folderName, { maxRetries: 10, recursive: true }, (err) => {
- if (err) {
- console.error(err);
- return reject(err);
- }
- resolve(null);
+ return remove(folderName)
+ .then(() => {
+ return null;
+ })
+ .catch((err) => {
+ throw new Error(`Failed to delete folder: ${err.message}`);
});
- });
}