Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-23 13:25:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(travis): switch back to SauceLabs

Browse source 
I think we are pretty close to be able to use both.

The xhr-polling seems to be pretty stable, but I'm having problems with multiple SSH tunnels (on BS), so let's try to switch back to SL.
This commit is contained in:
Vojta Jina 2013-12-03 12:15:36 -08:00
parent 0410572322
commit 6127528b50
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -13,7 +13,7 @@ env:
before_script: before_script:
- mkdir -p $LOGS_DIR - mkdir -p $LOGS_DIR
- ./lib/browser-stack/start-tunnel.sh - ./lib/sauce/sauce_connect_setup.sh
- npm install -g grunt-cli - npm install -g grunt-cli
- grunt bower - grunt bower
- grunt bower - grunt bower

4
karma-shared.conf.js
View file

@ -122,6 +122,10 @@ module.exports = function(config, specificOptions) {
config.transports = ['websocket', 'xhr-polling']; config.transports = ['websocket', 'xhr-polling'];
config.browserStack.build = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'; config.browserStack.build = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
// TODO(vojta): remove once SauceLabs supports websockets.
// This speeds up the capturing a bit, as browsers don't even try to use websocket.
config.transports = ['xhr-polling'];
// Debug logging into a file, that we print out at the end of the build. // Debug logging into a file, that we print out at the end of the build.
config.loggers.push({ config.loggers.push({
type: 'file', type: 'file',

2
lib/grunt/utils.js
View file

@ -295,7 +295,7 @@ module.exports = {
stream: options && options.stream stream: options && options.stream
}; };
args.push('--port=' + this.availablePorts.pop()); args.push('--port=' + this.sauceLabsAvailablePorts.pop());
if (args.indexOf('test:e2e') !== -1 && grunt.option('e2e-browsers')) { if (args.indexOf('test:e2e') !== -1 && grunt.option('e2e-browsers')) {
args.push('--browsers=' + grunt.option('e2e-browsers')); args.push('--browsers=' + grunt.option('e2e-browsers'));

4
travis_build.sh
View file

@ -5,5 +5,5 @@ set -e
export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
grunt parallel:travis --reporters dots \ grunt parallel:travis --reporters dots \
--browsers BS_Chrome,BS_Safari,BS_Firefox,BS_IE_8,BS_IE_9,BS_IE_10,BS_IE_11 \ --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 \
--e2e-browsers BS_Chrome --e2e-browsers SL_Chrome