From 41b8294ce37c58b6da3401f3493d13a010880248 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 24 Jun 2019 10:39:47 +0100 Subject: [PATCH] Fixes build as commit 9fffdb4 added a check/call to GetCurrentUser and JS test was failing for unexpected HTTP call to GetCurrentUser --- .../common/mocks/resources/auth.resource.js | 59 +++++++++++++++++++ .../src/common/mocks/umbraco.httpbackend.js | 5 +- .../content/create-content-controller.spec.js | 5 +- 3 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/common/mocks/resources/auth.resource.js diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/auth.resource.js new file mode 100644 index 0000000000..2953347f55 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/auth.resource.js @@ -0,0 +1,59 @@ +/** +* @ngdoc service +* @name umbraco.mocks.authMocks +* @description +* Mocks data retrival for the auth service +**/ +function authMocks($httpBackend, mocksUtils) { + + /** internal method to mock the current user to be returned */ + function getCurrentUser() { + + if (!mocksUtils.checkAuth()) { + return [401, null, null]; + } + + var currentUser = { + "email":"warren@umbraco.com", + "locale":"en-US", + "emailHash":"da0673cb2c930ee247e8ba5ebe4355bf", + "userGroups":[ + "admin", + "sensitiveData" + ], + "remainingAuthSeconds":1178.2645038, + "startContentIds":[-1], + "startMediaIds":[-1], + "avatars":[ + "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=30", + "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=60", + "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=90", + "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=150", + "https://www.gravatar.com/avatar/da0673cb2c930ee247e8ba5ebe4355bf?d=404&s=300" + ], + "allowedSections":[ + "content", + "forms", + "media", + "member", + "packages", + "settings", + "users" + ], + "id":-1, + "name":"Warren Buckley" + }; + + return [200, currentUser, null]; + } + + return { + register: function () { + $httpBackend + .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Authentication/GetCurrentUser')) + .respond(getCurrentUser); + } + }; +} + +angular.module('umbraco.mocks').factory('authMocks', ['$httpBackend', 'mocksUtils', authMocks]); diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js index 92c2a67d23..21f2b020dd 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js @@ -1,10 +1,10 @@ var umbracoAppDev = angular.module('umbraco.httpbackend', ['umbraco', 'ngMockE2E', 'umbraco.mocks']); -function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMocks, contentTypeMocks, sectionMocks, entityMocks, dataTypeMocks, dashboardMocks, macroMocks, utilMocks, localizationMocks, prevaluesMocks) { +function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMocks, contentTypeMocks, sectionMocks, entityMocks, dataTypeMocks, dashboardMocks, macroMocks, utilMocks, localizationMocks, prevaluesMocks, authMocks) { console.log("httpBackend inited"); - + //Register mocked http responses contentMocks.register(); mediaMocks.register(); @@ -19,6 +19,7 @@ function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMock localizationMocks.register(); prevaluesMocks.register(); entityMocks.register(); + authMocks.register(); $httpBackend.whenGET(/^..\/config\//).passThrough(); $httpBackend.whenGET(/^views\//).passThrough(); diff --git a/src/Umbraco.Web.UI.Client/test/unit/app/content/create-content-controller.spec.js b/src/Umbraco.Web.UI.Client/test/unit/app/content/create-content-controller.spec.js index 278d52c9a2..5954a2f984 100644 --- a/src/Umbraco.Web.UI.Client/test/unit/app/content/create-content-controller.spec.js +++ b/src/Umbraco.Web.UI.Client/test/unit/app/content/create-content-controller.spec.js @@ -33,7 +33,10 @@ } - beforeEach(inject(function ($controller, $rootScope, $q, $location) { + beforeEach(inject(function ($controller, $rootScope, $q, $location, authMocks) { + + authMocks.register(); + contentTypeResource = { getAllowedTypes: function () { var def = $q.defer();