diff --git a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/ComplexDialogShortcutIT.java b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/ComplexDialogShortcutIT.java index e90fffabeca..2f3d6969649 100644 --- a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/ComplexDialogShortcutIT.java +++ b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/ComplexDialogShortcutIT.java @@ -1,12 +1,10 @@ package com.vaadin.flow.uitest.ui; -import org.junit.Ignore; import org.junit.Test; import org.openqa.selenium.By; import static com.vaadin.flow.uitest.ui.DialogShortcutView.REUSABLE_DIALOG_ID; -@Ignore("Flaky test #10481, #10487, #10491") public class ComplexDialogShortcutIT extends DialogShortcutIT { @Test diff --git a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/DialogShortcutIT.java b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/DialogShortcutIT.java index 962d0b38430..a53b73d29f0 100644 --- a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/DialogShortcutIT.java +++ b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/DialogShortcutIT.java @@ -9,14 +9,12 @@ import com.vaadin.testbench.TestBenchElement; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import static com.vaadin.flow.uitest.ui.DialogShortcutView.REUSABLE_DIALOG_ID; -@Ignore("Flaky test #10481, #10487, #10491") public class DialogShortcutIT extends ChromeBrowserTest { private TestBenchElement eventLog; @@ -201,8 +199,8 @@ protected void validateLatestShortcutEvent(int eventCounter, private void validateShortcutEvent(int indexFromTop, int eventCounter, String eventSourceId) { - final WebElement latestEvent = eventLog.findElements(By.tagName("div")) - .get(indexFromTop); + final WebElement latestEvent = waitUntil(driver -> eventLog.findElement( + By.xpath(String.format("div[%d]", indexFromTop + 1)))); Assert.assertEquals( "Invalid latest event with " + indexFromTop + ":" + ":" + eventSourceId,