From c5616c786926f7717fea89d681f7b28d8d455181 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Tue, 20 Jun 2017 11:58:54 +0100 Subject: [PATCH] Run yarn tasks where required to run the tests. --- ci/run_feature_tests.sh | 4 ++++ ci/run_jasmine_tests.sh | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/run_feature_tests.sh b/ci/run_feature_tests.sh index c9248c319..8fb11313d 100755 --- a/ci/run_feature_tests.sh +++ b/ci/run_feature_tests.sh @@ -26,6 +26,10 @@ fi $WORKSPACE/pgadmin-venv/bin/pip install -r requirements.txt || { echo 'ERROR: Failed to install the application requirements.' ; exit 1; } $WORKSPACE/pgadmin-venv/bin/pip install -r web/regression/requirements.txt || { echo 'ERROR: Failed to install the regression test requirements.' ; exit 1; } +cd web +/usr/bin/yarn run bundle || { echo 'ERROR: Failed to bundle the Javascript code.' ; exit 1; } +cd ../ + echo "Running regression tests..." echo diff --git a/ci/run_jasmine_tests.sh b/ci/run_jasmine_tests.sh index e44bc3905..d2aa5a75f 100755 --- a/ci/run_jasmine_tests.sh +++ b/ci/run_jasmine_tests.sh @@ -5,5 +5,6 @@ echo cd $WORKSPACE/web/ -/bin/npm install || { echo 'ERROR: Failed to install the required Javascript modules.' ; exit 1; } +/usr/bin/yarn install || { echo 'ERROR: Failed to install the required Javascript modules.' ; exit 1; } +/usr/bin/yarn run linter || { echo 'ERROR: Failed to lint the Javascript code.' ; exit 1; } ./node_modules/.bin/karma start --single-run || { echo 'ERROR: Error detected when running the Jasmine tests.' ; exit 1; }