yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7.6' into temp-U4-9352

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
This commit is contained in:
Mads Rasmussen
2017-01-27 10:39:31 +01:00
parent 2465eb233e a5a42854ef
commit ab00ba8a12
173 changed files with 5277 additions and 1286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
View File

@@ -17,7 +17,11 @@ describe('Content picker controller tests', function () {
value:"1233,1231,23121",
label: "My content picker",
description: "desc",
config: {}
config: {
startNode: {
type: "content"
}
}
};
//this controller requires an angular form controller applied to it
@@ -47,6 +51,12 @@ describe('Content picker controller tests', function () {
}));
describe('content edit controller save and publish', function () {
var item = {
name: "meh",
id: 666,
icon: "woop"
};
it('should define the default properties on construction', function () {
expect(scope.model.value).toNotBe(undefined);
@@ -65,7 +75,6 @@ describe('Content picker controller tests', function () {
});
it("Removing an item should update renderModel, ids and model.value", function(){
scope.remove(1);
scope.$apply();
expect(scope.renderModel.length).toBe(2);
@@ -73,24 +82,29 @@ describe('Content picker controller tests', function () {
});
it("Adding an item should update renderModel, ids and model.value", function(){
scope.add({name: "meh", id: 666, icon: "woop"});
scope.add(item);
scope.$apply();
expect(scope.renderModel.length).toBe(4);
expect(scope.model.value).toBe("1233,1231,23121,666");
setTimeout(function(){
expect(scope.renderModel.length).toBe(4);
expect(scope.model.value).toBe("1233,1231,23121,666");
}, 1000);
});
it("Adding a dublicate item should note update renderModel, ids and model.value", function(){
scope.add({ name: "meh", id: 666, icon: "woop" });
it("Adding a duplicate item should note update renderModel, ids and model.value", function(){
scope.add(item);
scope.$apply();
expect(scope.renderModel.length).toBe(4);
expect(scope.model.value).toBe("1233,1231,23121,666");
setTimeout(function(){
expect(scope.renderModel.length).toBe(4);
expect(scope.model.value).toBe("1233,1231,23121,666");
}, 1000);
scope.add({ name: "meh 2", id: 666, icon: "woop 2" });
scope.add(item);
scope.$apply();
expect(scope.renderModel.length).toBe(4);
expect(scope.model.value).toBe("1233,1231,23121,666");
setTimeout(function(){
expect(scope.renderModel.length).toBe(4);
expect(scope.model.value).toBe("1233,1231,23121,666");
}, 1000);
});
});
});