From 36c66e676a77177aa3b2d5372baf4e78f8a04648 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Wed, 27 Feb 2013 22:35:27 +0600
Subject: [PATCH] Fixed unit tests

---
 src/Umbraco.Core/Configuration/GlobalSettings.cs | 11 ++++++++++-
 src/Umbraco.Tests/GlobalSettingsTests.cs         |  8 +++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 22e69e0100..e5a0f0928c 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -38,6 +38,14 @@ namespace Umbraco.Core.Configuration
 
         #endregion
 
+        /// <summary>
+        /// used for unit tests
+        /// </summary>
+        internal static void ResetCache()
+        {
+            _reservedUrlsCache = null;
+        }
+
     	/// <summary>
         /// Gets the reserved urls from web.config.
         /// </summary>
@@ -69,7 +77,8 @@ namespace Umbraco.Core.Configuration
                 var staticReservedPaths = "~/app_plugins/,~/install/,";
 
                 //always add the umbraco path to the list
-                if (ConfigurationManager.AppSettings.ContainsKey("umbracoPath"))
+                if (ConfigurationManager.AppSettings.ContainsKey("umbracoPath") 
+                    && !ConfigurationManager.AppSettings["umbracoPath"].IsNullOrWhiteSpace())
                 {
                     staticReservedPaths += ConfigurationManager.AppSettings["umbracoPath"].EnsureEndsWith(',');
                 }
diff --git a/src/Umbraco.Tests/GlobalSettingsTests.cs b/src/Umbraco.Tests/GlobalSettingsTests.cs
index 5d57679b61..1298a5e719 100644
--- a/src/Umbraco.Tests/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/GlobalSettingsTests.cs
@@ -23,10 +23,12 @@ namespace Umbraco.Tests
 
 		public override void TearDown()
 		{
+            //reset the app config		
+            ConfigurationManager.AppSettings.Set("umbracoReservedPaths", "");
+            ConfigurationManager.AppSettings.Set("umbracoReservedUrls", "");
+            Umbraco.Core.Configuration.GlobalSettings.ResetCache();
 			base.TearDown();
-			//reset the app config		
-			ConfigurationManager.AppSettings.Set("umbracoReservedPaths", "");
-			ConfigurationManager.AppSettings.Set("umbracoReservedUrls", "");
+			
 		}
 
 		[TestCase("/umbraco/umbraco.aspx")]