Skip to content

Commit 28765c5

Browse files
[test] Update zuul configuration
Excluding tests on iphone / ipad / edge for the moment.
1 parent 669c076 commit 28765c5

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
"gulp-task-listing": "1.0.1",
5959
"istanbul": "^0.4.5",
6060
"mocha": "^3.2.0",
61-
"socket.io-browsers": "^1.0.0",
6261
"webpack": "1.12.12",
6362
"webpack-stream": "^3.2.0",
6463
"zuul": "3.11.1",

zuul.config.js

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict';
22

3-
var browsers = require('socket.io-browsers');
4-
5-
var zuulConfig = module.exports = {
3+
const zuulConfig = module.exports = {
64
ui: 'mocha-bdd',
75

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

32-
var isPullRequest = process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST !== 'false';
33-
zuulConfig.browsers = isPullRequest ? browsers.pullRequest : browsers.all;
30+
zuulConfig.browsers = [
31+
{
32+
name: 'chrome',
33+
version: 'latest'
34+
}, {
35+
name: 'firefox',
36+
version: 'latest'
37+
}, {
38+
name: 'internet explorer',
39+
version: '8..11'
40+
}, {
41+
name: 'safari',
42+
version: 'latest'
43+
}, {
44+
name: 'android',
45+
version: '5.1..6.0'
46+
}
47+
];

0 commit comments

Comments
 (0)