From d827155fb6bce56df2c59e7d6ca25b2344f67578 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 22 Jul 2020 10:50:03 +0200
Subject: [PATCH] Update e2e wrapper
---
package.json | 1 -
scripts/e2e.sh | 15 ++++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 1f9cddac3..85e248ba0 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,6 @@
"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",
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index 620000c16..308a64f6a 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -3,6 +3,9 @@
# Wrapper for protractor/node bug when running e2e tests inside docker container
# @see https://github.com/angular/protractor/issues/5453
+# Ensure Chromedriver is at the right version
+./node_modules/.bin/webdriver-manager update --gecko=false --versions.chrome=83.0.4103.39
+
COMMAND="./node_modules/.bin/ng e2e $@"
# echo "Commande: $COMMAND"
@@ -14,9 +17,19 @@ else
# Yes: capture Protractor output
OUT=$(eval $COMMAND 2>&1)
- # Still display it on screen
+ # Store return code of ng e2e
+ RET=$?
+
+ # Still display output on screen
echo "$OUT"
# Look for success indicator
echo "$OUT" | grep "SUCCESS"
+
+ # OK if ng e2e command returned 0 or else SUCCESS was found in output
+ if [[ "$RET" == 0 || "$?" == 0 ]]; then
+ exit 0
+ else
+ exit 1
+ fi
fi
--
GitLab