aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-10-31 17:33:23 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-10-31 17:33:23 +0100
commit1b6b4757727da56061da0e17e7479f6062bb139f (patch)
tree9c673238153349978a0b77d52b4592cd6b7d950c
parent18530063feb3326369bf3871248b04de0ce4d2af (diff)
downloadPeerTube-1b6b4757727da56061da0e17e7479f6062bb139f.tar.gz
PeerTube-1b6b4757727da56061da0e17e7479f6062bb139f.tar.zst
PeerTube-1b6b4757727da56061da0e17e7479f6062bb139f.zip
Build server files before test the api
-rwxr-xr-xscripts/test.sh6
-rwxr-xr-xscripts/travis.sh6
2 files changed, 5 insertions, 7 deletions
diff --git a/scripts/test.sh b/scripts/test.sh
index 473445876..fbd62bff8 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,8 +1,6 @@
1#!/bin/bash 1#!/bin/bash
2 2
3npm run build:server || exit -1 3npm run build:server || exit -1
4
5npm run travis -- client || exit -1
6npm run travis -- api || exit -1
7npm run travis -- cli || exit -1
8npm run travis -- lint || exit -1 4npm run travis -- lint || exit -1
5
6mocha --exit --require ts-node/register --bail server/tests/index.ts
diff --git a/scripts/travis.sh b/scripts/travis.sh
index e919f18a4..f6cdda463 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -5,14 +5,14 @@ if [ $# -eq 0 ]; then
5 exit -1 5 exit -1
6fi 6fi
7 7
8if [ "$1" = "build_then_client" ]; then 8if [ "$1" = "client" ]; then
9 npm run build 9 npm run build
10 mocha --exit --require ts-node/register --bail server/tests/client.ts 10 mocha --exit --require ts-node/register --bail server/tests/client.ts
11elif [ "$1" = "client" ]; then
12 mocha --exit --require ts-node/register --bail server/tests/client.ts
13elif [ "$1" = "api" ]; then 11elif [ "$1" = "api" ]; then
12 npm run build:server
14 mocha --exit --require ts-node/register --bail server/tests/api/index.ts 13 mocha --exit --require ts-node/register --bail server/tests/api/index.ts
15elif [ "$1" = "cli" ]; then 14elif [ "$1" = "cli" ]; then
15 npm run build:server
16 mocha --exit --require ts-node/register --bail server/tests/cli/index.ts 16 mocha --exit --require ts-node/register --bail server/tests/cli/index.ts
17elif [ "$1" = "lint" ]; then 17elif [ "$1" = "lint" ]; then
18 cd client || exit -1 18 cd client || exit -1