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

Merge remote-tracking branch 'origin/dev-v7' into temp-U4-8410-2

Browse Source
This commit is contained in:
Stephan
2016-06-22 10:58:46 +02:00
parent 740c3e770a d2ad39f2d3
commit d4f2486b4f
198 changed files with 9403 additions and 10927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.Entities;
using umbraco.editorControls.tinyMCE3;
using umbraco.interfaces;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
namespace Umbraco.Tests.Persistence.Repositories
@@ -266,17 +267,18 @@ namespace Umbraco.Tests.Persistence.Repositories
using (var repository = CreateRepository(unitOfWork, out contentTypeRepository))
{
ContentType contentType = MockedContentTypes.CreateSimpleContentType("umbTextpage2", "Textpage");
Content textpage = MockedContent.CreateSimpleContent(contentType);
IContent textpage = MockedContent.CreateSimpleContent(contentType);
// Act
contentTypeRepository.AddOrUpdate(contentType);
repository.AddOrUpdate(textpage);
unitOfWork.Commit();
// Assert
Assert.That(contentType.HasIdentity, Is.True);
Assert.That(textpage.HasIdentity, Is.True);
}
}
@@ -305,9 +307,13 @@ namespace Umbraco.Tests.Persistence.Repositories
repository.AddOrUpdate(textpage);
unitOfWork.Commit();
var fetched = repository.Get(textpage.Id);
// Assert
Assert.That(textpage.Template, Is.Not.Null);
Assert.That(textpage.Template, Is.EqualTo(contentType.DefaultTemplate));
TestHelper.AssertAllPropertyValuesAreEquals(textpage, fetched, "yyyy-MM-dd HH:mm:ss");
}
}