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

Merge branch temp8 into temp8-di2690

Browse Source
This commit is contained in:
Stephan
2018-12-07 16:12:08 +01:00
parent ed222510f0 bd91706f89
commit 7f8eeeab83
30 changed files with 260 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
View File

@@ -211,9 +211,8 @@ namespace Umbraco.Tests.Web.Controllers
var contentServiceMock = Mock.Get(Current.Services.ContentService);
contentServiceMock.Setup(x => x.GetById(123)).Returns(() => null); //do not find it
var publishedSnapshot = Mock.Of<IPublishedSnapshotService>();
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var usersController = new ContentController(publishedSnapshot, propertyEditorCollection);
var usersController = new ContentController(propertyEditorCollection);
return usersController;
}
@@ -238,9 +237,8 @@ namespace Umbraco.Tests.Web.Controllers
var contentServiceMock = Mock.Get(Current.Services.ContentService);
contentServiceMock.Setup(x => x.GetById(123)).Returns(() => GetMockedContent());
var publishedSnapshot = Mock.Of<IPublishedSnapshotService>();
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var usersController = new ContentController(publishedSnapshot, propertyEditorCollection);
var usersController = new ContentController(propertyEditorCollection);
return usersController;
}
@@ -270,9 +268,8 @@ namespace Umbraco.Tests.Web.Controllers
var contentServiceMock = Mock.Get(Current.Services.ContentService);
contentServiceMock.Setup(x => x.GetById(123)).Returns(() => GetMockedContent());
var publishedSnapshot = Mock.Of<IPublishedSnapshotService>();
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var usersController = new ContentController(publishedSnapshot, propertyEditorCollection);
var usersController = new ContentController(propertyEditorCollection);
return usersController;
}
@@ -308,9 +305,8 @@ namespace Umbraco.Tests.Web.Controllers
contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
.Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
var publishedSnapshot = Mock.Of<IPublishedSnapshotService>();
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var usersController = new ContentController(publishedSnapshot, propertyEditorCollection);
var usersController = new ContentController(propertyEditorCollection);
return usersController;
}
@@ -340,9 +336,8 @@ namespace Umbraco.Tests.Web.Controllers
contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
.Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
var publishedSnapshot = Mock.Of<IPublishedSnapshotService>();
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var usersController = new ContentController(publishedSnapshot, propertyEditorCollection);
var usersController = new ContentController(propertyEditorCollection);
return usersController;
}
@@ -376,9 +371,8 @@ namespace Umbraco.Tests.Web.Controllers
contentServiceMock.Setup(x => x.Save(It.IsAny<IContent>(), It.IsAny<int>(), It.IsAny<bool>()))
.Returns(new OperationResult(OperationResultType.Success, new Core.Events.EventMessages())); //success
var publishedSnapshot = Mock.Of<IPublishedSnapshotService>();
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var usersController = new ContentController(publishedSnapshot, propertyEditorCollection);
var usersController = new ContentController(propertyEditorCollection);
return usersController;
}