huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reacting to globbing changes

This commit is contained in:
Pranav K 2015-08-28 12:41:10 -07:00
parent e8043f92e5
commit a2d58ba4ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Mvc.TagHelpers/Internal/GlobbingUrlBuilder.cs
View File

@ -142,10 +142,10 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal
.OrderBy(path => path, DefaultPathComparer); .OrderBy(path => path, DefaultPathComparer);
} }
private string ResolveMatchedPath(string matchedPath) private string ResolveMatchedPath(FilePatternMatch matchedPath)
{ {
// Resolve the path to site root // Resolve the path to site root
var relativePath = new PathString("/" + matchedPath); var relativePath = new PathString("/" + matchedPath.Path);
return RequestPathBase.Add(relativePath).ToString(); return RequestPathBase.Add(relativePath).ToString();
} }

2
test/Microsoft.AspNet.Mvc.TagHelpers.Test/Internal/GlobbingUrlBuilderTest.cs
View File

@ -520,7 +520,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers.Internal
excludePatterns.Add(pattern); excludePatterns.Add(pattern);
return matcher.Object; return matcher.Object;
}); });
var patternMatchingResult = new PatternMatchingResult(Enumerable.Empty<string>()); var patternMatchingResult = new PatternMatchingResult(Enumerable.Empty<FilePatternMatch>());
matcher.Setup(m => m.Execute(It.IsAny<DirectoryInfoBase>())).Returns(patternMatchingResult); matcher.Setup(m => m.Execute(It.IsAny<DirectoryInfoBase>())).Returns(patternMatchingResult);
return matcher.Object; return matcher.Object;
} }