From 8529ea2f0d4eb1f535a67a67dbd7df05104beaec Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Mon, 29 Dec 2014 15:19:30 -0800 Subject: [PATCH] React to aspnet/Razor#240. - Updated tests to account for new casing. --- .../TextAreaTagHelper.cs | 1 + ...cTagHelpersWebSite.MvcTagHelper_Customer.Index.html | 4 ++-- ...vcTagHelpersWebSite.MvcTagHelper_Home.Customer.html | 4 ++-- .../MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html | 10 +++++----- .../TagHelpersWebSite.Employee.Create.Invalid.html | 8 ++++---- .../Resources/TagHelpersWebSite.Employee.Create.html | 8 ++++---- .../RequestServicesTest.cs | 2 +- .../MvcRazorHostTest.cs | 4 ++-- .../TestFiles/Input/ModelExpressionTagHelper.cshtml | 2 +- .../Output/Runtime/ModelExpressionTagHelper.cs | 6 +++--- .../ActivatorWebSite/Views/View/UseTagHelper.cshtml | 2 +- .../Views/Other/TagHelper.cshtml | 2 +- .../WebSites/TagHelpersWebSite/Views/Home/About.cshtml | 2 +- .../WebSites/TagHelpersWebSite/Views/Home/Index.cshtml | 2 +- 14 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs index 54044bcc0d..059914d02c 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs @@ -11,6 +11,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers /// implementation targeting <textarea> elements with an asp-for attribute. /// [ContentBehavior(ContentBehavior.Replace)] + [HtmlElementName("textarea")] public class TextAreaTagHelper : TagHelper { private const string ForAttributeName = "asp-for"; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html index 22b7b20f68..2e248d7b06 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html @@ -29,8 +29,8 @@
- Male - Female + Male + Female
  • A value is required.
    • diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html index 6ba3d0ffc8..4e69656839 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html @@ -29,8 +29,8 @@
- Male - Female + Male + Female
  • diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html index 8e38335701..f9213ea9b1 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html @@ -18,7 +18,7 @@
- @@ -34,8 +34,8 @@
@@ -63,8 +63,8 @@
- Male - Female + Male + Female
  • diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html index 3ac18fd762..11b09a7ed1 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html @@ -36,7 +36,7 @@
- +
@@ -47,8 +47,8 @@
- Male - Female + Male + Female
@@ -69,7 +69,7 @@
- +
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html index 85f318c70c..c38c8c2075 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html @@ -34,7 +34,7 @@
- +
@@ -45,8 +45,8 @@
- Male - Female + Male + Female
@@ -67,7 +67,7 @@
- +
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RequestServicesTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RequestServicesTest.cs index 8bf7da227e..e52b7ae6fb 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RequestServicesTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RequestServicesTest.cs @@ -65,7 +65,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests var body = (await response.Content.ReadAsStringAsync()).Trim(); - var expected = "" + requestId + ""; + var expected = "" + requestId + ""; Assert.Equal(expected, body); } } diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs index 69593eed9e..d562a524b1 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs @@ -52,9 +52,9 @@ namespace Microsoft.AspNet.Mvc.Razor generatedLineIndex: 25, generatedCharacterIndex: 14, contentLength: 85), - BuildLineMapping(documentAbsoluteIndex: 138, + BuildLineMapping(documentAbsoluteIndex: 139, documentLineIndex: 4, - documentCharacterIndex: 16, + documentCharacterIndex: 17, generatedAbsoluteIndex: 2058, generatedLineIndex: 52, generatedCharacterIndex: 107, diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Input/ModelExpressionTagHelper.cshtml b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Input/ModelExpressionTagHelper.cshtml index 7114a5c211..73751bc204 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Input/ModelExpressionTagHelper.cshtml +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Input/ModelExpressionTagHelper.cshtml @@ -2,4 +2,4 @@ @addtaghelper "Microsoft.AspNet.Mvc.Razor.InputTestTagHelper, Microsoft.AspNet.Mvc.Razor.Host.Test" - \ No newline at end of file + \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs index 52d772d950..a0ad0bf866 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs @@ -1,4 +1,4 @@ -#pragma checksum "TestFiles/Input/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "11088b573392b1db9fe4cac4fff3a9ce68a72c40" +#pragma checksum "TestFiles/Input/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5de24be79bca2d0ce7e180eab7b197442352f137" namespace Asp { using Microsoft.AspNet.Razor.Runtime.TagHelpers; @@ -45,11 +45,11 @@ namespace Asp BeginContext(120, 2, true); WriteLiteral("\r\n"); EndContext(); - __tagHelperExecutionContext = __tagHelperScopeManager.Begin("inputTest", "test"); + __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", "test"); __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper); __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now); - __tagHelperExecutionContext.AddTagHelperAttribute("For", __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For); + __tagHelperExecutionContext.AddTagHelperAttribute("for", __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For); __tagHelperExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelperExecutionContext).Result; WriteLiteral(__tagHelperExecutionContext.Output.GenerateStartTag()); WriteLiteral(__tagHelperExecutionContext.Output.GenerateEndTag()); diff --git a/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml b/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml index f87669fbca..722ea106f8 100644 --- a/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml +++ b/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml @@ -8,6 +8,6 @@ } -
+
test content \ No newline at end of file diff --git a/test/WebSites/RequestServicesWebSite/Views/Other/TagHelper.cshtml b/test/WebSites/RequestServicesWebSite/Views/Other/TagHelper.cshtml index b459fc044f..e1f0dec043 100644 --- a/test/WebSites/RequestServicesWebSite/Views/Other/TagHelper.cshtml +++ b/test/WebSites/RequestServicesWebSite/Views/Other/TagHelper.cshtml @@ -1,3 +1,3 @@ @using RequestServicesWebSite @addtaghelper "RequestServicesWebSite.RequestScopedTagHelper, RequestServicesWebSite" - \ No newline at end of file + \ No newline at end of file diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml b/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml index 93f679a046..4acb9f2028 100644 --- a/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml +++ b/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml @@ -11,7 +11,7 @@

Hello, you've reached the about page.

Information about our website (outdated):

- -

This website has not been approved yet. Visit www.contoso.com for more information.

+

This website has not been approved yet. Visit www.contoso.com for more information.