Fixed setting template id via DbItem constructor

sshushliapin · Apr 9, 2014 · 203b7bb · 203b7bb
1 parent d54df37
commit 203b7bb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+0.10.2
+* [FIX] Fixed template id setting via DbItem constructor
+
 0.10.1
 * [FIX] Clean up received calls for provider mocks
 * [NEW] Added Folder template

diff --git a/Source/Sitecore.FakeDb.Tests/DbTest.cs b/Source/Sitecore.FakeDb.Tests/DbTest.cs
@@ -817,5 +817,19 @@ public void ShouldCreateItemOfFolderTemplate()
         db.GetItem("/sitecore/content/sample").TemplateID.Should().Be(TemplateIDs.Folder);
       }
     }
+
+    [Fact]
+    public void ShouldCreateSampleTemplateIfTemplateIdIsSetButTemplateIsMissing()
+    {
+      // arrange
+      var templateId = ID.NewID;
+
+      // act
+      using (var db = new Db { new DbItem("home", ID.NewID, templateId) })
+      {
+        // assert
+        db.GetItem("/sitecore/content/home").TemplateID.Should().Be(templateId);
+      }
+    }
   }
 }
diff --git a/Source/Sitecore.FakeDb/Db.cs b/Source/Sitecore.FakeDb/Db.cs
@@ -169,7 +169,10 @@ protected virtual void CreateTemplate(DbItem item)
         return;
       }
 
-      item.TemplateID = ID.NewID;
+      if (item.TemplateID == ID.Null)
+      {
+        item.TemplateID = ID.NewID;
+      }
 
       var fields = new DbFieldCollection();
       foreach (var itemField in item.Fields)

diff --git a/Source/Sitecore.FakeDb/Properties/AssemblyVersionInfo.cs b/Source/Sitecore.FakeDb/Properties/AssemblyVersionInfo.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.10.1.0")]
-[assembly: AssemblyFileVersion("0.10.1.0")]
-[assembly: AssemblyInformationalVersion("0.10.1")]
+[assembly: AssemblyVersion("0.10.2.0")]
+[assembly: AssemblyFileVersion("0.10.2.0")]
+[assembly: AssemblyInformationalVersion("0.10.2")]