Skip to content

Commit

Permalink
Merge pull request #37 from Tobbe/test_with_chrome
Browse files Browse the repository at this point in the history
Chrome for tests. Travis has issues with firefox
  • Loading branch information
mzabriskie authored Mar 21, 2019
2 parents b175e8e + 937fcea commit c7b8eb2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start

addons:
chrome: stable
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = function(config) {

autoWatch: true,

browsers: ['Firefox'],
browsers: ['Chrome'],

singleRun: false,

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"karma": "^0.13.22",
"karma-cli": "^1.0.0",
"karma-firefox-launcher": "^1.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.0.1",
"karma-sinon": "^1.0.5",
"karma-sourcemap-loader": "^0.3.7",
Expand Down

0 comments on commit c7b8eb2

Please sign in to comment.