Added additional browsers for saucelabs testing. closes videojs#1216

paullryan · Jul 17, 2014 · 5eb3055 · 5eb3055
1 parent 56f2fe5
commit 5eb3055
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
 * Fixed an error when disposing a tech using manual timeupdates ([view](https://github.com/videojs/video.js/pull/1312))
 * Exported missing Player API methods (remainingTime, supportsFullScreen, enterFullWindow, exitFullWindow, preload) ([view](https://github.com/videojs/video.js/pull/1328))
 * Added a base for running saucelabs tests from grunt ([view](https://github.com/videojs/video.js/pull/1215))
+* Added additional browsers for saucelabs testing ([view](https://github.com/videojs/video.js/pull/1216))
 
 --------------------
 

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -145,6 +145,24 @@ module.exports = function(grunt) {
       saucelabs: {
         browsers: ['chrome_sl']
       },
+      chrome_sl: {
+        browsers: ['chrome_sl']
+      },
+      firefox_sl: {
+        browsers: ['firefox_sl']
+      },
+      safari_sl: {
+        browsers: ['safari_sl']
+      },
+      ipad_sl: {
+        browsers: ['ipad_sl']
+      },
+      android_sl: {
+        browsers: ['android_sl']
+      },
+      ie_sl: {
+        browsers: ['ie_sl']
+      },
 
       // these are run locally on local browsers
       dev: {
@@ -337,7 +355,14 @@ module.exports = function(grunt) {
     if (process.env.TRAVIS_PULL_REQUEST !== 'false') {
       grunt.task.run(['karma:phantomjs', 'karma:minified_phantomjs', 'karma:minified_api_phantomjs']);
     } else if (process.env.TRAVIS) {
-      grunt.task.run(['karma:saucelabs']);
+      grunt.task.run([
+        'karma:chrome_sl',
+        'karma:firefox_sl',
+        'karma:safari_sl',
+        'karma:ipad_sl',
+        'karma:android_sl',
+        'karma:ie_sl'
+      ]);
     } else {
       // if we aren't running this in a CI, but running it manually, we can
       // supply arguments to this task. These arguments are either colon (`:`)
@@ -369,7 +394,6 @@ module.exports = function(grunt) {
         return 'karma:' + task;
       });
 
-
       grunt.task.run(tasks);
     }
   });

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -4,15 +4,16 @@ module.exports = function(config) {
       singleRun: true,
       base: 'SauceLabs',
       browserName: 'chrome',
-      platform: 'Windows 7',
+      platform: 'Windows 8.1',
       version: '34'
     },
 
     firefox_sl: {
       singleRun: true,
       base: 'SauceLabs',
       browserName: 'firefox',
-      platform: 'Windows 8'
+      platform: 'Linux',
+      version: '29'
     },
 
     safari_sl: {
@@ -35,6 +36,14 @@ module.exports = function(config) {
       base: 'SauceLabs',
       browserName: 'android',
       platform:'Linux'
+    },
+
+    ie_sl: {
+      singleRun: true,
+      base: 'SauceLabs',
+      browserName: 'internet explorer',
+      platform: 'Windows 8.1',
+      version: '11'
     }
   };