diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | js/Gruntfile.js | 1 | ||||
| -rw-r--r-- | js/karma.conf.js | 2 | ||||
| -rw-r--r-- | js/package.json | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index dd0542259..4b3a1f121 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,8 @@ before_install: install: - cd .. - - sudo apt-get -y install nodejs python3-jinja2 python3-setuptools apache2 libapache2-mod-fastcgi firefox + - sudo apt-get -y install nodejs python3-jinja2 python3-setuptools apache2 libapache2-mod-fastcgi firefox chromium-browser + - export CHROME_BIN=/usr/bin/chromium-browser - sudo easy_install3 pip # ubuntu 12.04 only - sudo pip3 install ocdev # get a newer phantomjs version diff --git a/js/Gruntfile.js b/js/Gruntfile.js index 844461e1f..b29c8de67 100644 --- a/js/Gruntfile.js +++ b/js/Gruntfile.js @@ -133,6 +133,7 @@ module.exports = function (grunt) { }, continuous: { configFile: 'karma.conf.js', + browsers: ['Firefox', 'Chrome'], singleRun: true, } }, diff --git a/js/karma.conf.js b/js/karma.conf.js index 504d4155b..7fab2d9fd 100644 --- a/js/karma.conf.js +++ b/js/karma.conf.js @@ -67,7 +67,7 @@ module.exports = function (config) { // test results reporter to use // possible values: 'dots', 'progress' // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['coverage'], + reporters: ['coverage', 'progress'], // web server port diff --git a/js/package.json b/js/package.json index f1d7fd509..269ae3f5e 100644 --- a/js/package.json +++ b/js/package.json @@ -38,6 +38,7 @@ "grunt-traceur": "^0.1.2", "grunt-wrap": "^0.3.0", "karma": "^0.12.16", + "karma-chrome-launcher": "^0.1.3", "karma-coverage": "^0.2.1", "karma-firefox-launcher": "^0.1.3", "karma-jasmine": "^0.1.5", |