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

Updating configuration to use Firefox for testing PRs

Browse Source
This commit is contained in:
Nick Uraltsev
2016-03-22 23:46:36 -07:00
parent 4f61a78436
commit c622b35f38
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+4
View File
@@ -2,6 +2,10 @@ language: node_js
email: email:
on_failure: change on_failure: change
on_success: never on_success: never
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start
after_success: after_success:
- npm run coveralls - npm run coveralls
env: env:
karma.conf.js
+5 -2
View File
@@ -97,8 +97,11 @@ 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') { } 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.'); console.log(
browsers = ['PhantomJS']; 'Cannot run on Sauce Labs as encrypted environment variables are not available to PRs. ' +
'Running on Travis.'
);
browsers = ['Firefox'];
} else { } else {
console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.'); console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.');
browsers = ['Firefox', 'Chrome', 'Safari', 'Opera']; browsers = ['Firefox', 'Chrome', 'Safari', 'Opera'];