diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json
index 814e061ad715953b45342a9fde9a3dab6f7b17c3..7e02474fe5f97aaa5a7f7161d6476fc04462c046 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_ariane.json
@@ -10,7 +10,7 @@
"firstName": "Ariane",
"fullName": "Ariane Admin",
"lastName": "Admin",
- "email": "ariane-admin@ozg-sh.de",
+ "email": "ariane-admin@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [],
"roles": ["ADMIN_ADMIN", "VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json
index 8c8a317b75a24343340390cc1e8bd722e3948d93..2c87f7fdacacfdbde9da6c1283556a12e73add3e 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_dorothea.json
@@ -10,7 +10,7 @@
"firstName": "Dorothea",
"fullName": "Dorothea Doe",
"lastName": "Doe",
- "email": "dorothea.doe@ozg-sh.de",
+ "email": "dorothea.doe@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["9030229", "10363455", "248240886"],
"roles": ["VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json
index 2919f1b73675781d3f0b6b508a689f8587553216..f84b1f7bd73abde3e5a0eafe096e7e989f7f0f6f 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_emil.json
@@ -10,7 +10,7 @@
"firstName": "Emil",
"fullName": "Emil Ansprechpartner",
"lastName": "Ansprechpartner",
- "email": "emil.ansprechpartner@ozg-sh.de",
+ "email": "emil.ansprechpartner@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [],
"roles": ["EINHEITLICHER_ANSPRECHPARTNER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json
index 9bc95422fb2c6d99c6ea408d684e73b13fde1e08..6c0d961bd99a0f997153343106a8ca82b473d82c 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_peter.json
@@ -10,7 +10,7 @@
"firstName": "Peter",
"fullName": "Peter von der Post",
"lastName": "von der Post",
- "email": "peter.von.der.post@ozg-sh.de",
+ "email": "peter.von.der.post@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": [],
"roles": ["VERWALTUNG_POSTSTELLE"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json
index afc4c87496649073054973b8e9944a7740fe4d49..f6be06faa2fb4f03c6e7981399201d000f263dc9 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_sabine.json
@@ -10,7 +10,7 @@
"firstName": "Sabine",
"fullName": "Sabine Sach",
"lastName": "Sach",
- "email": "sabine.sach@ozg-sh.de",
+ "email": "sabine.sach@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["248240886"],
"roles": ["VERWALTUNG_USER"],
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json
index 013cd251b1f3d1e20c6b775c61c1f0a11471b50f..466f127e1c848d66409fc46da37b0482933d4eba 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/usermanager/usermanager_user_zelda.json
@@ -10,7 +10,7 @@
"firstName": "Zelda",
"fullName": "Zelda Zusammen",
"lastName": "Zusammen",
- "email": "zelda-z@ozg-sh.de",
+ "email": "zelda-z@e2e-ozg-sh.de",
"lastSyncTimestamp": 1663585874687,
"organisationsEinheitIds": ["9797773", "9093371"],
"roles": ["VERWALTUNG_USER"],
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 827b7b3d31d21f7c991796b5256302ae28354466..a1926d26e2cd70c9e92fc9fc40271a782ac16859 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress-tasks.ts
@@ -1,5 +1,6 @@
import { readdir, remove } from 'fs-extra';
import { Db, Long, MongoClient, ObjectId } from 'mongodb';
+
const fs = require('fs');
const decompress = require('decompress');
@@ -212,9 +213,7 @@ function createDate(field) {
}
function parseVorgangAttachedItemData(vorgangAttachedItems) {
- vorgangAttachedItems.forEach((vorgangAttachedItem) =>
- parseVorgangAttachedItem(vorgangAttachedItem),
- );
+ vorgangAttachedItems.forEach((vorgangAttachedItem) => parseVorgangAttachedItem(vorgangAttachedItem));
return vorgangAttachedItems;
}
@@ -247,7 +246,21 @@ function insertIntoDatabase(config, collection, data) {
}
function insertIntoUserManagerDatabase(config, collection, data) {
- insert(getUserManagerDatabaseUrl(config), getUserManagerDatabase(config), collection, data);
+ insertWithoutDrop(getUserManagerDatabaseUrl(config), getUserManagerDatabase(config), collection, data);
+}
+
+function insertWithoutDrop(databaseUrl, databaseName, collection, data) {
+ MongoClient.connect(databaseUrl, (error, connection) => {
+ console.log(`connect to ${databaseName} database with ${databaseUrl}`);
+ if (!error) {
+ console.log('success');
+ const db: Db = connection.db(databaseName);
+
+ db.createCollection(collection, (error) => handleCreateCollection(db, connection, collection, data, error));
+ } else {
+ console.error('Error: ', error);
+ }
+ });
}
function insert(databaseUrl, databaseName, collection, data) {
@@ -258,9 +271,7 @@ function insert(databaseUrl, databaseName, collection, data) {
const db: Db = connection.db(databaseName);
db.collection(collection).drop(() => {
- db.createCollection(collection, (error) =>
- handleCreateCollection(db, connection, collection, data, error),
- );
+ db.createCollection(collection, (error) => handleCreateCollection(db, connection, collection, data, error));
});
} else {
console.error('Error: ', error);
diff --git a/alfa-client/apps/alfa-e2e/src/support/user-util.ts b/alfa-client/apps/alfa-e2e/src/support/user-util.ts
index 2a1ea8cf43f2940f0bd57286224239ee681e7e7d..34d06a712b3944f70b621d4507ca2dfc3b6ca004 100644
--- a/alfa-client/apps/alfa-e2e/src/support/user-util.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/user-util.ts
@@ -23,7 +23,7 @@
*/
import { UserE2E } from '../model/user';
import { UsermanagerUserE2E } from '../model/usermanager';
-import { login } from './cypress-helper';
+import { initUsermanagerData, login } from './cypress-helper';
const sabineFixture: UserE2E = require('../fixtures/user-main/user_sabine.json');
const dorotheaFixture: UserE2E = require('../fixtures/user-main/user_dorothea.json');
@@ -38,14 +38,14 @@ const userManagerZeldaFixture: UsermanagerUserE2E = require('../fixtures/userman
const userManagerArianeFixture: UsermanagerUserE2E = require('../fixtures/usermanager/usermanager_user_ariane.json');
export function initUsermanagerUsers() {
- // initUsermanagerData([
- // getUserManagerUserSabine(),
- // getUserManagerUserPeter(),
- // getUserManagerUserEmil(),
- // getUserManagerUserDorothea(),
- // getUserManagerUserZelda(),
- // getUserManagerUserAriane(),
- // ]);
+ initUsermanagerData([
+ getUserManagerUserSabine(),
+ getUserManagerUserPeter(),
+ getUserManagerUserEmil(),
+ getUserManagerUserDorothea(),
+ getUserManagerUserZelda(),
+ getUserManagerUserAriane(),
+ ]);
}
export function getUserSabine(): UserE2E {