From f824439180e75e20a2a39eb46fd41a91b97fdc66 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 18 Nov 2015 16:07:01 +0100
Subject: [PATCH] Merge branch 'UKFest-U4-4792' of
 https://github.com/opelpanfan/Umbraco-CMS into opelpanfan-UKFest-U4-4792

Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
---
 src/Umbraco.Tests/Services/ContentServiceTests.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Umbraco.Tests/Services/ContentServiceTests.cs b/src/Umbraco.Tests/Services/ContentServiceTests.cs
index 841789a980..09ae9d7caa 100644
--- a/src/Umbraco.Tests/Services/ContentServiceTests.cs
+++ b/src/Umbraco.Tests/Services/ContentServiceTests.cs
@@ -141,6 +141,20 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(20, contentService.CountDescendants(parent.Id));
         }
 
+        [Test]
+        public void GetAncestors_Returns_Empty_List_When_Path_Is_Null()
+        {
+            // Arrange
+            var contentService = ServiceContext.ContentService;
+
+            // Act
+            var current = new Mock<IContent>();
+            var res = contentService.GetAncestors(current.Object);
+
+            // Assert
+            Assert.IsEmpty(res);
+        }
+
         [Test]
         public void Tags_For_Entity_Are_Not_Exposed_Via_Tag_Api_When_Content_Is_Recycled()
         {