diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTagHelpersTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTagHelpersTest.cs index c30f19a55e..9071f5d29d 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTagHelpersTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTagHelpersTest.cs @@ -228,30 +228,6 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests Assert.Equal(expected2, response2.Trim()); } - [Fact] - public async Task CacheTagHelper_Activated_BasedOnEnabledParameter() - { - // Arrange - var server = TestHelper.CreateServer(_app, SiteName, _configureServices); - var client = server.CreateClient(); - client.BaseAddress = new Uri("http://localhost"); - - // Act - // This is cached for 1s. - var response1 = await client.GetStringAsync("/catalog/31"); - var response2 = await client.GetStringAsync("/catalog/32"); - - // This request is made before the cache expires with enabled set to false. - client.DefaultRequestHeaders.Remove("IsCacheEnabled"); - client.DefaultRequestHeaders.Add("IsCacheEnabled", "false"); - var response3 = await client.GetStringAsync("/catalog/156"); - - // Assert - Assert.Equal("Cached content for 31", response1.Trim()); - Assert.Equal("Cached content for 31", response2.Trim()); - Assert.Equal("Cached content for 156", response3.Trim()); - } - [Fact] public async Task CacheTagHelper_UsesVaryByCookie_ToVaryContent() { diff --git a/test/WebSites/MvcTagHelpersWebSite/Controllers/Catalog_CacheTagHelperController.cs b/test/WebSites/MvcTagHelpersWebSite/Controllers/Catalog_CacheTagHelperController.cs index 85001aafb9..7891999779 100644 --- a/test/WebSites/MvcTagHelpersWebSite/Controllers/Catalog_CacheTagHelperController.cs +++ b/test/WebSites/MvcTagHelpersWebSite/Controllers/Catalog_CacheTagHelperController.cs @@ -23,15 +23,8 @@ namespace MvcTagHelpersWebSite.Controllers } [HttpGet("/catalog/{id:int}")] - public ViewResult Details(int id, [FromHeader] string isCacheEnabled) + public ViewResult Details(int id) { - bool cacheEnabledHeader = true; - if (!string.IsNullOrEmpty(isCacheEnabled)) - { - bool.TryParse(isCacheEnabled, out cacheEnabledHeader); - } - - ViewBag.IsCacheEnabled = cacheEnabledHeader; ViewData["ProductId"] = id; return View(); } diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Details.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Details.cshtml index 8ddafaac41..2cd777074f 100644 --- a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Details.cshtml +++ b/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Details.cshtml @@ -1,4 +1,4 @@ @using Microsoft.Framework.Caching.Memory - + Cached content for @ViewBag.ProductId