Merge branch 'temp8' into temp8-contentAndType

# Conflicts: # src/Umbraco.Core/Models/Content.cs # src/Umbraco.Core/Models/ContentBase.cs # src/Umbraco.Tests/Models/ContentTests.cs
2019-02-07 11:41:06 +11:00
parent b260c18056 0606d1bc8b
commit c04da30547
58 changed files with 1753 additions and 999 deletions
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -157,7 +157,7 @@ namespace Umbraco.Tests.Testing

            // etc
            ComposeWeb();
-            ComposeWtf();
+            ComposeMisc();

            // not sure really
            Compose(Composition);
@@ -233,7 +233,7 @@ namespace Umbraco.Tests.Testing

        }

-        protected virtual void ComposeWtf()
+        protected virtual void ComposeMisc()
        {
            // what else?
            var runtimeStateMock = new Mock<IRuntimeState>();