From 2150820efe05ff63184cfaee438fe7cd4e8893da Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Fri, 16 Mar 2018 16:55:46 +0000
Subject: [PATCH] Implement Blazor.navigateTo for triggering navigation from JS
 code, and use it in E2E tests

---
 .../src/GlobalExports.ts                          |  2 ++
 .../src/Services/UriHelper.ts                     | 15 +++++++++------
 .../Tests/RoutingTest.cs                          |  3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/GlobalExports.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/GlobalExports.ts
index c25ac06b4d..6278b3f893 100644
--- a/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/GlobalExports.ts
+++ b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/GlobalExports.ts
@@ -1,5 +1,6 @@
 import { platform } from './Environment'
 import { registerFunction } from './Interop/RegisteredFunction';
+import { navigateTo } from './Services/UriHelper';
 
 if (typeof window !== 'undefined') {
   // When the library is loaded in a browser via a <script> element, make the
@@ -7,5 +8,6 @@ if (typeof window !== 'undefined') {
   window['Blazor'] = {
     platform,
     registerFunction,
+    navigateTo,
   };
 }
diff --git a/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Services/UriHelper.ts b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Services/UriHelper.ts
index 8e77f1a6b5..4499cddb31 100644
--- a/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Services/UriHelper.ts
+++ b/src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Services/UriHelper.ts
@@ -33,14 +33,17 @@ registerFunction(`${registeredFunctionPrefix}.enableNavigationInteception`, () =
 });
 
 registerFunction(`${registeredFunctionPrefix}.navigateTo`, (uriDotNetString: System_String) => {
-  const href = platform.toJavaScriptString(uriDotNetString);
-  if (isWithinBaseUriSpace(toAbsoluteUri(href))) {
-    performInternalNavigation(href);
-  } else {
-    location.href = href;
-  }
+  navigateTo(platform.toJavaScriptString(uriDotNetString));
 });
 
+export function navigateTo(uri: string) {
+  if (isWithinBaseUriSpace(toAbsoluteUri(uri))) {
+    performInternalNavigation(uri);
+  } else {
+    location.href = uri;
+  }
+}
+
 function performInternalNavigation(href: string) {
   history.pushState(null, /* ignored title */ '', href);
   handleInternalNavigation();
diff --git a/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/RoutingTest.cs b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/RoutingTest.cs
index 9b6cfd1576..272cd9e632 100644
--- a/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/RoutingTest.cs
+++ b/test/Microsoft.AspNetCore.Blazor.E2ETest/Tests/RoutingTest.cs
@@ -20,6 +20,7 @@ namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests
         {
             _server = serverFixture;
             Navigate(ServerPathBase, noReload: true);
+            WaitUntilDotNetRunningInBrowser();
         }
 
         [Fact]
@@ -131,7 +132,7 @@ namespace Microsoft.AspNetCore.Blazor.E2ETest.Tests
         {
             var jsExecutor = (IJavaScriptExecutor)Browser;
             var absoluteUri = new Uri(_server.RootUri, relativeUri);
-            jsExecutor.ExecuteScript($"history.pushState(null, '', '{absoluteUri.ToString()}')");
+            jsExecutor.ExecuteScript($"Blazor.navigateTo('{absoluteUri.ToString()}')");
         }
     }
 }