Improve tests

Author: javiercn

src/Components/test/E2ETest/ServerExecutionTests/ServerResumeTests.cs

@@ -37,9 +37,26 @@ public void CanResumeCircuitAfterDisconnection()
         Browser.Exists(By.Id("increment-persistent-counter-count")).Click();
 
         Browser.Equal("1", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
-        var previousText = Browser.Exists(By.Id("persistent-counter-render")).Text;
         var javascript = (IJavaScriptExecutor)Browser;
         javascript.ExecuteScript("window.replaceReconnectCallback()");
+
+        TriggerReconnectAndInteract(javascript);
+
+        // Can dispatch events after reconnect
+        Browser.Equal("2", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+
+        javascript.ExecuteScript("resetReconnect()");
+
+        TriggerReconnectAndInteract(javascript);
+
+        // Ensure that reconnection events are repeatable
+        Browser.Equal("3", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
+    }
+
+    private void TriggerReconnectAndInteract(IJavaScriptExecutor javascript)
+    {
+        var previousText = Browser.Exists(By.Id("persistent-counter-render")).Text;
+
         javascript.ExecuteScript("Blazor._internal.forceCloseConnection()");
         Browser.Equal("block", () => Browser.Exists(By.Id("components-reconnect-modal")).GetCssValue("display"));
 
@@ -52,8 +69,5 @@ public void CanResumeCircuitAfterDisconnection()
         Assert.NotEqual(previousText, newText);
 
         Browser.Exists(By.Id("increment-persistent-counter-count")).Click();
-
-        // Can dispatch events after reconnect
-        Browser.Equal("2", () => Browser.Exists(By.Id("persistent-counter-count")).Text);
     }
 }

src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor

@@ -15,17 +15,22 @@
     <script>
         const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
 
-        let reconnectResolver = undefined;
-        const reconnectPromise = new Promise((resolve) => {
-            reconnectResolver = resolve;
-        });
+        let pwr = Promise.withResolvers();
+        let reconnectPromise = pwr.promise;
+        let reconnectResolver = pwr.resolve;
 
         function triggerReconnect() {
             if(reconnectResolver) {
                 reconnectResolver();
             }
         }
 
+        function resetReconnect() {
+            pwr = Promise.withResolvers();
+            reconnectPromise = pwr.promise;
+            reconnectResolver = pwr.resolve;
+        }
+
         function replaceReconnectCallback() {
             const originalCallback = Blazor.defaultReconnectionHandler._reconnectCallback;
             Blazor.defaultReconnectionHandler._reconnectCallback = async () => {