Skip to content

Commit

Permalink
Build: Improve SauceLabs testing
Browse files Browse the repository at this point in the history
  • Loading branch information
LaurentGoderre committed Dec 18, 2014
1 parent 006e705 commit ac8f132
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 17 deletions.
6 changes: 5 additions & 1 deletion Gruntfile.coffee
Expand Up @@ -1294,6 +1294,10 @@ module.exports = (grunt) ->
urls: "<%= mocha.all.options.urls %>"
throttled: 3
browsers: grunt.file.readJSON "browsers.json"
tunnelArgs: [
"-D"
"ajax.googleapis.com"
]
sauceConfig:
"video-upload-on-pass": false
"single-window": true
Expand All @@ -1311,7 +1315,7 @@ module.exports = (grunt) ->
]
local:
options:
testname: "Local Test"
testname: "Local Test - <%= grunt.template.today('yyyy-mm-dd hh:MM') %>"


"gh-pages":
Expand Down
30 changes: 15 additions & 15 deletions browsers.json
@@ -1,9 +1,24 @@
[{
"browserName": "firefox",
"platform": "Linux"
},{
"browserName": "firefox",
"platform": "OS X 10.9"
},{
"browserName": "firefox",
"platform": "Windows 7"
},{
"browserName": "chrome",
"platform": "Linux"
},{
"browserName": "chrome",
"platform": "Mac 10.9"
},{
"browserName": "chrome",
"platform": "Windows 7"
},{
"browserName": "safari",
"platform": "OS X 10.9"
},{
"browserName": "internet explorer",
"platform": "Windows 7",
Expand All @@ -16,19 +31,4 @@
"browserName": "internet explorer",
"platform": "Windows 8.1",
"version": "11"
},{
"browserName": "firefox",
"platform": "OS X 10.9"
},{
"browserName": "safari",
"platform": "OS X 10.9"
},{
"browserName": "chrome",
"platform": "Mac 10.9"
},{
"browserName": "firefox",
"platform": "Linux"
},{
"browserName": "chrome",
"platform": "Linux"
}]
2 changes: 1 addition & 1 deletion src/test.js
Expand Up @@ -2,7 +2,7 @@

// Test harness to run the full suite
mocha.setup( "bdd" );
wb.doc.on( "ready", function() {
wb.doc.on( "wb-ready.wb", function() {

var runner = mocha.run(),
failedTests = [];
Expand Down

0 comments on commit ac8f132

Please sign in to comment.