Merge pull request #2869 from rackt/upstack

Update our tested browsers

Author: timdorr

.travis.yml

@@ -8,6 +8,10 @@ env:
 cache:
   directories:
   - node_modules
+before_install:
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 after_success:
 - cat ./coverage/lcov.info | ./node_modules/codecov.io/bin/codecov.io.js
 - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js

karma.conf.js

@@ -11,38 +11,38 @@ module.exports = function (config) {
     BS_Chrome: {
       base: 'BrowserStack',
       os: 'Windows',
-      os_version: '8.1',
+      os_version: '10',
       browser: 'chrome',
-      browser_version: '39.0'
+      browser_version: '47.0'
     },
     BS_Firefox: {
       base: 'BrowserStack',
       os: 'Windows',
-      os_version: '8.1',
+      os_version: '10',
       browser: 'firefox',
-      browser_version: '32.0'
+      browser_version: '43.0'
     },
     BS_Safari: {
       base: 'BrowserStack',
       os: 'OS X',
-      os_version: 'Yosemite',
+      os_version: 'El Capitan',
       browser: 'safari',
-      browser_version: '8.0'
+      browser_version: '9.0'
     },
     BS_MobileSafari: {
       base: 'BrowserStack',
       os: 'ios',
-      os_version: '7.0',
+      os_version: '8.3',
+      browser: 'iphone',
+      real_mobile: false
+    },
+    BS_MobileSafari: {
+      base: 'BrowserStack',
+      os: 'ios',
+      os_version: '9.1',
       browser: 'iphone',
       real_mobile: false
     },
-//    BS_InternetExplorer9: {
-//      base: 'BrowserStack',
-//      os: 'Windows',
-//      os_version: '7',
-//      browser: 'ie',
-//      browser_version: '9.0'
-//    },
     BS_InternetExplorer10: {
       base: 'BrowserStack',
       os: 'Windows',
@@ -53,9 +53,13 @@ module.exports = function (config) {
     BS_InternetExplorer11: {
       base: 'BrowserStack',
       os: 'Windows',
-      os_version: '8.1',
+      os_version: '10',
       browser: 'ie',
       browser_version: '11.0'
+    },
+    ChromeCi: {
+      base: 'Chrome',
+      flags: [ '--no-sandbox' ]
     }
   }
 
@@ -130,6 +134,8 @@ module.exports = function (config) {
     if (process.env.TRAVIS) {
       var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'
 
+      config.browsers.unshift('ChromeCi')
+
       config.browserStack = {
         username: process.env.BROWSER_STACK_USERNAME,
         accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
@@ -167,4 +173,3 @@ if (process.env.FAIL_ON_WARNINGS) {
 }
 console.log('===')
 console.log()
-