@forbesjo updated the sauce labs config and browser versions

closes #2450 closes #2149
videojs · Aug 12, 2015 · 564da36 · 564da36
1 parent 70fec0b
commit 564da36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: node_js
 node_js:
   - 0.12
-before_script:
-  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash; fi
 before_install:
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+addons:
+  sauce_connect: true
 notifications:
   irc:
     channels:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -92,6 +92,7 @@ CHANGELOG
 * @misteroneill include child components with &#x60;true&#x60; in options ([view](https://github.com/videojs/video.js/pull/2424))
 * @misteroneill create video.novtt.js in dist builds ([view](https://github.com/videojs/video.js/pull/2447))
 * @misteroneill pass vtt.js option to tech ([view](https://github.com/videojs/video.js/pull/2448))
+* @forbesjo updated the sauce labs config and browser versions ([view](https://github.com/videojs/video.js/pull/2450))
 
 --------------------
 

diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -62,7 +62,7 @@ module.exports = function(config) {
     browserNoActivityTimeout: 60000,
 
     sauceLabs: {
-      startConnect: true,
+      startConnect: false,
       tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
       build: process.env.TRAVIS_BUILD_NUMBER,
       testName: process.env.TRAVIS_BUILD_NUMBER + process.env.TRAVIS_BRANCH,
@@ -111,45 +111,37 @@ module.exports = function(config) {
 function getCustomLaunchers(){
   return {
     chrome_sl: {
-      singleRun: true,
       base: 'SauceLabs',
       browserName: 'chrome',
-      platform: 'Windows 8.1',
-      version: '34'
+      platform: 'Windows 8.1'
     },
 
     firefox_sl: {
-      singleRun: true,
       base: 'SauceLabs',
       browserName: 'firefox',
-      platform: 'Linux',
-      version: '29'
+      platform: 'Linux'
     },
 
     safari_sl: {
-      singleRun: true,
       base: 'SauceLabs',
       browserName: 'safari',
       platform: 'OS X 10.10'
     },
 
     ipad_sl: {
-      singleRun: true,
       base: 'SauceLabs',
       browserName: 'ipad',
-      platform:'OS X 10.9',
-      version: '7.1'
+      platform: 'OS X 10.10',
+      version: '8.4'
     },
 
     android_sl: {
-      singleRun: true,
       base: 'SauceLabs',
       browserName: 'android',
       platform:'Linux'
     },
 
     ie_sl: {
-      singleRun: true,
       base: 'SauceLabs',
       browserName: 'internet explorer',
       platform: 'Windows 8.1',