From dfbc53334320b0406539131f0bbd56071c80151d Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 13 Sep 2017 16:32:05 -0400 Subject: [PATCH] Fix Travis builds (#380) We're switching to phantomjs! --- .travis.yml | 2 ++ karma.conf.js | 4 ++-- package.json | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e1faa0a950..129710d8fde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/karma.conf.js b/karma.conf.js index f47118fbf65..d65e7fd4753 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -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'], diff --git a/package.json b/package.json index 09da71375b4..4800005c034 100644 --- a/package.json +++ b/package.json @@ -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" } }