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

Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10006

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
This commit is contained in:
Sebastiaan Janssen
2017-09-11 15:08:15 +02:00
parent 3f55abaf59 3e3a180fe4
commit c23160f915
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
View File

@@ -42,10 +42,10 @@ describe('edit content controller tests', function () {
it('it should have an content object', function() {
//controller should have a content object
//expect(scope.content).toNotBe(undefined);
expect(scope.content).not.toBeUndefined();
//if should be the same as the routeParams defined one
//expect(scope.content.id).toBe(1234);
expect(scope.content.id).toBe(1234);
});
it('it should have a tabs collection', function () {

4
src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
View File

@@ -41,10 +41,10 @@ describe('edit media controller tests', function () {
it('it should have an media object', function() {
//controller should have a content object
//expect(scope.content).toNotBe(undefined);
expect(scope.content).not.toBeUndefined();
//if should be the same as the routeParams defined one
//expect(scope.content.id).toBe(1234);
expect(scope.content.id).toBe(1234);
});
it('it should have a tabs collection', function () {

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

@@ -59,19 +59,19 @@ describe('Content picker controller tests', function () {
};
it('should define the default properties on construction', function () {
//expect(scope.model.value).toNotBe(undefined);
expect(scope.model.value).not.toBeUndefined();
});
it("should populate scope.renderModel", function(){
//expect(scope.renderModel).toNotBe(undefined);
//expect(scope.renderModel.length).toBe(3);
expect(scope.renderModel).not.toBeUndefined();
expect(scope.renderModel.length).toBe(3);
});
it("Each rendermodel item should contain name, id and icon", function(){
var item = scope.renderModel[0];
//expect(item.name).toNotBe(undefined);
//expect(item.id).toBe(1233);
//expect(item.icon).toNotBe(undefined);
expect(item.name).not.toBeUndefined();
expect(item.id).toBe(1233);
expect(item.icon).not.toBeUndefined();
});
it("Removing an item should update renderModel, ids and model.value", function(){

4
src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
View File

@@ -36,8 +36,8 @@ describe('content factory tests', function () {
$rootScope.$digest();
$httpBackend.flush();
//expect(doc).toNotBe(undefined);
//expect(doc.id).toBe(1234);
expect(doc).not.toBeUndefined();
expect(doc.id).toBe(1234);
});