Cleanups in E2E test code

Author: SteveSandersonMS

src/Components/test/E2ETest/Tests/RoutingTest.cs

@@ -410,59 +410,54 @@ public void CanNavigateProgrammaticallyWithForceLoad()
         [Fact]
         public void CanNavigateProgrammaticallyValidateNoReplaceHistoryEntry()
         {
-            //This test checks if default navigation does not replace Browser history entries
+            // This test checks if default navigation does not replace Browser history entries
             SetUrlViaPushState("/");
 
             var app = Browser.MountTestComponent<TestRouter>();
             var testSelector = Browser.WaitUntilTestSelectorReady();
 
-            app.FindElement(By.LinkText("TestHistory")).Click();
+            app.FindElement(By.LinkText("Programmatic navigation cases")).Click();
+            Browser.True(() => Browser.Url.EndsWith("/ProgrammaticNavigationCases", StringComparison.Ordinal));
+            Browser.Contains("programmatic navigation", () => app.FindElement(By.Id("test-info")).Text);
 
-            Browser.True(() => Browser.Url.EndsWith("/TestHistory", StringComparison.Ordinal));
-            Browser.Equal("This is the test history page.", () => app.FindElement(By.Id("test-info")).Text);
-
-
-            //We navigate to the /Other page
-            //This will also test our new NavigatTo(string uri) overload (it should not replace the browser history)
+            // We navigate to the /Other page
+            // This will also test our new NavigatTo(string uri) overload (it should not replace the browser history)
             app.FindElement(By.Id("do-other-navigation")).Click();
             Browser.True(() => Browser.Url.EndsWith("/Other", StringComparison.Ordinal));
             AssertHighlightedLinks("Other", "Other with base-relative URL (matches all)");
 
+            // After we press back, we should end up at the "/ProgrammaticNavigationCases" page so we know browser history has not been replaced
+            // If history had been replaced we would have ended up at the "/" page
             Browser.Navigate().Back();
-            //After we press back, we should end up at the "/TestHistory" page so we know browser history has not been replaced
-            //If history would have been replaced we would have ended up at the "/" page
-            Browser.True(() => Browser.Url.EndsWith("/TestHistory", StringComparison.Ordinal));
-            AssertHighlightedLinks("TestHistory");
+            Browser.True(() => Browser.Url.EndsWith("/ProgrammaticNavigationCases", StringComparison.Ordinal));
+            AssertHighlightedLinks("Programmatic navigation cases");
 
-            //For completeness, we will test if the normal NavigateTo(string uri, bool forceLoad) overload will also NOT change the browsers history 
-            //So we basically repeat what we have done above
+            // For completeness, we will test if the normal NavigateTo(string uri, bool forceLoad) overload will also
+            // NOT change the browser's history. So we basically repeat what we have done above.
             app.FindElement(By.Id("do-other-navigation2")).Click();
             Browser.True(() => Browser.Url.EndsWith("/Other", StringComparison.Ordinal));
             AssertHighlightedLinks("Other", "Other with base-relative URL (matches all)");
 
             Browser.Navigate().Back();
-            Browser.True(() => Browser.Url.EndsWith("/TestHistory", StringComparison.Ordinal));
-            AssertHighlightedLinks("TestHistory");
+            Browser.True(() => Browser.Url.EndsWith("/ProgrammaticNavigationCases", StringComparison.Ordinal));
+            AssertHighlightedLinks("Programmatic navigation cases");
 
             // Because this was client-side navigation, we didn't lose the state in the test selector
             Assert.Equal(typeof(TestRouter).FullName, testSelector.SelectedOption.GetAttribute("value"));
 
             app.FindElement(By.Id("do-other-navigation-forced")).Click();
             Browser.True(() => Browser.Url.EndsWith("/Other", StringComparison.Ordinal));
 
-            //We check if we had a force load
+            // We check if we had a force load
             Assert.Throws<StaleElementReferenceException>(() =>
-            {
-                testSelector.SelectedOption.GetAttribute("value");
-            });
+                testSelector.SelectedOption.GetAttribute("value"));
 
-            ////But still we should be able to navigate back, and end up at the "/TestHistory" page
+            // But still we should be able to navigate back, and end up at the "/ProgrammaticNavigationCases" page
             Browser.Navigate().Back();
-            Browser.True(() => Browser.Url.EndsWith("/TestHistory", StringComparison.Ordinal));
+            Browser.True(() => Browser.Url.EndsWith("/ProgrammaticNavigationCases", StringComparison.Ordinal));
             Browser.WaitUntilTestSelectorReady();
         }
 
