Skip to content

Commit

Permalink
no special case for macOS running Karma locally
Browse files Browse the repository at this point in the history
- also, reformat a conditional

ariya/phantomjs#14558 was causing seg faults at the time this
change was made; it is no longer causing seg faults, so phantomjs should be the default.

this was prompted by #2759
  • Loading branch information
boneskull committed May 12, 2017
1 parent 4d1d91d commit 93392dd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
12 changes: 6 additions & 6 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ var fs = require('fs');
var path = require('path');
var mkdirp = require('mkdirp');
var baseBundleDirpath = path.join(__dirname, '.karma');
var osName = require('os-name');

module.exports = function (config) {
var bundleDirpath;
Expand Down Expand Up @@ -48,7 +47,7 @@ module.exports = function (config) {
},
reporters: ['spec'],
colors: true,
browsers: [osName() === 'macOS Sierra' ? 'Chrome' : 'PhantomJS'], // This is the default browser to run, locally
browsers: ['PhantomJS'], // This is the default browser to run, locally
logLevel: config.LOG_INFO,
client: {
mocha: {
Expand Down Expand Up @@ -97,13 +96,14 @@ module.exports = function (config) {
console.error('Local/unknown environment detected');
bundleDirpath = path.join(baseBundleDirpath, 'local');
// don't need to run sauce from appveyor b/c travis does it.
if (!(env.SAUCE_USERNAME || env.SAUCE_ACCESS_KEY)) {
console.error('No SauceLabs credentials present');
} else {
if (env.SAUCE_USERNAME || env.SAUCE_ACCESS_KEY) {
sauceConfig = {
build: require('os').hostname() + ' (' + Date.now() + ')'
build: require('os')
.hostname() + ' (' + Date.now() + ')'
};
console.error('Configured SauceLabs');
} else {
console.error('No SauceLabs credentials present');
}
}
mkdirp.sync(bundleDirpath);
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,6 @@
"karma-sauce-launcher": "coderbyheart/karma-sauce-launcher",
"karma-spec-reporter": "0.0.26",
"nyc": "^10.0.0",
"os-name": "^2.0.1",
"phantomjs": "1.9.8",
"rimraf": "^2.5.2",
"semistandard": "^9.2.1",
Expand Down

0 comments on commit 93392dd

Please sign in to comment.