Sync master & dev branches

.gitignore

@@ -34,6 +34,9 @@ yarn-error.log
 testem.log
 /typings
 
+# Documentation Styling
+frontend/src/assets/documentation/styles/site.css
+
 # environment variables
 .env
 environment.prod.ts

Dockerfile

@@ -69,7 +69,7 @@ RUN add-apt-repository "deb [arch=amd64] https://packages.microsoft.com/repos/ed
 RUN apt-get update && apt-get install -qq -y microsoft-edge-stable
 
 # Install msedgedriver
-RUN npm install --ignore-scripts -g edgedriver
+RUN npm install --ignore-scripts -g edgedriver node-fetch
 
 # Show Edge and EdgeDriver version
 RUN microsoft-edge --version

backend/Dockerfile

@@ -53,7 +53,7 @@ RUN cat latest_stable.txt
 # fi
 
 # Install msedgedriver
-RUN npm install --ignore-scripts -g edgedriver
+RUN npm install --ignore-scripts -g edgedriver node-fetch
 
 # Show Edge and EdgeDriver version
 RUN microsoft-edge --version

backend/features/step_definitions/stepdefs.js

@@ -63,7 +63,6 @@ edgeOptions.addArguments('--lang=de');
 edgeOptions.addArguments('--excludeSwitches=enable-logging');
 // chromeOptions.addArguments('--start-fullscreen');
 
-chromeOptions.bynary_location = process.env.GOOGLE_CHROME_SHIM;
 let currentParameters = {};
 
 const NotFoundError = (e) => Error(`ElementNotFoundError: ${e}`);
@@ -623,7 +622,7 @@ Then('So I will be navigated to the website: {string}', async function checkUrl(
 		const world = this;
 		try {
 			await driver.getCurrentUrl().then(async (currentUrl) => {
-				expect(currentUrl).to.equal(url, 'Error');
+				expect(currentUrl.replace(/\/$/g, '') == url.replace(/[\s]|\/\s*$/g, '') , 'ERROR expected: ' + url.replace(/[\s]|\/\s*$/g, '') + '; actual: ' + currentUrl.replace(/\/$/g, '')).to.be.true
 			});
 		} catch (e) {
 			await driver.takeScreenshot().then(async (buffer) => {