-
         [Fact]
         public void CanNavigateProgrammaticallyWithReplaceHistoryEntry()
         {
@@ -471,20 +466,18 @@ public void CanNavigateProgrammaticallyWithReplaceHistoryEntry()
             var app = Browser.MountTestComponent<TestRouter>();
             var testSelector = Browser.WaitUntilTestSelectorReady();
 
-            app.FindElement(By.LinkText("TestHistory")).Click();
-
-            Browser.True(() => Browser.Url.EndsWith("/TestHistory", StringComparison.Ordinal));
-            Browser.Equal("This is the test history page.", () => app.FindElement(By.Id("test-info")).Text);
+            app.FindElement(By.LinkText("Programmatic navigation cases")).Click();
+            Browser.True(() => Browser.Url.EndsWith("/ProgrammaticNavigationCases", StringComparison.Ordinal));
+            Browser.Contains("programmatic navigation", () => app.FindElement(By.Id("test-info")).Text);
 
-
-            //We navigate to the /Other page, with replacehistroyentry enabled
+            // We navigate to the /Other page, with "replace" enabled
             app.FindElement(By.Id("do-other-navigation-replacehistoryentry")).Click();
             Browser.True(() => Browser.Url.EndsWith("/Other", StringComparison.Ordinal));
             AssertHighlightedLinks("Other", "Other with base-relative URL (matches all)");
 
+            // After we press back, we should end up at the "/" page so we know browser history has been replaced
+            // If history would not have been replaced we would have ended up at the "/ProgrammaticNavigationCases" page
             Browser.Navigate().Back();
-            //After we press back, we should end up at the "/" page so we know browser history has been replaced
-            //If history would not have been replaced we would have ended up at the "/TestHistory" page
             Browser.True(() => Browser.Url.EndsWith("/", StringComparison.Ordinal));
             AssertHighlightedLinks("Default (matches all)", "Default with base-relative URL (matches all)");
 
@@ -500,29 +493,24 @@ public void CanNavigateProgrammaticallyWithForceLoadAndReplaceHistoryEntry()
             var app = Browser.MountTestComponent<TestRouter>();
             var testSelector = Browser.WaitUntilTestSelectorReady();
 
-            app.FindElement(By.LinkText("TestHistory")).Click();
-
-            Browser.True(() => Browser.Url.EndsWith("/TestHistory", StringComparison.Ordinal));
-            Browser.Equal("This is the test history page.", () => app.FindElement(By.Id("test-info")).Text);
+            app.FindElement(By.LinkText("Programmatic navigation cases")).Click();
+            Browser.True(() => Browser.Url.EndsWith("/ProgrammaticNavigationCases", StringComparison.Ordinal));
+            Browser.Contains("programmatic navigation", () => app.FindElement(By.Id("test-info")).Text);
 
-            //We navigate to the /Other page, with replacehistroyentry and forceload enabled
+            // We navigate to the /Other page, with replacehistroyentry and forceload enabled
             app.FindElement(By.Id("do-other-navigation-forced-replacehistoryentry")).Click();
             Browser.True(() => Browser.Url.EndsWith("/Other", StringComparison.Ordinal));
 
-            //We check if we had a force load
+            // We check if we had a force load
             Assert.Throws<StaleElementReferenceException>(() =>
-            {
-                testSelector.SelectedOption.GetAttribute("value");
-            });
+                testSelector.SelectedOption.GetAttribute("value"));
 
+            // After we press back, we should end up at the "/" page so we know browser history has been replaced
             Browser.Navigate().Back();
-            //After we press back, we should end up at the "/" page so we know browser history has been replaced
             Browser.True(() => Browser.Url.EndsWith("/", StringComparison.Ordinal));
             Browser.WaitUntilTestSelectorReady();
         }
 
-
-
         [Fact]
         public void ClickingAnchorWithNoHrefShouldNotNavigate()
         {

src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor

@@ -16,13 +16,13 @@
     <li><NavLink href="Other" Match=NavLinkMatch.All>Other with base-relative URL (matches all)</NavLink></li>
     <li><NavLink href="/subdir/other?abc=123">Other with query</NavLink></li>
     <li><NavLink href="/subdir/Other#blah">Other with hash</NavLink></li>
-    <li><NavLink href="/subdir/TestHistory">TestHistory</NavLink></li>
     <li><NavLink href="/subdir/WithParameters/name/Abc">With parameters</NavLink></li>
     <li><NavLink href="/subdir/WithParameters/Name/Abc/LastName/McDef">With more parameters</NavLink></li>
     <li><NavLink href="/subdir/LongPage1">Long page 1</NavLink></li>
     <li><NavLink href="/subdir/LongPage2">Long page 2</NavLink></li>
     <li><NavLink href="/subdir/WithLazyAssembly" id="with-lazy-assembly">With lazy assembly</NavLink></li>
     <li><NavLink href="/subdir/WithLazyLoadedRoutes" id="with-lazy-routes">With lazy loaded routes</NavLink></li>
+    <li><NavLink href="/subdir/ProgrammaticNavigationCases">Programmatic navigation cases</NavLink></li>
     <li><NavLink href="PreventDefaultCases">preventDefault cases</NavLink></li>
     <li><a href="/subdir/images/blazor_logo_1000x.png" download>Download Me</a></li>
     <li><NavLink>Null href never matches</NavLink></li>

src/Components/test/testassets/BasicTestApp/RouterTest/ProgrammaticNavigationCases.razor

@@ -0,0 +1,24 @@
+@page "/ProgrammaticNavigationCases"
+@inject NavigationManager NavigationManager
+
+<div id="test-info">This page has test cases for programmatic navigation.</div>
+
+<button id="do-other-navigation" @onclick="@(() => NavigationManager.NavigateTo("Other", new NavigationOptions()))">
+    Programmatic navigation (NavigationOptions overload)
+</button>
+
+<button id="do-other-navigation2" @onclick="@(() => NavigationManager.NavigateTo("Other", false))">
+    Programmatic navigation (bool overload)
+</button>
+
+<button id="do-other-navigation-forced" @onclick="@(() => NavigationManager.NavigateTo("Other", true))">
+    Programmatic navigation with force-load
+</button>
+
+<button id="do-other-navigation-replacehistoryentry" @onclick="@(() => NavigationManager.NavigateTo("Other", replace: true))">
+    Programmatic navigation with replace
+</button>
+
+<button id="do-other-navigation-forced-replacehistoryentry" @onclick="@(() => NavigationManager.NavigateTo("Other", forceLoad: true, replace: true))">
+    Programmatic navigation with force-load and replace
+</button>