From 4f05922bfd41aecd8cd12151ae40d54eb5c06021 Mon Sep 17 00:00:00 2001 From: mgechev Date: Tue, 7 Jun 2016 13:22:12 +0300 Subject: [PATCH] feat(AppShell): run tests in CI --- .travis.yml | 6 ++++++ app-shell/config/karma.conf.js | 4 ++++ install.sh | 3 +++ test.sh | 2 ++ 4 files changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index b906bfc..f12b63e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,10 @@ language: node_js node_js: "4.2.1" + +before_install: + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi # Karma CI + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi + install: ./install.sh script: ./test.sh diff --git a/app-shell/config/karma.conf.js b/app-shell/config/karma.conf.js index d39036f..0929760 100644 --- a/app-shell/config/karma.conf.js +++ b/app-shell/config/karma.conf.js @@ -39,4 +39,8 @@ module.exports = function (config) { browsers: ['Chrome'], singleRun: false }); + if (process.env.TRAVIS || process.env.CIRCLECI) { + config.browsers = ['Chrome_travis_ci']; + config.singleRun = true; + } }; diff --git a/install.sh b/install.sh index 5af0178..2207611 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,7 @@ #!/bin/bash +npm config set registry http://registry.npmjs.org/ cd ./service-worker/worker npm install +cd ../../app-shell +npm install diff --git a/test.sh b/test.sh index b3d2801..5e61b9a 100755 --- a/test.sh +++ b/test.sh @@ -1,4 +1,6 @@ #!/bin/bash cd ./service-worker/worker gulp test +cd ../../app-shell +./node_modules/.bin/ng test --watch=false