Merge remote-tracking branch 'origin/6.2.1' into 7.1.3

Conflicts: src/Umbraco.Tests/Models/ContentTests.cs src/Umbraco.Tests/Models/ContentTypeTests.cs
2014-05-12 14:37:19 +10:00
parent ac88da4188 4e5019d5af
commit 150b67d10f
1 changed files with 12 additions and 0 deletions
--- a/src/Umbraco.Tests/Models/ContentTypeTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTypeTests.cs
@@ -12,6 +12,18 @@ namespace Umbraco.Tests.Models
    [TestFixture]
    public class ContentTypeTests : BaseUmbracoConfigurationTest
    {
+        [SetUp]
+        public void Init()
+        {
+            TestHelper.EnsureUmbracoSettingsConfig();
+        }
+
+        [TearDown]
+        public void Dispose()
+        {
+            TestHelper.CleanUmbracoSettingsConfig();
+        }
+
        [Test]
        public void Can_Deep_Clone_Content_Type_Sort()
        {