From 4acc3f48bf1a5d88e22d42b85fe08f7a06e4a488 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 15 Jun 2018 12:06:21 +1000
Subject: [PATCH] Fixes JS test runner and all test pass

---
 .../src/common/mocks/resources/_utils.js          |  8 ++++----
 src/Umbraco.Web.UI.Client/test/config/app.unit.js | 10 ++++------
 .../test/config/karma.conf.js                     | 15 +++++++++------
 .../services/content-editing-helper.spec.js       |  7 ++-----
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
index 4facc8f08e..ef508c0f80 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
@@ -1,5 +1,5 @@
 angular.module('umbraco.mocks').
-    factory('mocksUtils', ['$cookieStore', function($cookieStore) {
+    factory('mocksUtils', ['$cookies', function ($cookies) {
         'use strict';
          
         //by default we will perform authorization
@@ -297,7 +297,7 @@ angular.module('umbraco.mocks').
             /** Checks for our mock auth cookie, if it's not there, returns false */
             checkAuth: function () {
                 if (doAuth) {
-                    var mockAuthCookie = $cookieStore.get("mockAuthCookie");
+                    var mockAuthCookie = $cookies.get("mockAuthCookie");
                     if (!mockAuthCookie) {
                         return false;
                     }
@@ -311,12 +311,12 @@ angular.module('umbraco.mocks').
             /** Creates/sets the auth cookie with a value indicating the user is now authenticated */
             setAuth: function() {
                 //set the cookie for loging
-                $cookieStore.put("mockAuthCookie", "Logged in!");
+                $cookies.put("mockAuthCookie", "Logged in!");
             },
             
             /** removes the auth cookie  */
             clearAuth: function() {
-                $cookieStore.remove("mockAuthCookie");
+                $cookies.remove("mockAuthCookie");
             },
 
             urlRegex: function(url) {
diff --git a/src/Umbraco.Web.UI.Client/test/config/app.unit.js b/src/Umbraco.Web.UI.Client/test/config/app.unit.js
index accf467fdc..8d051ce68a 100644
--- a/src/Umbraco.Web.UI.Client/test/config/app.unit.js
+++ b/src/Umbraco.Web.UI.Client/test/config/app.unit.js
@@ -5,10 +5,8 @@ var app = angular.module('umbraco', [
 	'umbraco.services',
 	'umbraco.mocks',
 	'umbraco.interceptors',
+
+    'ngRoute',
     'ngCookies',
-    'LocalStorageModule' 
-]);
-
-/* For Angular 1.2: we need to load in Routing separately
-	    'ngRoute'
-*/
+    'LocalStorageModule'
+]);
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 1b10ab0ce4..2d613efe2e 100644
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
@@ -12,15 +12,18 @@ module.exports = function (config) {
 
       //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/angular/angular.js',
+      'lib-bower/angular-animate/angular-animate.js',
+      'lib-bower/angular-cookies/angular-cookies.js',
+      'lib-bower/angular-local-storage/angular-local-storage.min.js',
+      'lib-bower/angular-route/angular-route.js',
+      'lib-bower/angular-sanitize/angular-sanitize.js',
+      'bower_components/angular-mocks/angular-mocks.js',
+      'lib-bower/angular-ui-sortable/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',
@@ -29,7 +32,7 @@ module.exports = function (config) {
       'src/common/directives/*.js',
       'src/common/filters/*.js',
       'src/common/services/*.js',
-      'src/common/security/*.js',
+      'src/common/interceptors/*.js',
       'src/common/resources/*.js',
       'src/views/**/*.controller.js',
 
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js
index ad336cf544..07e6b6e3c1 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js
@@ -3,10 +3,7 @@ describe('contentEditingHelper tests', function () {
 
     beforeEach(module('umbraco.services'));
     beforeEach(module('umbraco.mocks'));
-    
-
-    //Only for 1.2: beforeEach(module('ngRoute'));
-
+    beforeEach(module('ngRoute'));
 
     beforeEach(inject(function ($injector, localizationMocks) {
         localizationMocks.register();
@@ -236,4 +233,4 @@ describe('contentEditingHelper tests', function () {
         });
 
     });
-});
\ No newline at end of file
+});