Skip to content

Commit

Permalink
[test] Update zuul configuration
Browse files Browse the repository at this point in the history
Excluding tests on iphone / ipad / edge for the moment.
  • Loading branch information
darrachequesne committed Nov 2, 2018
1 parent 669c076 commit 28765c5
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
1 change: 0 additions & 1 deletion package.json
Expand Up @@ -58,7 +58,6 @@
"gulp-task-listing": "1.0.1",
"istanbul": "^0.4.5",
"mocha": "^3.2.0",
"socket.io-browsers": "^1.0.0",
"webpack": "1.12.12",
"webpack-stream": "^3.2.0",
"zuul": "3.11.1",
Expand Down
24 changes: 19 additions & 5 deletions zuul.config.js
@@ -1,8 +1,6 @@
'use strict';

var browsers = require('socket.io-browsers');

var zuulConfig = module.exports = {
const zuulConfig = module.exports = {
ui: 'mocha-bdd',

// test on localhost by default
Expand All @@ -29,5 +27,21 @@ if (process.env.CI === 'true') {
};
}

var isPullRequest = process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST !== 'false';
zuulConfig.browsers = isPullRequest ? browsers.pullRequest : browsers.all;
zuulConfig.browsers = [
{
name: 'chrome',
version: 'latest'
}, {
name: 'firefox',
version: 'latest'
}, {
name: 'internet explorer',
version: '8..11'
}, {
name: 'safari',
version: 'latest'
}, {
name: 'android',
version: '5.1..6.0'
}
];

0 comments on commit 28765c5

Please sign in to comment.