From 7c71d9d75fdc5a12a9929cf2dc0fc5d5209fa2b9 Mon Sep 17 00:00:00 2001
From: Tiago Melo <tmelo@suse.com>
Date: Wed, 6 May 2020 14:55:42 +0000
Subject: [PATCH] mgr/dashboard: Improve run-frontend-e2e-tests.sh

Allow to configure Cypress using env vars.

Fixes: https://tracker.ceph.com/issues/45408

Add Signed-off-by: Tiago Melo <tmelo@suse.com>
---
 .../mgr/dashboard/run-frontend-e2e-tests.sh   | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
index 56022a53e2785..e144bc4bc588d 100755
--- a/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
+++ b/src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
@@ -30,7 +30,6 @@ stop() {
 }
 
 check_device_available() {
-    : ${DEVICE:="chrome"}
     failed=false
 
     if [ "$DEVICE" == "docker" ]; then
@@ -56,13 +55,13 @@ check_device_available() {
     fi
 }
 
-CYPRESS_BASE_URL=''
-DEVICE=''
-CYPRESS_LOGIN_PWD=''
-CYPRESS_LOGIN_USER=''
-NO_COLOR=1
-RECORD=''
-REMOTE='false'
+: ${CYPRESS_BASE_URL:=''}
+: ${CYPRESS_LOGIN_PWD:=''}
+: ${CYPRESS_LOGIN_USER:=''}
+: ${DEVICE:="chrome"}
+: ${NO_COLOR:=1}
+: ${CYPRESS_ARGS:=''}
+: ${REMOTE:='false'}
 
 while getopts 'd:p:r:u:' flag; do
   case "${flag}" in
@@ -93,20 +92,7 @@ fi
 
 cd $DASH_DIR/frontend
 
-if [ -n "$CYPRESS_RECORD_KEY" ]; then
-    RECORD="--record --key $CYPRESS_RECORD_KEY"
-fi
-
 case "$DEVICE" in
-    electron)
-        npx cypress run $RECORD || stop 1
-        ;;
-    chrome)
-        npx cypress run $RECORD --browser chrome --headless || stop 1
-        ;;
-    chromium)
-        npx cypress run $RECORD --browser chromium --headless || stop 1
-        ;;
     docker)
         failed=0
         docker run \
@@ -120,6 +106,9 @@ case "$DEVICE" in
             cypress/included:4.4.0 || failed=1
         stop $failed
         ;;
+    *)
+        npx cypress run $CYPRESS_ARGS --browser $DEVICE --headless || stop 1
+        ;;
 esac
 
 stop 0
-- 
2.39.5