From c19a4e426ba48081431f798efb47305dfb284414 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 10 Aug 2020 12:17:28 +0200
Subject: [PATCH] Revert "Add e2e wrapper for Docker bug; fix Chromedriver
version"
This reverts commit 78f2cfe11a29b3c087bc0bb9781d0a38fc6327e1.
---
package.json | 7 +++----
scripts/e2e.sh | 22 ----------------------
2 files changed, 3 insertions(+), 26 deletions(-)
delete mode 100755 scripts/e2e.sh
diff --git a/package.json b/package.json
index 8162ae974..ff0d1e000 100644
--- a/package.json
+++ b/package.json
@@ -9,11 +9,10 @@
"license": "MIT",
"scripts": {
"ng": "cd . && \"node_modules/.bin/ng\"",
- "postinstall": "./node_modules/.bin/webdriver-manager update --gecko=false --versions.chrome=83.0.4103.39",
"lint": "npm run ng -- lint",
- "e2e": "npm run preprocess && ./scripts/e2e.sh --suite=regular --webdriver-update=false",
- "e2equick": "./scripts/e2e.sh --dev-server-target= --suite=regular --webdriver-update=false",
- "monkeytest": "./scripts/e2e.sh --dev-server-target= --suite=monkeyTest --webdriver-update=false",
+ "e2e": "npm run preprocess && npm run ng -- e2e --suite=regular",
+ "e2equick": "npm run ng -- e2e --dev-server-target= --suite=regular",
+ "monkeytest": "npm run ng -- e2e --dev-server-target= --suite=monkeyTest",
"mkdocs": "node scripts/python3.js -m mkdocs build -f mkdocs-fr.yml && node scripts/python3.js -m mkdocs build -f mkdocs-en.yml && node scripts/mkdocs-postprocess.js",
"mkdocs2pdf": "node scripts/python3.js mkdocs2pdf.py",
"preprocess": "node scripts/preprocessors.js && npm run mkdocs",
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
deleted file mode 100755
index 620000c16..000000000
--- a/scripts/e2e.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Wrapper for protractor/node bug when running e2e tests inside docker container
-# @see https://github.com/angular/protractor/issues/5453
-
-COMMAND="./node_modules/.bin/ng e2e $@"
-# echo "Commande: $COMMAND"
-
-# Are we inside a GitLab CI/CD job (in Docker) ?
-if [ "$CI_JOB_ID" == "" ]; then
- # No: just run the command normally, to benefit from progressive output
- eval $COMMAND
-else
- # Yes: capture Protractor output
- OUT=$(eval $COMMAND 2>&1)
-
- # Still display it on screen
- echo "$OUT"
-
- # Look for success indicator
- echo "$OUT" | grep "SUCCESS"
-fi
--
GitLab