Test fixes & split failsafe integration test runs into smaller batches (#12103)

1 files changed, 7 insertions, 1 deletions

diff --git a/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java b/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
index 6f33b5bb6e..607e089d20 100644
--- a/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
@@ -6,6 +6,7 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 
 public class LayoutDuringStateUpdateTest extends SingleBrowserTest {
@@ -13,9 +14,14 @@ public class LayoutDuringStateUpdateTest extends SingleBrowserTest {
     @Test
     public void layoutDuringStateUpdate() {
         openTestURL();
+        waitUntilLoadingIndicatorNotVisible();
 
-        WebElement label = findElement(By.className("gwt-Label"));
+        // add the custom component
+        $(ButtonElement.class).first().click();
+        waitUntilLoadingIndicatorNotVisible();
 
+        // ensure the layouting failed to be triggered during the state update
+        WebElement label = findElement(By.className("gwt-Label"));
         assertEquals("Layout phase count: 1", label.getText());
     }