From 95c4fb740a07dff127fd2a33b277e8135a0f56b4 Mon Sep 17 00:00:00 2001
From: arknu <asbjoern@stentebjerg.net>
Date: Sat, 4 Oct 2014 23:37:46 +0200
Subject: [PATCH] Fix broken Angular app test setup

---
 src/Umbraco.Web.UI.Client/src/app.dev.js      |  3 +-
 .../common/mocks/editors/prevalues.mocks.js   | 60 +++++++++++++++++++
 .../src/common/mocks/resources/_utils.js      |  2 +-
 .../src/common/mocks/resources/user.mocks.js  |  3 +-
 .../mocks/services/localization.mocks.js      |  2 +-
 5 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/app.dev.js b/src/Umbraco.Web.UI.Client/src/app.dev.js
index ad56364b7f..774186609f 100644
--- a/src/Umbraco.Web.UI.Client/src/app.dev.js
+++ b/src/Umbraco.Web.UI.Client/src/app.dev.js
@@ -8,7 +8,8 @@ var app = angular.module('umbraco', [
     'ngMobile',
     'ngSanitize',
     /*'ui.sortable',*/
-    'blueimp.fileupload'
+    'blueimp.fileupload',
+    'tmh.dynamicLocale'
 ]);
 
 /* For Angular 1.2: we need to load in Route, animate and touch seperately
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
index a0af9fb1d2..e2e45960b2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/editors/prevalues.mocks.js
@@ -11,11 +11,71 @@ angular.module('umbraco.mocks').
           }
       }
 
+	  function getCanvasEditorConfiguration(status, data, headers){
+		if (!mocksUtils.checkAuth()) {
+              return [401, null, null];
+          }
+          else {
+              return [200, 
+			  [
+					{
+						"name": "Rich text editor",
+						"alias": "rte",
+						"view": "rte",
+						"icon": "icon-article"
+					},
+					{
+						"name": "Image",
+						"alias": "media",
+						"view": "media",
+						"icon": "icon-picture"
+					},
+					{
+						"name": "Macro",
+						"alias": "macro",
+						"view": "macro",
+						"icon": "icon-settings-alt"
+					},
+					{
+						"name": "Embed",
+						"alias": "embed",
+						"view": "embed",
+						"icon": "icon-movie-alt"
+					},
+					{
+						"name": "Headline",
+						"alias": "headline",
+						"view": "textstring",
+						"icon": "icon-coin",
+						"config": {
+							"style": "font-size: 36px; line-height: 45px; font-weight: bold",
+							"markup": "<h1>#value#</h1>"
+						}
+					},
+					{
+						"name": "Quote",
+						"alias": "quote",
+						"view": "textstring",
+						"icon": "icon-quote",
+						"config": {
+							"style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
+							"markup": "<blockquote>#value#</blockquote>"
+						}
+					}
+				], null];
+			}
+			  
+	  }
+	  
+	  
       return {
           register: function() {
               $httpBackend
                   .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/RichTextPreValue/GetConfiguration'))
                   .respond(getRichTextConfiguration);
+			  $httpBackend
+                  .whenGET(mocksUtils.urlRegex('../config/canvas.editors.config.js'))
+                  .respond(getCanvasEditorConfiguration);	  
           }
       };
   }]);
\ No newline at end of file
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 7af6d44568..52ddd13204 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
@@ -124,7 +124,7 @@ angular.module('umbraco.mocks').
                         label: "Grid",
                         id: 8,
                         properties: [
-                        { alias: "grid", label: "Grid", view: "grid", value: "test", hideLabel: true }
+                        { alias: "canvas", label: "Grid", view: "canvas", value: "test", hideLabel: true }
                         ]
                     }, {
                         label: "Generic Properties",
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js
index 00ae4450db..5b5d38d1b6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/user.mocks.js
@@ -10,7 +10,8 @@ angular.module('umbraco.mocks').
               emailHash: "f9879d71855b5ff21e4963273a886bfc",
               id: 0,
               locale: 'da-DK',
-              remainingAuthSeconds: 600
+              remainingAuthSeconds: 600,
+			  allowedSections: ["content", "media"]
           };
       }
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
index 293ff2da69..f0b81ecc50 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
@@ -1,4 +1,4 @@
-angular.module('Umbraco.mocks').
+angular.module('umbraco.mocks').
   factory('localizationMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
       'use strict';