Skip to content

Commit

Permalink
chore(travis): switch back to SauceLabs
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
vojtajina committed Dec 3, 2013
1 parent 0410572 commit 6127528
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:

before_script:
- mkdir -p $LOGS_DIR
- ./lib/browser-stack/start-tunnel.sh
- ./lib/sauce/sauce_connect_setup.sh
- npm install -g grunt-cli
- grunt bower
- grunt bower
Expand Down
4 changes: 4 additions & 0 deletions karma-shared.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ module.exports = function(config, specificOptions) {
config.transports = ['websocket', 'xhr-polling'];
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.
config.loggers.push({
type: 'file',
Expand Down
2 changes: 1 addition & 1 deletion lib/grunt/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ module.exports = {
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')) {
args.push('--browsers=' + grunt.option('e2e-browsers'));
Expand Down
4 changes: 2 additions & 2 deletions travis_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ set -e
export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`

grunt parallel:travis --reporters dots \
--browsers BS_Chrome,BS_Safari,BS_Firefox,BS_IE_8,BS_IE_9,BS_IE_10,BS_IE_11 \
--e2e-browsers BS_Chrome
--browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 \
--e2e-browsers SL_Chrome

0 comments on commit 6127528

Please sign in to comment.