From 65b44137d4bdac5d1ec77a12dd3a3517a2fdcea9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 12 Sep 2017 16:02:40 +1000
Subject: [PATCH] Fixes JS unit test runner

---
 src/Umbraco.Web.UI.Client/package.json        |  4 +-
 .../test/config/karma.conf.js                 | 63 ++++++++++---------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 98b1102aa4..0286d5f358 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -36,11 +36,11 @@
     "gulp-watch": "^4.3.10",
     "gulp-wrap": "^0.13.0",
     "gulp-wrap-js": "^0.4.1",
-    "jasmine-core": "^2.5.2",
+    "jasmine-core": "2.5.2",
     "karma": "^1.7.0",
     "karma-jasmine": "^1.1.0",
     "karma-phantomjs-launcher": "^1.0.4",
-	"less": "^2.6.1",
+    "less": "^2.6.1",
     "lodash": "^4.16.3",
     "merge-stream": "^1.0.1",
     "run-sequence": "^2.1.0"
diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
index e5198e9caa..711430d5ed 100644
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
@@ -1,6 +1,6 @@
-module.exports = function(config) {
+module.exports = function (config) {
 
-   config.set({
+  config.set({
 
     // base path, that will be used to resolve files and exclude
     basePath: '../..',
@@ -10,35 +10,35 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
 
-        //libraries
-        'lib-bower/jquery/jquery.min.js',
-        'lib/angular/1.1.5/angular.js',
-        'lib/angular/1.1.5/angular-cookies.min.js',
-        'lib/angular/1.1.5/angular-mocks.js',
-        'lib/angular/angular-ui-sortable.js',
-        'lib-bower/underscore/underscore-min.js',
-         'lib-bower/moment/moment-with-locales.js',
-         'lib/umbraco/Extensions.js', 
-         'lib-bower/rgrove-lazyload/lazyload.js',
-         'lib-bower//angular-local-storage/angular-local-storage.min.js',
+      //libraries
+      'lib-bower/jquery/jquery.min.js',
+      'lib/angular/1.1.5/angular.js',
+      'lib/angular/1.1.5/angular-cookies.min.js',
+      'lib/angular/1.1.5/angular-mocks.js',
+      'lib/angular/angular-ui-sortable.js',
+      'lib-bower/underscore/underscore-min.js',
+      'lib-bower/moment/moment-with-locales.js',
+      'lib/umbraco/Extensions.js',
+      'lib-bower/rgrove-lazyload/lazyload.js',
+      'lib-bower//angular-local-storage/angular-local-storage.min.js',
 
-         //app bootstrap and loader
-         'test/config/app.unit.js',
+      //app bootstrap and loader
+      'test/config/app.unit.js',
 
-         //application files
-         'src/common/directives/*.js',
-         'src/common/filters/*.js',
-         'src/common/services/*.js',
-         'src/common/security/*.js',
-         'src/common/resources/*.js',
-         'src/views/**/*.controller.js',
+      //application files
+      'src/common/directives/*.js',
+      'src/common/filters/*.js',
+      'src/common/services/*.js',
+      'src/common/security/*.js',
+      'src/common/resources/*.js',
+      'src/views/**/*.controller.js',
 
-         //mocked data and routing
-         'src/common/mocks/umbraco.servervariables.js',
-         'src/common/mocks/**/*.js',
+      //mocked data and routing
+      'src/common/mocks/umbraco.servervariables.js',
+      'src/common/mocks/**/*.js',
 
-         //tests
-         'test/unit/**/*.spec.js'     
+      //tests
+      'test/unit/**/*.spec.js'
     ],
 
     // list of files to exclude
@@ -81,9 +81,10 @@ module.exports = function(config) {
     // CLI --browsers Chrome,Firefox,Safari
     browsers: ['PhantomJS'],
 
-    // If browser does not capture in given timeout [ms], kill it
-    // CLI --capture-timeout 5000
-    captureTimeout: 5000,
+    // allow waiting a bit longer, some machines require this
+	
+    browserNoActivityTimeout: 100000,     // default 10,000ms
+
 
     // Auto run tests on start (when browsers are captured) and exit
     // CLI --single-run --no-single-run
@@ -92,7 +93,7 @@ module.exports = function(config) {
     // report which specs are slower than 500ms
     // CLI --report-slower-than 500
     reportSlowerThan: 500,
-
+    
     plugins: [
       'karma-jasmine',
       'karma-phantomjs-launcher'