提交 104276ff 编写于 作者: M Matt Zabriskie

Merge pull request #274 from nickuraltsev/travis-fix

Fixing issue with Travis
...@@ -2,6 +2,10 @@ language: node_js ...@@ -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:
......
...@@ -16,10 +16,7 @@ module.exports = function(config) { ...@@ -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,15 @@ module.exports = function(config) { ...@@ -99,6 +96,15 @@ 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. ' +
'Running on Travis.'
);
browsers = ['Firefox'];
} 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 +205,7 @@ module.exports = function(config) { ...@@ -199,7 +205,7 @@ module.exports = function(config) {
} }
}, },
// Coverage reporting // Coverage reporting
coverageReporter: { coverageReporter: {
type: 'lcov', type: 'lcov',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册