X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Ftravis.sh;h=3557816c8c48f53b3a06a0d87baa64bc56a0b1db;hb=19041ac885f98de5494476376b65d454c656b230;hp=1d7ebf3403d890115aaeb22e91806a70108a459e;hpb=7f5f4152a4cd4fc328d6ae177d281ebe7e792dd3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/travis.sh b/scripts/travis.sh
index 1d7ebf340..3557816c8 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -11,31 +11,29 @@ killall -q peertube || true
 
 if [ "$1" = "misc" ]; then
     npm run build -- --light-fr
-    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/client.ts server/tests/activitypub.ts \
-        server/tests/feeds/index.ts
-elif [ "$1" = "api" ]; then
-    npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index.ts
+    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/client.ts \
+        server/tests/feeds/index.ts \
+        server/tests/misc-endpoints.ts \
+        server/tests/helpers/index.ts
 elif [ "$1" = "cli" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/cli/index.ts
+    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts
 elif [ "$1" = "api-1" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-1.ts
+    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-1.ts
 elif [ "$1" = "api-2" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-2.ts
+    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-2.ts
 elif [ "$1" = "api-3" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-3.ts
+    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-3.ts
+elif [ "$1" = "api-4" ]; then
+    npm run build:server
+    mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-4.ts
 elif [ "$1" = "lint" ]; then
+    npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
+
     ( cd client
       npm run lint
     )
-elif [ "$1" = "jest" ]; then 
-    ( cd client
-      npm run test
-    )
-
-    npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
 fi