Change ParentDirectory extension method to handle a case with the giv…

…en path ends with a directory separator character
DarthFubuMVC · Feb 22, 2013 · 402657f · 402657f
1 parent 268516c
commit 402657f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/FubuCore.Testing/StringExtensionsTester.cs b/src/FubuCore.Testing/StringExtensionsTester.cs
@@ -23,6 +23,13 @@ public void parent_directory()
             path.ParentDirectory().ShouldEqual(Path.GetDirectoryName(path));
         }
 
+        [Test]
+        public void parent_directory_ending_with_directory_seperator()
+        {
+            var path = ".".ToFullPath();
+            (path + Path.DirectorySeparatorChar).ParentDirectory().ShouldEqual(Path.GetDirectoryName(path));
+        }
+
         [Test]
         public void if_not_null_positive()
         {
@@ -47,7 +54,7 @@ public void if_not_null_negative()
         [Test]
         public void combine_to_path_when_rooted()
         {
-			var rooted = Path.Combine(Path.GetPathRoot(AppDomain.CurrentDomain.BaseDirectory), "here");
+            var rooted = Path.Combine(Path.GetPathRoot(AppDomain.CurrentDomain.BaseDirectory), "here");
             rooted.CombineToPath("there").ShouldEqual(rooted);
         }
 

diff --git a/src/FubuCore/StringExtensions.cs b/src/FubuCore/StringExtensions.cs
@@ -47,7 +47,7 @@ public static string ToFullPath(this string path)
         /// <returns></returns>
         public static string ParentDirectory(this string path)
         {
-            return Path.GetDirectoryName(path);
+            return Path.GetDirectoryName(path.TrimEnd(Path.DirectorySeparatorChar));
         }
 
         /// <summary>