- led to Travis build failures
This commit is contained in:
Doug Bunting 2015-08-21 11:49:31 -07:00
parent 774219b2ef
commit aaa47d5e0e
3 changed files with 25 additions and 16 deletions

View File

@ -12,14 +12,13 @@ using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Http.Internal;
using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding;
using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Rendering;
using Microsoft.AspNet.Testing.xunit;
using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers;
using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing;
using Microsoft.Framework.Caching; using Microsoft.AspNet.Testing.xunit;
using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.Caching.Memory;
using Microsoft.Framework.WebEncoders.Testing;
using Moq; using Moq;
using Xunit; using Xunit;
using Microsoft.Framework.WebEncoders.Testing;
namespace Microsoft.AspNet.Mvc.TagHelpers namespace Microsoft.AspNet.Mvc.TagHelpers
{ {
@ -28,8 +27,8 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
[Theory] [Theory]
[InlineData(null, "test.jpg", "test.jpg")] [InlineData(null, "test.jpg", "test.jpg")]
[InlineData("abcd.jpg", "test.jpg", "test.jpg")] [InlineData("abcd.jpg", "test.jpg", "test.jpg")]
[InlineData(null, "~/test.jpg", "/virtualRoot/test.jpg")] [InlineData(null, "~/test.jpg", "virtualRoot/test.jpg")]
[InlineData("abcd.jpg", "~/test.jpg", "/virtualRoot/test.jpg")] [InlineData("abcd.jpg", "~/test.jpg", "virtualRoot/test.jpg")]
public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper( public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper(
string src, string src,
string srcOutput, string srcOutput,
@ -52,9 +51,13 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();
var viewContext = MakeViewContext(); var viewContext = MakeViewContext();
var urlHelper = new Mock<IUrlHelper>(); var urlHelper = new Mock<IUrlHelper>();
// Ensure expanded path does not look like an absolute path on Linux, avoiding
// https://github.com/aspnet/External/issues/21
urlHelper urlHelper
.Setup(urlhelper => urlhelper.Content(It.IsAny<string>())) .Setup(urlhelper => urlhelper.Content(It.IsAny<string>()))
.Returns(new Func<string, string>(url => url.Replace("~/", "/virtualRoot/"))); .Returns(new Func<string, string>(url => url.Replace("~/", "virtualRoot/")));
var helper = new ImageTagHelper( var helper = new ImageTagHelper(
hostingEnvironment, hostingEnvironment,
MakeCache(), MakeCache(),

View File

@ -16,10 +16,9 @@ using Microsoft.AspNet.Mvc.TagHelpers.Internal;
using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers;
using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Testing.xunit; using Microsoft.AspNet.Testing.xunit;
using Microsoft.Framework.Caching; using Microsoft.Dnx.Runtime;
using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.Caching.Memory;
using Microsoft.Framework.Logging; using Microsoft.Framework.Logging;
using Microsoft.Dnx.Runtime;
using Microsoft.Framework.WebEncoders.Testing; using Microsoft.Framework.WebEncoders.Testing;
using Moq; using Moq;
using Xunit; using Xunit;
@ -31,8 +30,8 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
[Theory] [Theory]
[InlineData(null, "test.css", "test.css")] [InlineData(null, "test.css", "test.css")]
[InlineData("abcd.css", "test.css", "test.css")] [InlineData("abcd.css", "test.css", "test.css")]
[InlineData(null, "~/test.css", "/virtualRoot/test.css")] [InlineData(null, "~/test.css", "virtualRoot/test.css")]
[InlineData("abcd.css", "~/test.css", "/virtualRoot/test.css")] [InlineData("abcd.css", "~/test.css", "virtualRoot/test.css")]
public void Process_HrefDefaultsToTagHelperOutputHrefAttributeAddedByOtherTagHelper( public void Process_HrefDefaultsToTagHelperOutputHrefAttributeAddedByOtherTagHelper(
string href, string href,
string hrefOutput, string hrefOutput,
@ -56,9 +55,13 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();
var viewContext = MakeViewContext(); var viewContext = MakeViewContext();
var urlHelper = new Mock<IUrlHelper>(); var urlHelper = new Mock<IUrlHelper>();
// Ensure expanded path does not look like an absolute path on Linux, avoiding
// https://github.com/aspnet/External/issues/21
urlHelper urlHelper
.Setup(urlhelper => urlhelper.Content(It.IsAny<string>())) .Setup(urlhelper => urlhelper.Content(It.IsAny<string>()))
.Returns(new Func<string, string>(url => url.Replace("~/", "/virtualRoot/"))); .Returns(new Func<string, string>(url => url.Replace("~/", "virtualRoot/")));
var helper = new LinkTagHelper( var helper = new LinkTagHelper(
logger.Object, logger.Object,
hostingEnvironment, hostingEnvironment,

View File

@ -16,11 +16,10 @@ using Microsoft.AspNet.Mvc.TagHelpers.Internal;
using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Razor.Runtime.TagHelpers;
using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing;
using Microsoft.AspNet.Testing.xunit; using Microsoft.AspNet.Testing.xunit;
using Microsoft.Dnx.Runtime;
using Microsoft.Framework.Caching; using Microsoft.Framework.Caching;
using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.Caching.Memory;
using Microsoft.Framework.Logging; using Microsoft.Framework.Logging;
using Microsoft.Dnx.Runtime;
using Microsoft.Framework.WebEncoders;
using Microsoft.Framework.WebEncoders.Testing; using Microsoft.Framework.WebEncoders.Testing;
using Moq; using Moq;
using Xunit; using Xunit;
@ -32,8 +31,8 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
[Theory] [Theory]
[InlineData(null, "test.js", "test.js")] [InlineData(null, "test.js", "test.js")]
[InlineData("abcd.js", "test.js", "test.js")] [InlineData("abcd.js", "test.js", "test.js")]
[InlineData(null, "~/test.js", "/virtualRoot/test.js")] [InlineData(null, "~/test.js", "virtualRoot/test.js")]
[InlineData("abcd.js", "~/test.js", "/virtualRoot/test.js")] [InlineData("abcd.js", "~/test.js", "virtualRoot/test.js")]
public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper( public void Process_SrcDefaultsToTagHelperOutputSrcAttributeAddedByOtherTagHelper(
string src, string src,
string srcOutput, string srcOutput,
@ -57,9 +56,13 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
var hostingEnvironment = MakeHostingEnvironment(); var hostingEnvironment = MakeHostingEnvironment();
var viewContext = MakeViewContext(); var viewContext = MakeViewContext();
var urlHelper = new Mock<IUrlHelper>(); var urlHelper = new Mock<IUrlHelper>();
// Ensure expanded path does not look like an absolute path on Linux, avoiding
// https://github.com/aspnet/External/issues/21
urlHelper urlHelper
.Setup(urlhelper => urlhelper.Content(It.IsAny<string>())) .Setup(urlhelper => urlhelper.Content(It.IsAny<string>()))
.Returns(new Func<string, string>(url => url.Replace("~/", "/virtualRoot/"))); .Returns(new Func<string, string>(url => url.Replace("~/", "virtualRoot/")));
var helper = new ScriptTagHelper( var helper = new ScriptTagHelper(
logger.Object, logger.Object,
hostingEnvironment, hostingEnvironment,