From d1faff412631e15269d9c8d62ebf823bf82807bd Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 1 Oct 2019 13:42:32 -0700 Subject: [PATCH] Fixup --- .../ComponentWithParametersTest.cs | 15 --------------- .../Pages/ComponentWithParameters.cshtml | 8 ++++---- .../TestServer/Pages/MultipleComponents.cshtml | 6 +++--- src/Mvc/Mvc.TagHelpers/src/ComponentTagHelper.cs | 4 ++-- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs index 858c68f069..87ed133449 100644 --- a/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs +++ b/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs @@ -26,21 +26,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests { } - public DateTime LastLogTimeStamp { get; set; } = DateTime.MinValue; - - public override async Task InitializeAsync() - { - await base.InitializeAsync(); - - // Capture the last log timestamp so that we can filter logs when we - // check for duplicate connections. - var lastLog = Browser.Manage().Logs.GetLog(LogType.Browser).LastOrDefault(); - if (lastLog != null) - { - LastLogTimeStamp = lastLog.Timestamp; - } - } - [Fact] public void PassingParametersToComponentsWorks() { diff --git a/src/Components/test/testassets/TestServer/Pages/ComponentWithParameters.cshtml b/src/Components/test/testassets/TestServer/Pages/ComponentWithParameters.cshtml index b182ce21e9..3d630a05fd 100644 --- a/src/Components/test/testassets/TestServer/Pages/ComponentWithParameters.cshtml +++ b/src/Components/test/testassets/TestServer/Pages/ComponentWithParameters.cshtml @@ -2,10 +2,10 @@ + param-Param1="ComponentWithParameters.TestModelValues" + param-Param2="ComponentWithParameters.DerivedModelValue" + param-key1="QueryValue" + param-key2="43" /> @* So that E2E tests can make assertions about both the prerendered and diff --git a/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml b/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml index a42238a5c9..47c7677829 100644 --- a/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml +++ b/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml @@ -12,7 +12,7 @@
- +

Some content before

@@ -28,8 +28,8 @@
- - + +
diff --git a/src/Mvc/Mvc.TagHelpers/src/ComponentTagHelper.cs b/src/Mvc/Mvc.TagHelpers/src/ComponentTagHelper.cs index be05af7bad..7015c687e4 100644 --- a/src/Mvc/Mvc.TagHelpers/src/ComponentTagHelper.cs +++ b/src/Mvc/Mvc.TagHelpers/src/ComponentTagHelper.cs @@ -17,8 +17,8 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers [HtmlTargetElement("component", Attributes = ComponentTypeName, TagStructure = TagStructure.WithoutEndTag)] public class ComponentTagHelper : TagHelper { - private const string ComponentParameterName = "parameters"; - private const string ComponentParameterPrefix = "parameter-"; + private const string ComponentParameterName = "params"; + private const string ComponentParameterPrefix = "param-"; private const string ComponentTypeName = "type"; private const string RenderModeName = "render-mode"; private IDictionary _parameters;