From 4c8ef0ec684f5dd1856ec751420b1e85369fd1bf Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 21 Oct 2019 16:24:06 +0200 Subject: Add tsconfig-paths registration to mocha --- server/tests/api/ci-1.sh | 2 +- server/tests/api/ci-2.sh | 5 +++-- server/tests/api/ci-3.sh | 2 +- server/tests/api/ci-4.sh | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'server/tests/api') diff --git a/server/tests/api/ci-1.sh b/server/tests/api/ci-1.sh index 90ffd568b..faa440785 100644 --- a/server/tests/api/ci-1.sh +++ b/server/tests/api/ci-1.sh @@ -6,5 +6,5 @@ checkParamFiles=$(find server/tests/api/check-params -type f | grep -v index.ts notificationsFiles=$(find server/tests/api/notifications -type f | grep -v index.ts | xargs echo) searchFiles=$(find server/tests/api/search -type f | grep -v index.ts | xargs echo) -MOCHA_PARALLEL=true npm run mocha -- --timeout 30000 --exit --require ts-node/register --bail \ +MOCHA_PARALLEL=true npm run mocha -- --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \ $notificationsFiles $searchFiles $checkParamFiles diff --git a/server/tests/api/ci-2.sh b/server/tests/api/ci-2.sh index 16ab585e9..52c839d12 100644 --- a/server/tests/api/ci-2.sh +++ b/server/tests/api/ci-2.sh @@ -5,5 +5,6 @@ set -eu serverFiles=$(find server/tests/api/server -type f | grep -v index.ts | xargs echo) usersFiles=$(find server/tests/api/users -type f | grep -v index.ts | xargs echo) -MOCHA_PARALLEL=true npm run mocha-parallel-tests -- --max-parallel $1 --timeout 30000 --exit --require ts-node/register --bail \ - $serverFiles $usersFiles +MOCHA_PARALLEL=true npm run mocha-parallel-tests -- --max-parallel $1 --timeout 30000 --exit \ + --require ts-node/register --require tsconfig-paths/register --bail \ + $serverFiles $usersFiles diff --git a/server/tests/api/ci-3.sh b/server/tests/api/ci-3.sh index 7aeea7fcb..ae5bb735a 100644 --- a/server/tests/api/ci-3.sh +++ b/server/tests/api/ci-3.sh @@ -4,5 +4,5 @@ set -eu videosFiles=$(find server/tests/api/videos -type f | grep -v index.ts | xargs echo) -npm run mocha -- --timeout 30000 --exit --require ts-node/register --bail \ +npm run mocha -- --timeout 30000 --exit --require ts-node/register --require tsconfig-paths/register --bail \ $videosFiles diff --git a/server/tests/api/ci-4.sh b/server/tests/api/ci-4.sh index 74809e1ad..22785cf33 100644 --- a/server/tests/api/ci-4.sh +++ b/server/tests/api/ci-4.sh @@ -5,5 +5,6 @@ set -eu redundancyFiles=$(find server/tests/api/redundancy -type f | grep -v index.ts | xargs echo) activitypubFiles=$(find server/tests/api/activitypub -type f | grep -v index.ts | xargs echo) -MOCHA_PARALLEL=true npm run mocha-parallel-tests -- --max-parallel $1 --timeout 30000 --exit --require ts-node/register --bail \ - $redundancyFiles $activitypubFiles +MOCHA_PARALLEL=true npm run mocha-parallel-tests -- --max-parallel $1 --timeout 30000 --exit \ + --require ts-node/register --require tsconfig-paths/register --bail \ + $redundancyFiles $activitypubFiles -- cgit v1.2.3