mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-20 20:00:40 +03:00
Code Activity

Fixing issue with Travis

Browse Source
This commit is contained in:
Nick Uraltsev
2016-03-21 23:35:15 -07:00
parent e22cbae494
commit 4f61a78436
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
karma.conf.js
+8 -5
View File
@@ -16,10 +16,7 @@ module.exports = function(config) {
var customLaunchers = {}; var customLaunchers = {};
var browsers = []; var browsers = [];
if (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) { if (process.env.SAUCE_USERNAME || process.env.SAUCE_ACCESS_KEY) {
console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are set.');
browsers = ['Firefox', 'Chrome', 'Safari', 'Opera'];
} else {
customLaunchers = {}; customLaunchers = {};
var runAll = true; var runAll = true;
@@ -99,6 +96,12 @@ module.exports = function(config) {
} }
browsers = Object.keys(customLaunchers); browsers = Object.keys(customLaunchers);
} else if (process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST !== 'false') {
console.log('Cannot run on Sauce Labs as encrypted environment variables are not available to PRs. Using PhantomJS.');
browsers = ['PhantomJS'];
} else {
console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.');
browsers = ['Firefox', 'Chrome', 'Safari', 'Opera'];
} }
config.set({ config.set({
@@ -199,7 +202,7 @@ module.exports = function(config) {
} }
}, },
// Coverage reporting // Coverage reporting
coverageReporter: { coverageReporter: {
type: 'lcov', type: 'lcov',