Fixes merge issues... but now have to fix all the unit tests

This commit is contained in:
Shannon
2013-09-18 13:26:09 +10:00
parent 81365cec25
commit 67171db955
10 changed files with 130 additions and 88 deletions

View File

@@ -1,5 +1,5 @@
using NUnit.Framework;
using Rhino.Mocks;
using Moq;
using NUnit.Framework;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Membership;
@@ -16,9 +16,11 @@ namespace Umbraco.Tests.Models
[TestCase(1, "-1,-20,1,2,3,4,5", false)]
public void Determines_Path_Based_Access_To_Content(int userId, string contentPath, bool outcome)
{
var user = MockRepository.GenerateStub<IUser>();
var userMock = new Mock<IUser>();
var user = userMock.Object;
user.StartContentId = userId;
var content = MockRepository.GenerateStub<IContent>();
var contentMock = new Mock<IContent>();
var content = contentMock.Object;
content.Path = contentPath;
Assert.AreEqual(outcome, user.HasPathAccess(content));