Skip to content

Commit

Permalink
Merge pull request react-bootstrap#713 from react-bootstrap/allow-pha…
Browse files Browse the repository at this point in the history
…ntom-locally

Add capability to run Phantom locally
  • Loading branch information
aabenoja committed May 21, 2015
2 parents f52629b + ab803fb commit 7ae8a7b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ require('babel/register');

var webpackConfig = require('./webpack/test.config.js');
var isCI = process.env.CONTINUOUS_INTEGRATION === 'true';
var devBrowser = process.env.PHANTOM ? 'PhantomJS' : 'Chrome';

module.exports = function (config) {
config.set({
Expand Down Expand Up @@ -43,7 +44,7 @@ module.exports = function (config) {

autoWatch: true,

browsers: [ isCI ? 'ChromeTravisCI' : 'Chrome' ],
browsers: [ isCI ? 'ChromeTravisCI' : devBrowser ],

customLaunchers: {
ChromeTravisCI: {
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"karma-firefox-launcher": "~0.1.3",
"karma-mocha": "~0.1.1",
"karma-mocha-reporter": "^1.0.2",
"karma-phantomjs-launcher": "^0.1.4",
"karma-sinon": "^1.0.3",
"karma-sourcemap-loader": "^0.3.4",
"karma-webpack": "^1.5.0",
Expand All @@ -87,4 +88,4 @@
"dependencies": {
"classnames": "^2.0.0"
}
}
}

0 comments on commit 7ae8a7b

Please sign in to comment.