Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

no special case for macOS running Karma locally #2794

Merged
merged 1 commit into from May 12, 2017
Merged

no special case for macOS running Karma locally #2794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions karma.conf.js
View file
Open in desktop
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
View file
Open in desktop
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