X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Ftravis.sh;h=5d195f902baae8f3de4abc6b52ff1fa4eedcb9a9;hb=54b3316099ed7d2dfcb6d708fdb686f1e125ce61;hp=79be234935849ce6c95618806c2b04ecbba19dca;hpb=0e4ffb4b678962d5ff7a4a7d8952033bc84725da;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/travis.sh b/scripts/travis.sh
index 79be23493..5d195f902 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -7,25 +7,35 @@ if [ $# -eq 0 ]; then
     exit -1
 fi
 
+killall -q peertube || true
+
 if [ "$1" = "misc" ]; then
-    npm run build
-    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/client.ts server/tests/activitypub.ts
+    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 server/tests/misc-endpoints.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
 elif [ "$1" = "cli" ]; then
     npm run build:server
     mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/cli/index.ts
-elif [ "$1" = "api-fast" ]; then
+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
+elif [ "$1" = "api-2" ]; then
     npm run build:server
-    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-fast.ts
-elif [ "$1" = "api-slow" ]; then
+    mocha --timeout 5000 --exit --require ts-node/register/type-check --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-slow.ts
+    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-3.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
     )
-
-    npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
+elif [ "$1" = "jest" ]; then
+    ( cd client
+      npm run test
+    )
 fi