diff --git a/.travis.yml b/.travis.yml index 4cfa7e8..095e2c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,8 @@ language: node_js node_js: - "4.1" before_script: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" - npm install -g gulp + - sleep 3 script: gulp verify diff --git a/karma.conf.js b/karma.conf.js index 5612937..b72a8f7 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -5,13 +5,7 @@ module.exports = function(karma) { var globs = _.flatten([ config.globs.js, config.globs.spec - ]), - browser = 'Chrome'; - - if (process.env.TRAVIS) { - globs.unshift('node_modules/babel-polyfill/dist/polyfill.js'); - browser = 'PhantomJS'; - } + ]); karma.set({ frameworks: ['browserify', 'jasmine'], @@ -23,7 +17,7 @@ module.exports = function(karma) { reporters: ['progress', 'notify'], colors: true, logLevel: karma.LOG_INFO, - browsers: [browser], + browsers: ['Firefox'], autoWatch: true, singleRun: false, browserify: _.extend({ diff --git a/package.json b/package.json index 547dd37..5b5a944 100644 --- a/package.json +++ b/package.json @@ -33,10 +33,9 @@ "jasmine-core": "^2.4.1", "karma": "^0.13.14", "karma-browserify": "^5.0.2", - "karma-chrome-launcher": "^0.2.2", + "karma-firefox-launcher": "^1.0.0", "karma-jasmine": "^0.3.1", "karma-notify-reporter": "^0.1.1", - "karma-phantomjs-launcher": "^0.2.2", "lodash": "^4.6.1", "node-bourbon": "^4.2.3", "snapsvg": "^0.4.0",