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

Fixes api controller tests

Browse Source
This commit is contained in:
Shannon
2013-09-26 10:00:01 +10:00
parent aca64ae08e
commit 611f3a04b6
3 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/Umbraco.Tests/Controllers/WebApiEditors/ContentControllerUnitTests.cs
View File

@@ -16,11 +16,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
public void Does_Not_Throw_Exception_When_Access_Allowed_By_Path()
{
//arrange
var user = new Mock<IUser>().Object;
user.Id = 9;
user.StartContentId = -1;
var content = new Mock<IContent>().Object;
content.Path = "-1,1234,5678";
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartContentId).Returns(-1);
var user = userMock.Object;
var contentMock = new Mock<IContent>();
contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
var content = contentMock.Object;
var contentServiceMock = new Mock<IContentService>();
contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
var contentService = contentServiceMock.Object;
@@ -40,11 +42,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
public void Throws_Exception_When_No_Content_Found()
{
//arrange
var user = new Mock<IUser>().Object;
user.Id = 9;
user.StartContentId = -1;
var content = new Mock<IContent>().Object;
content.Path = "-1,1234,5678";
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartContentId).Returns(-1);
var user = userMock.Object;
var contentMock = new Mock<IContent>();
contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
var content = contentMock.Object;
var contentServiceMock = new Mock<IContentService>();
contentServiceMock.Setup(x => x.GetById(0)).Returns(content);
var contentService = contentServiceMock.Object;
@@ -61,11 +65,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
public void Throws_Exception_When_No_Access_By_Path()
{
//arrange
var user = new Mock<IUser>().Object;
user.Id = 9;
user.StartContentId = 9876;
var content = new Mock<IContent>().Object;
content.Path = "-1,1234,5678";
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartContentId).Returns(9876);
var user = userMock.Object;
var contentMock = new Mock<IContent>();
contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
var content = contentMock.Object;
var contentServiceMock = new Mock<IContentService>();
contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
var contentService = contentServiceMock.Object;
@@ -85,11 +91,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
public void Throws_Exception_When_No_Access_By_Permission()
{
//arrange
var user = new Mock<IUser>().Object;
user.Id = 9;
user.StartContentId = -1;
var content = new Mock<IContent>().Object;
content.Path = "-1,1234,5678";
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartContentId).Returns(-1);
var user = userMock.Object;
var contentMock = new Mock<IContent>();
contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
var content = contentMock.Object;
var contentServiceMock = new Mock<IContentService>();
contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
var contentService = contentServiceMock.Object;
@@ -112,11 +120,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
public void Does_Not_Throw_Exception_When_Access_Allowed_By_Permission()
{
//arrange
var user = new Mock<IUser>().Object;
user.Id = 9;
user.StartContentId = -1;
var content = new Mock<IContent>().Object;
content.Path = "-1,1234,5678";
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartContentId).Returns(-1);
var user = userMock.Object;
var contentMock = new Mock<IContent>();
contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
var content = contentMock.Object;
var contentServiceMock = new Mock<IContentService>();
contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
var contentService = contentServiceMock.Object;
@@ -139,11 +149,13 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
public void Does_Not_Throw_Exception_When_No_Permissions_Assigned()
{
//arrange
var user = new Mock<IUser>().Object;
user.Id = 9;
user.StartContentId = -1;
var content = new Mock<IContent>().Object;
content.Path = "-1,1234,5678";
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartContentId).Returns(-1);
var user = userMock.Object;
var contentMock = new Mock<IContent>();
contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
var content = contentMock.Object;
var contentServiceMock = new Mock<IContentService>();
contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
var contentService = contentServiceMock.Object;

17
src/Umbraco.Tests/Controllers/WebApiEditors/FilterAllowedOutgoingContentAttributeTests.cs
View File

@@ -80,9 +80,11 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
path += i.ToInvariantString();
list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = i, Path = path });
}
var user = new Mock<IUser>().Object;
user.Id = 9;
user.StartContentId = 5;
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartContentId).Returns(5);
var user = userMock.Object;
att.FilterBasedOnStartNode(list, user);
@@ -100,9 +102,12 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
list.Add(new ContentItemBasic{Id = i, Name = "Test" + i, ParentId = -1});
}
var ids = list.Select(x => (int)x.Id).ToArray();
var user = new Mock<IUser>().Object;
user.Id = 9;
user.StartContentId = -1;
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartContentId).Returns(-1);
var user = userMock.Object;
var userServiceMock = new Mock<IUserService>();
//we're only assigning 3 nodes browse permissions so that is what we expect as a result
var permissions = new List<EntityPermission>

20
src/Umbraco.Tests/Controllers/WebApiEditors/MediaControllerUnitTests.cs
View File

@@ -17,12 +17,12 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
{
//arrange
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartMediaId).Returns(-1);
var user = userMock.Object;
user.Id = 9;
user.StartMediaId = -1;
var mediaMock = new Mock<IMedia>();
mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
var media = mediaMock.Object;
media.Path = "-1,1234,5678";
var mediaServiceMock = new Mock<IMediaService>();
mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
var mediaService = mediaServiceMock.Object;
@@ -39,12 +39,12 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
{
//arrange
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartMediaId).Returns(-1);
var user = userMock.Object;
user.Id = 9;
user.StartMediaId = -1;
var mediaMock = new Mock<IMedia>();
mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
var media = mediaMock.Object;
media.Path = "-1,1234,5678";
var mediaServiceMock = new Mock<IMediaService>();
mediaServiceMock.Setup(x => x.GetById(0)).Returns(media);
var mediaService = mediaServiceMock.Object;
@@ -58,14 +58,14 @@ namespace Umbraco.Tests.Controllers.WebApiEditors
{
//arrange
var userMock = new Mock<IUser>();
userMock.Setup(u => u.Id).Returns(9);
userMock.Setup(u => u.StartMediaId).Returns(9876);
var user = userMock.Object;
user.Id = 9;
user.StartMediaId = 9876;
var mediaMock = new Mock<IMedia>();
mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
var media = mediaMock.Object;
media.Path = "-1,1234,5678";
var mediaServiceMock = new Mock<IMediaService>();
mediaServiceMock.Setup(x => x.GetById(0)).Returns(media);
mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
var mediaService = mediaServiceMock.Object;
//act