#568 don't add leading slash

tmenier · Nov 28, 2020 · 1185099 · 1185099
1 parent 9ce73ec
commit 1185099
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Test/Flurl.Test/UrlBuilder/UrlBuildingTests.cs b/Test/Flurl.Test/UrlBuilder/UrlBuildingTests.cs
@@ -176,10 +176,14 @@ public class UrlBuildingTests
 			return "http://www.mysite.com?y=2".SetQueryParams(new { x = 1, y = (string)null, z = "foo" }, nullValueHandling).ToString();
 		}
 
-		[Test]
-		public void can_append_path_segment() {
-			var url = "http://www.mysite.com".AppendPathSegment("endpoint");
-			Assert.AreEqual("http://www.mysite.com/endpoint", url.ToString());
+		[TestCase("http://www.mysite.com", "endpoint", "http://www.mysite.com/endpoint")]
+		[TestCase("path1", "path2", "path1/path2")] // #568
+		[TestCase("/path1/path2", "path3", "/path1/path2/path3")]
+		public void can_append_path_segment(string original, string segment, string result) {
+			Assert.AreEqual(result, original.AppendPathSegment(segment).ToString());
+			Assert.AreEqual(result, original.AppendPathSegment("/" + segment).ToString());
+			Assert.AreEqual(result, (original + "/").AppendPathSegment(segment).ToString());
+			Assert.AreEqual(result, (original + "/").AppendPathSegment("/" + segment).ToString());
 		}
 
 		[Test]

diff --git a/src/Flurl/Url.cs b/src/Flurl/Url.cs
@@ -265,7 +265,7 @@ public class Url
 				_trailingSlash = subpath.OrdinalEndsWith("/");
 			}
 
-			_leadingSlash = true;
+			_leadingSlash |= !IsRelative;
 			return this;
 		}