From df7691ada3df00350793099e5ab1022ffdcd1b8b Mon Sep 17 00:00:00 2001 From: perploug Date: Mon, 13 Jan 2014 10:14:30 +0100 Subject: [PATCH] Adds missing mocks --- .../src/common/mocks/resources/_utils.js | 6 +- .../src/common/mocks/resources/media.mocks.js | 114 +++++++----------- .../services/mediahelperService.mocks.js | 20 +++ .../src/common/mocks/umbraco.httpbackend.js | 3 +- .../common/mocks/umbraco.servervariables.js | 2 + 5 files changed, 70 insertions(+), 75 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js 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 523f9c51f2..1984d4d009 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 @@ -59,8 +59,8 @@ angular.module('umbraco.mocks'). id: 1, active: true, properties: [ - { alias: "list", label: "List", view: "listview", value: "", hideLabel: true }, - { alias: "media", label: "Media picker", view: "mediapicker", value: "" } + { alias: "list", label: "List", view: "listview", value: "", hideLabel: true, config:{entityType: "content"} }, + { alias: "media", label: "Media picker", view: "mediapicker", value: "" ,config:{} } ] }, { @@ -72,7 +72,7 @@ angular.module('umbraco.mocks'). { alias: "textarea", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } }, { alias: "map", label: "Map", view: "googlemaps", value: "37.4419,-122.1419", config: { mapType: "ROADMAP", zoom: 4 } }, - { alias: "content", label: "Content picker", view: "contentpicker", value: "1234,23242,23232,23231" } + { alias: "media", label: "Media picker", view: "mediapicker", value: "1234,23242,23232,23231", config: {multiPicker: 1} } ] }, { diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js index 73504fd19c..2578cdf877 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js @@ -7,6 +7,17 @@ angular.module('umbraco.mocks'). return [200, nodes, null]; } + function returnNodebyIds(status, data, headers) { + var ids = mocksUtils.getParameterByName(data, "ids") || "1234,1234,4234"; + var items = []; + + _.each(ids, function(id){ + items.push(_getNode( parseInt( id, 10 )) ); + }); + + return [200, items, null]; + } + function returnNodebyId(status, data, headers) { if (!mocksUtils.checkAuth()) { @@ -16,86 +27,47 @@ angular.module('umbraco.mocks'). var id = mocksUtils.getParameterByName(data, "id") || 1234; id = parseInt(id, 10); - var node = { - name: "My content with id: " + id, - updateDate: new Date(), - publishDate: new Date(), - id: id, - parentId: 1234, - icon: "icon-file-alt", - owner: {name: "Administrator", id: 0}, - updater: {name: "Per Ploug Krogslund", id: 1}, - path: "-1,1234,2455", - tabs: [ - { - label: "Child documents", - alias: "tab00", - id: 0, - active: true, - properties: [ - { - alias: "list", label: "List", view: "listview", value: "", hideLabel: true } - ] - }, - { - label: "Content", - alias: "tab01", - id: 1, - properties: [ - { alias: "bodyText", label: "Body Text", description:"Here you enter the primary article contents", view: "rte", value: "

askjdkasj lasjd

" }, - { alias: "textarea", label: "textarea", view: "textarea", value: "ajsdka sdjkds", config: { rows: 4 } }, - { alias: "map", label: "Map", view: "googlemaps", value: "37.4419,-122.1419", config: { mapType: "ROADMAP", zoom: 4 } }, - { alias: "media", label: "Media picker", view: "mediapicker", value: "" }, - { alias: "content", label: "Content picker", view: "contentpicker", value: "" } - ] - }, - { - label: "Sample Editor", - alias: "tab02", - id: 2, - properties: [ - { alias: "datepicker", label: "Datepicker", view: "datepicker", config: { rows: 7 } }, - { alias: "tags", label: "Tags", view: "tags", value: ""} - ] - }, - { - label: "Grid", - alias: "tab03", - id: 3, - properties: [ - { alias: "grid", label: "Grid", view: "grid", value: "test", hideLabel: true } - ] - },{ - label: "WIP", - alias: "tab04", - id: 4, - properties: [ - { alias: "tes", label: "Stuff", view: "test", value: "", - - config: { - fields: [ - { alias: "embedded", label: "Embbeded", view: "textstring", value: ""}, - { alias: "embedded2", label: "Embbeded 2", view: "contentpicker", value: ""}, - { alias: "embedded3", label: "Embbeded 3", view: "textarea", value: ""}, - { alias: "embedded4", label: "Embbeded 4", view: "datepicker", value: ""} - ] - } - } - ] - } - ] - }; - return [200, node, null]; + + + return [200, _getNode(id), null]; } + function _getNode(id){ + var node = { + name: "My media with id: " + id, + updateDate: new Date(), + publishDate: new Date(), + id: id, + parentId: 1234, + icon: "icon-file-alt", + owner: {name: "Administrator", id: 0}, + updater: {name: "Per Ploug Krogslund", id: 1}, + path: "-1,1234,2455", + tabs: [ + { + label: "Media", + alias: "tab0", + id: 0, + properties: [ + { alias: "umbracoFile", label: "File", description:"Some file", view: "rte", value: "/media/1234/random.jpg" } + ] + } + ] + }; + return node; + } return { register: function() { $httpBackend - .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetById')) + .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetById?')) .respond(returnNodebyId); + $httpBackend + .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetByIds?')) + .respond(returnNodebyIds); + $httpBackend .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Media/GetChildren')) .respond(returnNodeCollection); diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js new file mode 100644 index 0000000000..2ab633d9ef --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/mediahelperService.mocks.js @@ -0,0 +1,20 @@ +angular.module('umbraco.mocks'). + factory('imageHelperMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) { + 'use strict'; + + function returnEntitybyIds(){ + return "hello.jpg"; + } + + + return { + register: function () { + + $httpBackend + .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Images/GetBigThumbnail')) + .respond(returnEntitybyIds); + + + } + }; + }]); \ No newline at end of file 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 220d55a996..2cd9545e6a 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,7 +1,7 @@ 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, imageHelperMocks) { console.log("httpBackend inited"); @@ -19,6 +19,7 @@ function initBackEnd($httpBackend, contentMocks, mediaMocks, treeMocks, userMock localizationMocks.register(); prevaluesMocks.register(); + imageHelperMocks.register(); entityMocks.register(); $httpBackend.whenGET(/^views\//).passThrough(); diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js index a4c31df259..e0586487fd 100644 --- a/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js +++ b/src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.servervariables.js @@ -15,6 +15,8 @@ Umbraco.Sys.ServerVariables = { "authenticationApiBaseUrl": "/umbraco/UmbracoApi/Authentication/", //For this we'll just provide a file that exists during the mock session since we don't really have legay js tree stuff "legacyTreeJs": "/belle/lib/yepnope/empty.js", + "serverVarsJs": "/belle/lib/yepnope/empty.js", + "imagesApiBaseUrl": "/umbraco/UmbracoApi/Images/", "entityApiBaseUrl": "/umbraco/UmbracoApi/Entity/", "dashboardApiBaseUrl": "/umbraco/UmbracoApi/Dashboard/", "updateCheckApiBaseUrl": "/umbraco/Api/UpdateCheck/",