make our impl more compatible

rbri · rbri · commit 32da9234c60d · 2025-10-10T11:53:21.000+02:00
diff --git a/src/main/java/org/openqa/selenium/htmlunit/AsyncScriptExecutor.java b/src/main/java/org/openqa/selenium/htmlunit/AsyncScriptExecutor.java
@@ -25,6 +25,7 @@
 import org.htmlunit.corejs.javascript.Function;
 import org.htmlunit.corejs.javascript.NativeJavaObject;
 import org.htmlunit.html.HtmlPage;
+import org.openqa.selenium.JavascriptException;
 import org.openqa.selenium.ScriptTimeoutException;
 import org.openqa.selenium.UnhandledAlertException;
 import org.openqa.selenium.WebDriverException;
@@ -186,7 +187,7 @@ Object waitForResult(final long timeoutMillis) throws InterruptedException {
             }
 
             if (unloadDetected_) {
-                throw new WebDriverException(
+                throw new JavascriptException(
                         "Detected a page unload event; executeAsyncScript does not work across page loads");
             }
             return value_;
diff --git a/src/test/java/org/openqa/selenium/htmlunit/ExecutingAsyncJavascriptTest.java b/src/test/java/org/openqa/selenium/htmlunit/ExecutingAsyncJavascriptTest.java
@@ -21,10 +21,12 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.htmlunit.corejs.javascript.JavaScriptException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
+import org.openqa.selenium.JavascriptException;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.ScriptTimeoutException;
 import org.openqa.selenium.WebDriver;
@@ -202,13 +204,27 @@ public void shouldDetectPageLoadsWhileWaitingOnAnAsyncScriptAndReturnAnError() t
         getMockWebConnection().setResponse(URL_SECOND, "<html><body></body></html>");
 
         final WebDriver driver = loadPage2("<html><body></body></html>");
-        driver.manage().timeouts().scriptTimeout(Duration.ofMillis(100));
+        // driver.manage().timeouts().scriptTimeout(Duration.ofMillis(100));
 
         final JavascriptExecutor executor = (JavascriptExecutor) driver;
-        // TODO real FF creates JavascriptException
+        // TODO real FF creates JavascriptException, Chrome/Edge ScriptTimeoutException
+        /*
         Assert.assertThrows(
                 ScriptTimeoutException.class,
                 () -> executor.executeAsyncScript("window.location = '" + URL_SECOND + "';"));
+        */
+        final Throwable t = Assert.assertThrows(
+                Throwable.class,
+                () -> executor.executeAsyncScript("window.location = '" + URL_SECOND + "';"));
+
+        assertTrue(t instanceof ScriptTimeoutException || t instanceof JavascriptException);
+
+        if (t instanceof ScriptTimeoutException) {
+            assertTrue(t.getMessage().startsWith("script timeout"));
+        }
+        else if (t instanceof JavaScriptException) {
+            assertEquals("Document was unloaded", t.getMessage());
+        }
     }
 
     @Test
@@ -261,7 +277,7 @@ public void shouldCatchErrorsWithMessageAndStacktraceWhenExecutingInitialScript(
         assertTrue(ex.getMessage().contains("errormessage"));
 
         final Throwable rootCause = ex.getCause();
-        assertTrue(result instanceof Throwable);
+        assertTrue(rootCause instanceof Throwable);
         // does not work with real browsers because root cause is null
         assertTrue(rootCause.getMessage().contains("errormessage"));
 
