Merge branch 'master' into require_standard_variant

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',

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."

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

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