Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Conflicts:
	src/Umbraco.Core/Models/MemberType.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
This commit is contained in:
Shannon
2014-03-20 09:54:13 +11:00
3 changed files with 23 additions and 3 deletions

View File

@@ -1,4 +1,5 @@
using System.Linq;
using System;
using System.Linq;
using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.Models;
@@ -70,6 +71,21 @@ namespace Umbraco.Tests.Persistence.Repositories
}
}
[Test]
public void Cannot_Persist_Member_Type_Without_Alias()
{
var provider = new PetaPocoUnitOfWorkProvider();
var unitOfWork = provider.GetUnitOfWork();
using (var repository = CreateRepository(unitOfWork))
{
var memberType = MockedContentTypes.CreateSimpleMemberType();
memberType.Alias = null;
repository.AddOrUpdate(memberType);
Assert.Throws<InvalidOperationException>(unitOfWork.Commit);
}
}
[Test]
public void Can_Get_All_Member_Types()
{