Merge branch 'master' into null-caller

Author: bengourley

.travis.yml

@@ -1,7 +1,8 @@
 language: node_js
 sudo: required
 dist: trusty
-node_js: stable
+node_js:
+ - 8
 addons:
   sauce_connect: true
   firefox: latest
@@ -10,6 +11,10 @@ addons:
     - google-chrome
     packages:
     - google-chrome-stable
+before_install:
+- export CHROME_BIN=chromium-browser
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 before_script:
 - npm install
 script:

karma.conf.ci.js

@@ -6,23 +6,17 @@ module.exports = function(config) {
 
     // Check out https://saucelabs.com/platforms for all browser/platform combos
     var customLaunchers = {
-        slIOS8: {
-            base: 'SauceLabs',
-            browserName: 'iPhone',
-            platform: 'OS X 10.10',
-            version: '8.4'
-        },
+        // slIOS8: {
+        //     base: 'SauceLabs',
+        //     browserName: 'iPhone',
+        //     platform: 'OS X 10.12',
+        //     version: '8.4'
+        // },
         slIOS9: {
             base: 'SauceLabs',
             browserName: 'iPhone',
-            platform: 'OS X 10.11',
-            version: '9.2'
-        },
-        slIOS10: {
-            base: 'SauceLabs',
-            browserName: 'iPhone',
-            platform: 'macOS 10.12',
-            version: '10.2'
+            platform: 'OS X 10.12',
+            version: '9.3'
         },
         slAndroid4: {
             base: 'SauceLabs',
@@ -72,13 +66,15 @@ module.exports = function(config) {
         slSafari10: {
             base: 'SauceLabs',
             browserName: 'safari',
-            platform: 'macOS 10.12',
+            platform: 'OS X 10.11',
             version: '10.0'
         },
-        slOpera: {
-            base: 'SauceLabs',
-            browserName: 'opera'
-        },
+        // SauceLabs discontinued support for all versions of Opera:
+        // https://wiki.saucelabs.com/pages/viewpage.action?pageId=70074721
+        // slOpera: {
+        //     base: 'SauceLabs',
+        //     browserName: 'opera'
+        // },
         slEdge14: {
             base: 'SauceLabs',
             browserName: 'microsoftedge',