From 3cf68b869decf07ff7435fe1436d4f3134df1bf4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 14 Dec 2021 17:17:01 +0100 Subject: Ability for admins to set default upload values --- scripts/e2e/browserstack.sh | 6 +----- scripts/e2e/local.sh | 14 ++------------ 2 files changed, 3 insertions(+), 17 deletions(-) (limited to 'scripts/e2e') diff --git a/scripts/e2e/browserstack.sh b/scripts/e2e/browserstack.sh index fb125ea23..ad6268d42 100755 --- a/scripts/e2e/browserstack.sh +++ b/scripts/e2e/browserstack.sh @@ -2,8 +2,4 @@ set -eu -npm run clean:server:test - -npm run concurrently -- -k -s first \ - "cd client/e2e && ../node_modules/.bin/wdio run ./wdio.browserstack.conf.ts" \ - "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"rates_limit\": { \"api\": { \"max\": 5000 }, \"login\": { \"max\": 5000 } }, \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server" +cd client/e2e && ../node_modules/.bin/wdio run ./wdio.browserstack.conf.ts diff --git a/scripts/e2e/local.sh b/scripts/e2e/local.sh index fe8b7f559..0e0368c52 100755 --- a/scripts/e2e/local.sh +++ b/scripts/e2e/local.sh @@ -2,16 +2,6 @@ set -eu -npm run clean:server:test +cd client/e2e -config="{" -config+=" \"rates_limit\": { \"api\": { \"max\": 5000 }, \"login\": { \"max\": 5000 } }" -config+=", \"log\": { \"level\": \"warn\" }" -config+=", \"signup\": { \"enabled\": false }" -config+=", \"transcoding\": { \"enabled\": false }" -config+="}" - -npm run concurrently -- -k -s first \ - "cd client/e2e && ../node_modules/.bin/wdio run ./wdio.local.conf.ts" \ - "NODE_ENV=test NODE_CONFIG='$config' NODE_APP_INSTANCE=1 node dist/server" \ - "NODE_ENV=test NODE_CONFIG='$config' NODE_APP_INSTANCE=2 node dist/server" +../node_modules/.bin/wdio run ./wdio.local.conf.ts -- cgit v1.2.3