fix: Wait for frontend compilation before Flow client init

Waits for frontend compilation before waiting for Flow client initialisation to cover the custom dev bundle compilation case. Fixes #1705
vaadin · Dec 11, 2023 · 7b7b893 · 7b7b893
1 parent 06271bd
commit 7b7b893
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...estbench-shared/src/main/java/com/vaadin/testbench/commands/TestBenchCommandExecutor.java b/...estbench-shared/src/main/java/com/vaadin/testbench/commands/TestBenchCommandExecutor.java
@@ -49,16 +49,16 @@ private static Logger getLogger() {
     private boolean autoScrollIntoView = true;
     // @formatter:off
     String WAIT_FOR_VAADIN_SCRIPT =
-            "if (window.Vaadin && window.Vaadin.Flow && window.Vaadin.Flow.clients) {"
+            "if (window.Vaadin && window.Vaadin.Flow && window.Vaadin.Flow.devServerIsNotLoaded) {"
+            + "  return false;"
+            + "} else if (window.Vaadin && window.Vaadin.Flow && window.Vaadin.Flow.clients) {"
             + "  var clients = window.Vaadin.Flow.clients;"
             + "  for (var client in clients) {"
             + "    if (clients[client].isActive()) {"
             + "      return false;"
             + "    }"
             + "  }"
             + "  return true;"
-            + "} else if (window.Vaadin && window.Vaadin.Flow && window.Vaadin.Flow.devServerIsNotLoaded) {"
-            + "  return false;"
             + "} else {"
             + "  return true;"
             + "}";