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 dev-v7.7

Browse Source 
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
This commit is contained in:
Sebastiaan Janssen
2017-09-11 15:46:54 +02:00
parent fb60647b5a 857b7cc608
commit 3275f03aff
45 changed files with 2172 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ describe('edit content controller tests', function () {
it('it should have an content object', function() {
//controller should have a content object
expect(scope.content).toBeTruthy();
expect(scope.content).not.toBeUndefined();
//if should be the same as the routeParams defined one
expect(scope.content.id).toBe(1234);

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

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

8
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).toBeTruthy();
expect(scope.model.value).not.toBeUndefined();
});
it("should populate scope.renderModel", function(){
expect(scope.renderModel).toBeTruthy();
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).toBeTruthy();
expect(item.name).not.toBeUndefined();
expect(item.id).toBe(1233);
expect(item.icon).toBeTruthy();
expect(item.icon).not.toBeUndefined();
});
it("Removing an item should update renderModel, ids and model.value", function(){

16
src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js
View File

@@ -18,14 +18,14 @@ describe('Assets service tests', function () {
it('Loads a javascript file', function () {
var loaded = false;
runs( function(){
assetsService.loadJs("lib/umbraco/NamespaceManager.js").then(function(){
expect(Umbraco.Sys).toNotBe(undefined);
});
});
runs(function(){
expect(Umbraco.Sys).toNotBe(undefined);
});
// runs( function(){
// assetsService.loadJs("lib/umbraco/NamespaceManager.js").then(function(){
// expect(Umbraco.Sys).toNotBe(undefined);
// });
// });
// runs(function(){
// expect(Umbraco.Sys).toNotBe(undefined);
// });
});
});
});

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

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

8
src/Umbraco.Web.UI.Client/test/unit/common/services/date-helper.spec.js
View File

@@ -15,7 +15,7 @@ describe('date helper tests', function () {
var result = dateHelper.convertToLocalMomentTime(strDate, offsetMin);
expect(result.format("YYYY-MM-DD HH:mm:ss Z")).toBe("2016-01-01 01:00:00 +01:00");
//expect(result.format("YYYY-MM-DD HH:mm:ss Z")).toBe("2016-01-01 01:00:00 +01:00");
});
it('converts from a negataive offset', function () {
@@ -24,7 +24,7 @@ describe('date helper tests', function () {
var result = dateHelper.convertToLocalMomentTime(strDate, offsetMin);
expect(result.format("YYYY-MM-DD HH:mm:ss Z")).toBe("2016-01-01 18:00:00 +01:00");
//expect(result.format("YYYY-MM-DD HH:mm:ss Z")).toBe("2016-01-01 18:00:00 +01:00");
});
});
@@ -37,7 +37,7 @@ describe('date helper tests', function () {
var result = dateHelper.convertToServerStringTime(localDate, offsetMin, "YYYY-MM-DD HH:mm:ss Z");
expect(result).toBe("2016-01-01 19:00:00 +10:00");
//expect(result).toBe("2016-01-01 19:00:00 +10:00");
});
it('converts from a negataive offset', function () {
@@ -46,7 +46,7 @@ describe('date helper tests', function () {
var result = dateHelper.convertToServerStringTime(localDate, offsetMin, "YYYY-MM-DD HH:mm:ss Z");
expect(result).toBe("2016-01-01 02:00:00 -07:00");
//expect(result).toBe("2016-01-01 02:00:00 -07:00");
});
});