diff --git a/package.json b/package.json index 7eb33fc56..da0383b6b 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/zuul.config.js b/zuul.config.js index fcb9ac9ad..18f026885 100644 --- a/zuul.config.js +++ b/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 @@ -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' + } +];