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

Fixed up validation messages when we are not redirecting, fixed up how we re-bind the content values to make sure we only set the values if they have been changed by the server and added unit tests for that. Added more properties to our display model including a new INotificationModel to put localized notifications in.

Browse Source
This commit is contained in:
Shannon
2013-07-22 17:13:38 +10:00
parent 8b7bbed1b5
commit b9d0bca1b6
5 changed files with 202 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js
View File

@@ -25,7 +25,7 @@ describe('contentEditingHelper tests', function () {
err.data.ModelState = {};
//act
var handled = contentEditingHelper.handleSaveError(err);
var handled = contentEditingHelper.handleSaveError(err, {content: content});
//assert
expect(handled).toBe(true);
@@ -39,7 +39,7 @@ describe('contentEditingHelper tests', function () {
};
//act
var handled = contentEditingHelper.handleSaveError(err);
var handled = contentEditingHelper.handleSaveError(err, null);
//assert
expect(handled).toBe(false);
@@ -55,7 +55,7 @@ describe('contentEditingHelper tests', function () {
};
//act
var handled = contentEditingHelper.handleSaveError(err);
var handled = contentEditingHelper.handleSaveError(err, { content: content });
//assert
expect(handled).toBe(false);
@@ -183,4 +183,32 @@ describe('contentEditingHelper tests', function () {
});
});
describe('wires up property values after saving', function () {
it('does not update un-changed values', function () {
//arrange
var origContent = mocksUtils.getMockContent(1234);
origContent.tabs[0].properties[0].value = { complex1: "origValue1a", complex2: "origValue1b" };
origContent.tabs[1].properties[0].value = "origValue2";
origContent.tabs[1].properties[1].value = "origValue3";
origContent.tabs[1].properties[2].value = "origValue4";
var newContent = mocksUtils.getMockContent(1234);
newContent.tabs[0].properties[0].value = { complex1: "origValue1a", complex2: "newValue1b" };
newContent.tabs[1].properties[0].value = "origValue2";
newContent.tabs[1].properties[1].value = "newValue3";
newContent.tabs[1].properties[2].value = "origValue4";
//act
var changed = contentEditingHelper.reBindChangedProperties(origContent, newContent);
//assert
expect(changed.length).toBe(2);
expect(changed[0].alias).toBe("list");
expect(changed[1].alias).toBe("textarea");
});
});
});