Skip to content

Commit

Permalink
Fix Travis builds (#380)
Browse files Browse the repository at this point in the history
We're switching to phantomjs!
  • Loading branch information
Eric Fischer authored Sep 13, 2017
1 parent c1f371b commit dfbc533
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ before_install:
install:
- pip install setuptools==32.3.1 # need newer version than Travis default
- make install
before_script:
- npm install -g gulp-cli
script:
- make test-all
- make test-js
Expand Down
4 changes: 2 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ module.exports = function(config) {
plugins:[
'karma-jasmine',
'karma-jasmine-jquery',
'karma-firefox-launcher',
'karma-jasmine-jquery',
'karma-chrome-launcher',
'karma-phantomjs-launcher',
'karma-coverage',
'karma-sinon'
],

// start the browser
browsers: ['Firefox'],
browsers: ['PhantomJS'],

//frameworks to use
frameworks: ['jasmine-jquery', 'jasmine', 'sinon'],
Expand Down
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
"devDependencies": {
"gulp": "^3.9.0",
"gulp-karma": "0.0.1",
"jasmine-core": "^2.8.0",
"karma": "^0.13.0",
"karma-chrome-launcher": "^0.2.0",
"karma-coverage": "latest",
"karma-firefox-launcher": "latest",
"karma-coverage": "^1.1.1",
"karma-phantomjs-launcher": "^1.0.4",
"karma-jasmine": "^0.3.6",
"karma-jasmine-jquery": "0.1.1",
"karma-sinon": "latest"
"karma-sinon": "^1.0.5",
"phantomjs-prebuilt": "^2.1.14",
"sinon": "^3.2.1"
}
}

0 comments on commit dfbc533

Please sign in to comment.