Skip to content
Snippets Groups Projects
Commit c19a4e42 authored by mathias.chouet's avatar mathias.chouet
Browse files

Revert "Add e2e wrapper for Docker bug; fix Chromedriver version"

This reverts commit 78f2cfe1.
parent 0ce35586
No related branches found
No related tags found
No related merge requests found
Pipeline #138225 failed
......@@ -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",
......
#!/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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment