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

Merge branch 'u4-8632b' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-8632b

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Models/Rdbms/UserGroup2NodePermissionDto.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserTypeRepository.cs
#	src/Umbraco.Core/Persistence/RepositoryFactory.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/SectionService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/NotificationsRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
#	src/Umbraco.Tests/Services/ContentServiceTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
#	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
This commit is contained in:
Shannon
2017-05-04 18:29:43 +10:00
parent 751dc8df23 11b97c5291
commit 24e2547656
139 changed files with 4504 additions and 3816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Tests/Models/UserTests.cs
View File

@@ -13,7 +13,7 @@ namespace Umbraco.Tests.Models
[Test]
public void Can_Deep_Clone()
{
var item = new User(new UserType(){Id = 3})
var item = new User()
{
Id = 3,
Key = Guid.NewGuid(),
@@ -21,7 +21,6 @@ namespace Umbraco.Tests.Models
CreateDate = DateTime.Now,
Name = "Test",
Comments = "comments",
DefaultPermissions = new[]{"a","b","c"},
DefaultToLiveEditing = false,
Email = "test@test.com",
Language = "en",
@@ -41,37 +40,19 @@ namespace Umbraco.Tests.Models
Username = "username"
};
item.AddAllowedSection("test");
var clone = (User)item.DeepClone();
Assert.AreNotSame(clone, item);
Assert.AreEqual(clone, item);
Assert.AreNotSame(clone.UserType, item.UserType);
Assert.AreEqual(clone.UserType, item.UserType);
Assert.AreEqual(clone.AllowedSections.Count(), item.AllowedSections.Count());
Assert.AreNotSame(clone.DefaultPermissions, item.DefaultPermissions);
Assert.AreEqual(clone.DefaultPermissions.Count(), item.DefaultPermissions.Count());
//Verify normal properties with reflection
var allProps = clone.GetType().GetProperties();
foreach (var propertyInfo in allProps)
{
Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
}
//ensure internal collections are differet
Assert.AreNotSame(item.AddedSections, clone.AddedSections);
Assert.AreNotSame(item.RemovedSections, clone.RemovedSections);
//ensure event handlers are still wired on clone
clone.AddAllowedSection("blah");
Assert.AreEqual(1, clone.AddedSections.Count());
clone.RemoveAllowedSection("blah");
Assert.AreEqual(1, clone.RemovedSections.Count());
}
[Test]
@@ -79,7 +60,7 @@ namespace Umbraco.Tests.Models
{
var ss = new SerializationService(new JsonNetSerializer());
var item = new User(new UserType() { Id = 3 })
var item = new User
{
Id = 3,
Key = Guid.NewGuid(),
@@ -87,7 +68,6 @@ namespace Umbraco.Tests.Models
CreateDate = DateTime.Now,
Name = "Test",
Comments = "comments",
DefaultPermissions = new[] { "a", "b", "c" },
DefaultToLiveEditing = false,
Email = "test@test.com",
Language = "en",

61
src/Umbraco.Tests/Models/UserTypeTests.cs
View File

@@ -1,61 +0,0 @@
using System;
using System.Diagnostics;
using System.Linq;
using NUnit.Framework;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Serialization;
namespace Umbraco.Tests.Models
{
[TestFixture]
public class UserTypeTests
{
[Test]
public void Can_Deep_Clone()
{
var item = new UserType()
{
Id = 3,
Key = Guid.NewGuid(),
UpdateDate = DateTime.Now,
CreateDate = DateTime.Now,
Name = "Test",
Alias = "test",
Permissions = new[] {"a", "b", "c"}
};
var clone = (UserType)item.DeepClone();
Assert.AreNotSame(clone, item);
Assert.AreEqual(clone, item);
//Verify normal properties with reflection
var allProps = clone.GetType().GetProperties();
foreach (var propertyInfo in allProps)
{
Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
}
}
[Test]
public void Can_Serialize_Without_Error()
{
var ss = new SerializationService(new JsonNetSerializer());
var item = new UserType()
{
Id = 3,
Key = Guid.NewGuid(),
UpdateDate = DateTime.Now,
CreateDate = DateTime.Now,
Name = "Test",
Alias = "test",
Permissions = new[] { "a", "b", "c" }
};
var result = ss.ToStream(item);
var json = result.ResultStream.ToJsonString();
Debug.Print(json);
}
}
}