aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts/e2e
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-09-03 10:27:04 +0200
committerChocobozzz <me@florianbigard.com>2021-09-03 16:35:18 +0200
commit6d210220be0875d63461829d83c6e3a59d05cf7a (patch)
tree60ec5b596ef06295b70ebb553920a39b549e0f13 /scripts/e2e
parent2ede07153ce0282b116345dfee09bff902355a75 (diff)
downloadPeerTube-6d210220be0875d63461829d83c6e3a59d05cf7a.tar.gz
PeerTube-6d210220be0875d63461829d83c6e3a59d05cf7a.tar.zst
PeerTube-6d210220be0875d63461829d83c6e3a59d05cf7a.zip
Fix NSFW filter and add tests
Diffstat (limited to 'scripts/e2e')
-rwxr-xr-xscripts/e2e/browserstack.sh2
-rwxr-xr-xscripts/e2e/local.sh10
2 files changed, 10 insertions, 2 deletions
diff --git a/scripts/e2e/browserstack.sh b/scripts/e2e/browserstack.sh
index 69a12d14c..fb125ea23 100755
--- a/scripts/e2e/browserstack.sh
+++ b/scripts/e2e/browserstack.sh
@@ -6,4 +6,4 @@ npm run clean:server:test
6 6
7npm run concurrently -- -k -s first \ 7npm run concurrently -- -k -s first \
8 "cd client/e2e && ../node_modules/.bin/wdio run ./wdio.browserstack.conf.ts" \ 8 "cd client/e2e && ../node_modules/.bin/wdio run ./wdio.browserstack.conf.ts" \
9 "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server" 9 "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"
diff --git a/scripts/e2e/local.sh b/scripts/e2e/local.sh
index bbbdb5f0b..fe8b7f559 100755
--- a/scripts/e2e/local.sh
+++ b/scripts/e2e/local.sh
@@ -4,6 +4,14 @@ set -eu
4 4
5npm run clean:server:test 5npm run clean:server:test
6 6
7config="{"
8config+=" \"rates_limit\": { \"api\": { \"max\": 5000 }, \"login\": { \"max\": 5000 } }"
9config+=", \"log\": { \"level\": \"warn\" }"
10config+=", \"signup\": { \"enabled\": false }"
11config+=", \"transcoding\": { \"enabled\": false }"
12config+="}"
13
7npm run concurrently -- -k -s first \ 14npm run concurrently -- -k -s first \
8 "cd client/e2e && ../node_modules/.bin/wdio run ./wdio.local.conf.ts" \ 15 "cd client/e2e && ../node_modules/.bin/wdio run ./wdio.local.conf.ts" \
9 "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server" 16 "NODE_ENV=test NODE_CONFIG='$config' NODE_APP_INSTANCE=1 node dist/server" \
17 "NODE_ENV=test NODE_CONFIG='$config' NODE_APP_INSTANCE=2 node dist/server"