[Fixes #2862] asp-append-version now works with urls containing fragment

aspnet · Jul 29, 2015 · f21bf92 · f21bf92
1 parent 260ac29
commit f21bf92
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/Internal/FileVersionProvider.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/Internal/FileVersionProvider.cs
@@ -49,10 +49,10 @@ public string AddFileVersionToPath([NotNull] string path)
         {
             var resolvedPath = path;
 
-            var queryStringStartIndex = path.IndexOf('?');
-            if (queryStringStartIndex != -1)
+            var queryStringOrFragmentStartIndex = path.IndexOfAny(new char[] { '?', '#' });
+            if (queryStringOrFragmentStartIndex != -1)
             {
-                resolvedPath = path.Substring(0, queryStringStartIndex);
+                resolvedPath = path.Substring(0, queryStringOrFragmentStartIndex);
             }
 
             Uri uri;

diff --git a/...c.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html b/...c.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
@@ -26,6 +26,9 @@ <h2>Image Tag Helper Test</h2>
     <!-- Plain image tag with file version and path containing query string -->
     <img alt="Path with query string" src="/images/red.png?abc=def&amp;v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk" />
 
+    <!-- Plain image tag with file version and path containing fragment -->
+    <img alt="Path with query string" src="/images/red.png?v=W2F5D366_nQ2fQqUk3URdgWy2ZekXjHzHJaY5yaiOOk#abc" />
+
     <!-- Plain image tag with file version and path linking to some action -->
     <img alt="Path linking to some action" src="/controller/action" />
 </body>

diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
@@ -33,7 +33,7 @@ public void PreservesOrderOfSourceAttributesWhenRun()
                 attributes: new TagHelperAttributeList
                 {
                     { "alt", new HtmlString("alt text") },
-                    { "data-extra", new HtmlString("something") },                    
+                    { "data-extra", new HtmlString("something") },
                     { "title", new HtmlString("Image title") },
                     { "src", "testimage.png" },
                     { "asp-append-version", "true" }
@@ -42,7 +42,7 @@ public void PreservesOrderOfSourceAttributesWhenRun()
                 attributes: new TagHelperAttributeList
                 {
                     { "alt", new HtmlString("alt text") },
-                    { "data-extra", new HtmlString("something") },                    
+                    { "data-extra", new HtmlString("something") },
                     { "title", new HtmlString("Image title") },
                 });
 
@@ -68,10 +68,10 @@ public void PreservesOrderOfSourceAttributesWhenRun()
             // Act
             helper.Process(context, output);
 
-            // Assert            
+            // Assert
             Assert.Equal(expectedOutput.TagName, output.TagName);
             Assert.Equal(4, output.Attributes.Count);
-            
+
             for(int i=0; i < expectedOutput.Attributes.Count; i++)
             {
                 var expectedAtribute = expectedOutput.Attributes[i];

diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/Internal/FileVersionProviderTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/Internal/FileVersionProviderTest.cs
@@ -23,6 +23,8 @@ public class FileVersionProviderTest
         [InlineData("/hello/world", "/hello/world?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk")]
         [InlineData("/hello/world?q=test", "/hello/world?q=test&v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk")]
         [InlineData("/hello/world?q=foo&bar", "/hello/world?q=foo&bar&v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk")]
+        [InlineData("/hello/world?q=foo&bar#abc", "/hello/world?q=foo&bar&v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk#abc")]
+        [InlineData("/hello/world#somefragment", "/hello/world?v=f4OxZX_x_FO5LcGBSKHWXfwtSx-j1ncoSt3SABJtkGk#somefragment")]
         public void AddsVersionToFiles_WhenCacheIsAbsent(string filePath, string expected)
         {
             // Arrange

diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
@@ -28,6 +28,9 @@
     <!-- Plain image tag with file version and path containing query string -->
     <img src="~/images/red.png?abc=def" alt="Path with query string" asp-append-version="true" />
 
+    <!-- Plain image tag with file version and path containing fragment -->
+    <img src="~/images/red.png#abc" alt="Path with query string" asp-append-version="true" />
+
     <!-- Plain image tag with file version and path linking to some action -->
     <img src="/controller/action" alt="Path linking to some action" asp-append-version="true" />
 </body>