diff --git a/config/ng-test.conf.js b/config/ng-test.conf.js index f87aa3d48a..0456d5eb88 100644 --- a/config/ng-test.conf.js +++ b/config/ng-test.conf.js @@ -42,7 +42,7 @@ module.exports = function(config) { autoWatch: true, - browsers: ['Chrome'], + browsers: ['PhantomJS'], junitReporter: { outputFile: 'log/testacular-unit.xml', diff --git a/script/ci/includes.sh b/script/ci/includes.sh index 06713fc773..4b07dacfdc 100644 --- a/script/ci/includes.sh +++ b/script/ci/includes.sh @@ -1,3 +1,10 @@ +function load_environment { + source /var/lib/jenkins/.rvm/environments/ruby-1.9.3-p392 + if [ ! -f config/application.yml ]; then + ln -s application.yml.example config/application.yml + fi +} + function exit_unless_master_merged { if [[ `git branch -a --merged origin/$BUILDKITE_BRANCH` != *origin/master* ]]; then echo "This branch does not have the current master merged. Please merge master and push again." diff --git a/script/ci/run_js_tests.sh b/script/ci/run_js_tests.sh new file mode 100755 index 0000000000..91a4be09d9 --- /dev/null +++ b/script/ci/run_js_tests.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +echo "--- Loading environment" +source ./script/ci/includes.sh +load_environment + +echo "--- Verifying branch is based on current master" +exit_unless_master_merged + +echo "--- Bundling" +bundle install + +echo "--- Running tests" +bundle exec rake karma:run diff --git a/script/ci/run_tests.sh b/script/ci/run_tests.sh index 9fdbd11333..189875f1e1 100755 --- a/script/ci/run_tests.sh +++ b/script/ci/run_tests.sh @@ -4,10 +4,7 @@ set -e echo "--- Loading environment" source ./script/ci/includes.sh -source /var/lib/jenkins/.rvm/environments/ruby-1.9.3-p392 -if [ ! -f config/application.yml ]; then - ln -s application.yml.example config/application.yml -fi +load_environment echo "--- Verifying branch is based on current master" exit_unless_master_merged