Build server files before test the api

diff --git a/scripts/test.sh b/scripts/test.sh
index 473445876ab12a232a11ad25dc68aab228b7e73b..fbd62bff8942d8ea27e05575b6349fdd863cc9f3 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 
 npm run build:server || exit -1
-
-npm run travis -- client || exit -1
-npm run travis -- api || exit -1
-npm run travis -- cli || exit -1
 npm run travis -- lint || exit -1
+
+mocha --exit --require ts-node/register --bail server/tests/index.ts

diff --git a/scripts/travis.sh b/scripts/travis.sh
index e919f18a4476a4e53bd27b51560ee67860e0f663..f6cdda463bd29be0da1527b49af20b2dc0af4228 100755 (executable)
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -5,14 +5,14 @@ if [ $# -eq 0 ]; then
     exit -1
 fi
 
-if [ "$1" = "build_then_client" ]; then
+if [ "$1" = "client" ]; then
     npm run build
     mocha --exit --require ts-node/register --bail server/tests/client.ts
-elif [ "$1" = "client" ]; then
-    mocha --exit --require ts-node/register --bail server/tests/client.ts
 elif [ "$1" = "api" ]; then
+    npm run build:server
     mocha --exit --require ts-node/register --bail server/tests/api/index.ts
 elif [ "$1" = "cli" ]; then
+    npm run build:server
     mocha --exit --require ts-node/register --bail server/tests/cli/index.ts
 elif [ "$1" = "lint" ]; then
     cd client || exit -1