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 6.2.0-pubcontent

Browse Source 
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
This commit is contained in:
Stephan
2013-10-03 18:16:29 +02:00
parent 06206c60d9 08660704cc
commit a264342bcc
161 changed files with 387 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
View File

@@ -19,9 +19,9 @@ namespace Umbraco.Tests.CodeFirst
foreach (var property in content.Properties)
{
var @alias = property.PropertyTypeAlias;
var @alias = property.PropertyTypeAlias.ToLowerInvariant();
var propertyInfo = propertyInfos.FirstOrDefault(x => x.Name.ToUmbracoAlias() == @alias);
var propertyInfo = propertyInfos.FirstOrDefault(x => x.Name.ToLowerInvariant() == @alias);
if (propertyInfo == null) continue;
object value = null;

6
src/Umbraco.Tests/CodeFirst/TypeInheritanceTest.cs
View File

@@ -64,9 +64,9 @@ namespace Umbraco.Tests.CodeFirst
}
Assert.That(list.Count, Is.EqualTo(3));
Assert.That(list.Any(x => x == "meta"), Is.True);
Assert.That(list.Any(x => x == "metaSeo"), Is.True);
Assert.That(list.Any(x => x == "base"), Is.True);
Assert.Contains("Meta", list);
Assert.Contains("MetaSeo", list);
Assert.Contains("Base", list);
}
[Test]