Cleanups

Author: javiercn

src/Components/Web.JS/dist/Release/blazor.server.js

@@ -55,7 +55,8 @@ void AssertState(string username)
 
         private void PerformReconnection()
         {
-            ((IJavaScriptExecutor)Browser).ExecuteScript($"fetch('/WebSockets/Interrupt?WebSockets.Identifier={SessionIdentifier}')");
+            Browser.ExecuteAsyncScript($"fetch('/WebSockets/Interrupt?WebSockets.Identifier={SessionIdentifier}').then(r => window['WebSockets.{SessionIdentifier}'] = r.ok)");
+            Browser.HasJavaScriptValue(true, $"window['WebSockets.{SessionIdentifier}']", (r) => r != null);
 
             // Wait until the reconnection dialog has been shown but is now hidden
             new WebDriverWait(Browser, TimeSpan.FromSeconds(10))

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

@@ -97,8 +97,8 @@ public void RendersContinueAfterReconnect()
         private void Disconnect()
         {
             var javascript = (IJavaScriptExecutor)Browser;
-            Browser.ExecuteScript($"fetch('/WebSockets/Interrupt?WebSockets.Identifier={SessionIdentifier}').then(r => window['WebSockets.{SessionIdentifier}'] = r.ok)");
-            Assert.True(Browser.HasJavaScriptValue($"window['WebSockets.{ SessionIdentifier}']", (r) => r != null));
+            Browser.ExecuteAsyncScript($"fetch('/WebSockets/Interrupt?WebSockets.Identifier={SessionIdentifier}').then(r => window['WebSockets.{SessionIdentifier}'] = r.ok)");
+            Browser.HasJavaScriptValue(true, $"window['WebSockets.{SessionIdentifier}']", (r) => r != null);
         }
 
         private IWebElement WaitUntilReconnectionDialogExists()

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

@@ -4,7 +4,7 @@
 <h1>Reconnect component</h1>
 
 <p>
-    This component demonstrates reconnection capabilities for blazor server-side. The ticker starts ticking for a,
+    This component demonstrates reconnection capabilities for blazor server-side. The ticker starts ticking for a
     few seconds. Then the application reconnects and the renders resume updating the ticker value. (The renders happened
     while the circuit was disconnected).
 </p>

src/Components/test/testassets/BasicTestApp/ReconnectTicker.razor

@@ -36,19 +36,43 @@ public static void ExecuteScript(this IWebDriver driver, string script)
             }
         }
 
-        public static T HasJavaScriptValue<T>(
+        public static void ExecuteAsyncScript(this IWebDriver driver, string script)
+        {
+            if (!(driver is IJavaScriptExecutor javaScript))
+            {
+                Assert.False(true, "The driver can't execute JavaScript.");
+                return;
+            }
+            else
+            {
+                var scriptWithCallback = $"const cb = arguments[arguments.length - 1];{script}.then(cb, cb)";
+                javaScript.ExecuteAsyncScript(scriptWithCallback);
+            }
+        }
+        public static void HasJavaScriptValue<T>(
             this IWebDriver driver,
-            string script, Func<object,T> converter = null)
+            T expectedValue,
+            string script,
+            Func<object, T> converter = null)
         {
+            if(!script.StartsWith("return "))
+            {
+                script = $"return {script}";
+            }
+
             converter ??= (v) => (T)v;
-            if(!(driver is IJavaScriptExecutor javaScript))
+            if (!(driver is IJavaScriptExecutor javaScript))
             {
                 Assert.False(true, "The driver can't execute JavaScript.");
-                return default;
             }
             else
             {
-                return WaitAssertCore(driver, () => converter(javaScript.ExecuteScript(script)));
+                driver.True(() =>
+                {
+                    var result = javaScript.ExecuteScript(script);
+                    T convertedResult = converter(result);
+                    return expectedValue.Equals(convertedResult);
+                });
             }
         }
 
@@ -74,26 +98,20 @@ public static void Exists(this IWebDriver driver, By finder)
             => WaitAssertCore(driver, () => Assert.NotEmpty(driver.FindElements(finder)));
 
         private static void WaitAssertCore(IWebDriver driver, Action assertion, TimeSpan timeout = default)
-        {
-            _ = WaitAssertCore<object>(driver, () => assertion, timeout);
-        }
-
-        private static T WaitAssertCore<T>(IWebDriver driver, Func<T> assertion, TimeSpan timeout = default)
         {
             if (timeout == default)
             {
                 timeout = DefaultTimeout;
             }
 
             Exception lastException = null;
-            T result = default;
             try
             {
                 new WebDriverWait(driver, timeout).Until(_ =>
                 {
                     try
                     {
-                        result = assertion();
+                        assertion();
                         return true;
                     }
                     catch (Exception e)
@@ -115,8 +133,6 @@ private static T WaitAssertCore<T>(IWebDriver driver, Func<T> assertion, TimeSpa
                     assertion();
                 }
             }
-
-            return result;
         }
     }
 }