Compact browser list, skip FF and IE

videojs · May 15, 2015 · 4afb849 · 4afb849
1 parent 5564f3f
commit 4afb849
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/build/tasks/test-travis.js b/build/tasks/test-travis.js
@@ -15,7 +15,7 @@ module.exports = function(grunt) {
     if (!process.env.SAUCE_ACCESS_KEY) {
       grunt.task.run(['karma:firefox']);
     } else {
-      grunt.task.run([ 'connect:dev', 'saucelabs-qunit' ]);
+      grunt.task.run(['connect:dev', 'saucelabs-qunit']);
     }
   });
 };
diff --git a/grunt.js b/grunt.js
@@ -185,25 +185,17 @@ module.exports = function(grunt) {
     'saucelabs-qunit': {
       all: {
         options: {
-          urls: [ 'http://127.0.0.1:9999/test/index.html' ],
-          browsers: [{
-            browserName: 'chrome',
-            platform: 'WIN8.1'
-          }, {
-            browserName: 'firefox',
-            platform: 'Linux'
-          }, {
-            browserName: 'safari',
-            platform: 'OS X 10.10'
-          }, {
-            browserName: 'iPad',
-            version: '8.2'
-          }, {
-            browserName: 'Android'
-          }, {
-            browserName: 'internet explorer',
-            platform: 'WIN8.1'
-          }],
+          urls: ['http://127.0.0.1:9999/test/index.html'],
+          browsers: [
+            /* [platform, browserName, version] - version will default to latest stable version */
+            ['WIN8.1', 'chrome', ''],
+            // TODO: Find out and fix IE and FF on Linux timeouts
+            // ['Linux', 'firefox', ''],
+            // ['WIN8.1', 'internet explorer', ''],
+            ['OS X 10.10', 'safari', '' ],
+            ['', 'iPad', '8.2'],
+            ['', 'Android', '']
+          ],
           tunneled: false,
           build: process.env.TRAVIS_BUILD_NUMBER,
           testname: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH,