diff options
Diffstat (limited to 'uitest/src/test/java/com/vaadin/tests/extensions')
3 files changed, 8 insertions, 11 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java index 8ea8da4c1d..b2dc9a554a 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java @@ -47,9 +47,8 @@ public class ResponsiveUITest extends MultiBrowserTest { openTestURL(); // IE sometimes has trouble waiting long enough. - new WebDriverWait(getDriver(), 30) - .until(ExpectedConditions.presenceOfElementLocated( - By.cssSelector(".v-csslayout-grid.first"))); + waitUntil(ExpectedConditions.presenceOfElementLocated( + By.cssSelector(".v-csslayout-grid.first")), 30); assertEquals("401px-600px", $(".v-csslayout-grid.first").getAttribute("width-range")); diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java index 9dc32dff2a..8cab44a915 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java @@ -41,9 +41,8 @@ public class ResponsiveWidthAndHeightTest extends MultiBrowserTest { openTestURL(); // IE sometimes has trouble waiting long enough. - new WebDriverWait(getDriver(), 30) - .until(ExpectedConditions.presenceOfElementLocated( - By.cssSelector(".v-csslayout-width-and-height"))); + waitUntil(ExpectedConditions.presenceOfElementLocated( + By.cssSelector(".v-csslayout-width-and-height")), 30); // Verify both width-range and height-range. assertEquals("600px-", diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java index 85e0167262..43b33199fa 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java @@ -50,13 +50,12 @@ public class SetThemeAndResponsiveLayoutTest extends MultiBrowserTest { public void testWidthAndHeightRanges() throws Exception { openTestURL(); // IE sometimes has trouble waiting long enough. - new WebDriverWait(getDriver(), 30) - .until(ExpectedConditions.presenceOfElementLocated( - By.cssSelector(".v-csslayout-width-and-height"))); + waitUntil(ExpectedConditions.presenceOfElementLocated( + By.cssSelector(".v-csslayout-width-and-height")), 30); // set the theme programmatically $(ButtonElement.class).caption("Set theme").first().click(); - new WebDriverWait(getDriver(), 30).until(ExpectedConditions - .presenceOfElementLocated(By.xpath("//div[@width-range]"))); + waitUntil(ExpectedConditions + .presenceOfElementLocated(By.xpath("//div[@width-range]")), 30); // Verify both width-range and height-range. assertEquals("600px-", |