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

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

Browse Source 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/MemberReadOnlyDto.cs
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
	src/Umbraco.Web/Umbraco.Web.csproj
This commit is contained in:
Shannon
2013-09-10 11:49:05 +10:00
parent d7c68b7f12 b2deb3def3
commit e962e86c3c
85 changed files with 4677 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
View File

@@ -106,6 +106,37 @@ namespace Umbraco.Tests.Persistence.Repositories
Assert.That(textpage.HasIdentity, Is.True);
}
//Covers issue U4-2791 and U4-2607
[Test]
public void Can_Save_Content_With_AtSign_In_Name_On_ContentRepository()
{
// Arrange
var provider = new PetaPocoUnitOfWorkProvider();
var unitOfWork = provider.GetUnitOfWork();
var contentTypeRepository = RepositoryResolver.Current.ResolveByType<IContentTypeRepository>(unitOfWork);
var repository = RepositoryResolver.Current.ResolveByType<IContentRepository>(unitOfWork);
ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage", "Textpage");
Content textpage = MockedContent.CreateSimpleContent(contentType, "test@umbraco.org", -1);
Content anotherTextpage = MockedContent.CreateSimpleContent(contentType, "@lightgiants", -1);
// Act
contentTypeRepository.AddOrUpdate(contentType);
repository.AddOrUpdate(textpage);
repository.AddOrUpdate(anotherTextpage);
unitOfWork.Commit();
// Assert
Assert.That(contentType.HasIdentity, Is.True);
Assert.That(textpage.HasIdentity, Is.True);
var content = repository.Get(textpage.Id);
Assert.That(content.Name, Is.EqualTo(textpage.Name));
var content2 = repository.Get(anotherTextpage.Id);
Assert.That(content2.Name, Is.EqualTo(anotherTextpage.Name));
}
[Test]
public void Can_Perform_Multiple_Adds_On_ContentRepository()
{