Commit dfbc5333 by Eric Fischer Committed by GitHub

Fix Travis builds (#380)

We're switching to phantomjs!
parent c1f371b1
...@@ -11,6 +11,8 @@ before_install: ...@@ -11,6 +11,8 @@ before_install:
install: install:
- pip install setuptools==32.3.1 # need newer version than Travis default - pip install setuptools==32.3.1 # need newer version than Travis default
- make install - make install
before_script:
- npm install -g gulp-cli
script: script:
- make test-all - make test-all
- make test-js - make test-js
......
...@@ -19,15 +19,15 @@ module.exports = function(config) { ...@@ -19,15 +19,15 @@ module.exports = function(config) {
plugins:[ plugins:[
'karma-jasmine', 'karma-jasmine',
'karma-jasmine-jquery', 'karma-jasmine-jquery',
'karma-firefox-launcher',
'karma-jasmine-jquery', 'karma-jasmine-jquery',
'karma-chrome-launcher', 'karma-chrome-launcher',
'karma-phantomjs-launcher',
'karma-coverage', 'karma-coverage',
'karma-sinon' 'karma-sinon'
], ],
// start the browser // start the browser
browsers: ['Firefox'], browsers: ['PhantomJS'],
//frameworks to use //frameworks to use
frameworks: ['jasmine-jquery', 'jasmine', 'sinon'], frameworks: ['jasmine-jquery', 'jasmine', 'sinon'],
......
...@@ -7,12 +7,15 @@ ...@@ -7,12 +7,15 @@
"devDependencies": { "devDependencies": {
"gulp": "^3.9.0", "gulp": "^3.9.0",
"gulp-karma": "0.0.1", "gulp-karma": "0.0.1",
"jasmine-core": "^2.8.0",
"karma": "^0.13.0", "karma": "^0.13.0",
"karma-chrome-launcher": "^0.2.0", "karma-chrome-launcher": "^0.2.0",
"karma-coverage": "latest", "karma-coverage": "^1.1.1",
"karma-firefox-launcher": "latest", "karma-phantomjs-launcher": "^1.0.4",
"karma-jasmine": "^0.3.6", "karma-jasmine": "^0.3.6",
"karma-jasmine-jquery": "0.1.1", "karma-jasmine-jquery": "0.1.1",
"karma-sinon": "latest" "karma-sinon": "^1.0.5",
"phantomjs-prebuilt": "^2.1.14",
"sinon": "^3.2.1"
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment