Skip to content

Commit 7ae8a7b

Browse files
committed
Merge pull request react-bootstrap#713 from react-bootstrap/allow-phantom-locally
Add capability to run Phantom locally
2 parents f52629b + ab803fb commit 7ae8a7b

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

karma.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ require('babel/register');
33

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

78
module.exports = function (config) {
89
config.set({
@@ -43,7 +44,7 @@ module.exports = function (config) {
4344

4445
autoWatch: true,
4546

46-
browsers: [ isCI ? 'ChromeTravisCI' : 'Chrome' ],
47+
browsers: [ isCI ? 'ChromeTravisCI' : devBrowser ],
4748

4849
customLaunchers: {
4950
ChromeTravisCI: {

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"karma-firefox-launcher": "~0.1.3",
6363
"karma-mocha": "~0.1.1",
6464
"karma-mocha-reporter": "^1.0.2",
65+
"karma-phantomjs-launcher": "^0.1.4",
6566
"karma-sinon": "^1.0.3",
6667
"karma-sourcemap-loader": "^0.3.4",
6768
"karma-webpack": "^1.5.0",
@@ -87,4 +88,4 @@
8788
"dependencies": {
8889
"classnames": "^2.0.0"
8990
}
90-
}
91+
}

0 commit comments

Comments
 (0)