From adff2aa90a977f0d246b613364c3f617effbcaf2 Mon Sep 17 00:00:00 2001
From: Emily Morehouse <emily@cuttlesoft.com>
Date: Fri, 10 Aug 2018 12:34:53 -0600
Subject: [PATCH] Fix failing SauceLabs tests by updating configuration

- Remove code coverage from SauceLabs CI, as it causes tests to hang.
- Update Safari browser tests to handle Safari 9-11 with proper OS
settings
---
 karma.conf.js | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index f6e2445b05..85ced85e5e 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -56,7 +56,21 @@ module.exports = function(config) {
       // customLaunchers.SL_Safari7 = createCustomLauncher('safari', 7);
       // customLaunchers.SL_Safari8 = createCustomLauncher('safari', 8);
 
-      customLaunchers.SL_Safari9 = createCustomLauncher('safari', 9);
+      customLaunchers.SL_Safari9 = createCustomLauncher(
+        "safari",
+        9.0,
+        "OS X 10.11"
+      );
+      customLaunchers.SL_Safari10 = createCustomLauncher(
+        "safari",
+        "10.1",
+        "macOS 10.12"
+      );
+      customLaunchers.SL_Safari11 = createCustomLauncher(
+        "safari",
+        "11.1",
+        "macOS 10.13"
+      );
     }
 
     // Opera
@@ -141,7 +155,9 @@ module.exports = function(config) {
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['dots', 'coverage', 'saucelabs'],
+    // Disable code coverage, as it's breaking CI:
+    // reporters: ['dots', 'coverage', 'saucelabs'],
+    reporters: ['dots', 'saucelabs'],
 
 
     // web server port
@@ -181,15 +197,16 @@ module.exports = function(config) {
     webpack: {
       cache: true,
       devtool: 'inline-source-map',
-      module: {
-        postLoaders: [
-          {
-            test: /\.js$/,
-            exclude: /(node_modules|test)/,
-            loader: 'istanbul-instrumenter'
-          }
-        ]
-      },
+      // Disable code coverage, as it's breaking CI
+      // module: {
+      //   postLoaders: [
+      //     {
+      //       test: /\.js$/,
+      //       exclude: /(node_modules|test)/,
+      //       loader: 'istanbul-instrumenter'
+      //     }
+      //   ]
+      // },
       externals: [
         {
           './adapters/http': 'var undefined'