From e0206eeef4394b5993430371b542314f315b80c6 Mon Sep 17 00:00:00 2001 From: lukasmartinelli Date: Wed, 23 Nov 2016 16:33:03 +0100 Subject: [PATCH] Run Firefox in Karma on Travis --- karma.conf.js | 9 +++++++-- package.json | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index b06ac4c5..4c820935 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -2,9 +2,14 @@ var webpackConfig = require('./webpack.config.js'); // Karma configuration module.exports = function(config) { + var browsers = ['Chrome']; + if (process.env.TRAVIS) { + browsers = ['Firefox']; + } + config.set({ - browsers: [ 'Chrome' ], //run in Chrome - frameworks: [ 'mocha' ], //use the mocha test framework + browsers: browsers, + frameworks: ['mocha'], // ... normal karma configuration files: [ // all files ending in "_test" diff --git a/package.json b/package.json index 4ae35def..e2d6f739 100644 --- a/package.json +++ b/package.json @@ -89,6 +89,7 @@ "json-loader": "^0.5.4", "karma": "^1.3.0", "karma-chrome-launcher": "^2.0.0", + "karma-firefox-launcher": "^1.0.0", "karma-mocha": "^1.3.0", "karma-webpack": "^1.8.0", "mocha": "^3.1.2",