diff options
8 files changed, 18 insertions, 19 deletions
diff --git a/tests/screenshots b/tests/screenshots -Subproject 23ea335cad670d55f99c9dcf1425e1ebbee534a +Subproject a70c038dcdf9b95d984d5fa7d54acf3f49c4513 diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java index f64095347f..947f339d98 100644 --- a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java @@ -40,7 +40,7 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest { // Chrome version does not necessarily match the desired version // because of auto updates... browserIdentifier = getExpectedUserAgentString( - getDesiredCapabilities()) + "61"; + getDesiredCapabilities()) + "63"; } else { browserIdentifier = getExpectedUserAgentString(desiredCapabilities) + desiredCapabilities.getVersion(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java index 076e808722..2e109aa78b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java @@ -45,14 +45,12 @@ public class JavaScriptPreloadingTest extends MultiBrowserTest { openTestURL(); try { - new WebDriverWait(driver, 10) - .until(ExpectedConditions.alertIsPresent()); + waitUntil(ExpectedConditions.alertIsPresent()); Alert alert = driver.switchTo().alert(); assertEquals("First", alert.getText()); alert.accept(); - new WebDriverWait(driver, 10) - .until(ExpectedConditions.alertIsPresent()); + waitUntil(ExpectedConditions.alertIsPresent()); alert = driver.switchTo().alert(); assertEquals("Second", alert.getText()); alert.accept(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java index 27d8e8c300..f38e942fcd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java @@ -56,9 +56,8 @@ public class UnnecessaryScrollbarWhenZoomingTest extends MultiBrowserTest { zoomSetter.resetZoom(); openTestURL(); // IE sometimes has trouble waiting long enough. - new WebDriverWait(getDriver(), 30) - .until(ExpectedConditions.presenceOfElementLocated( - By.cssSelector(".v-table-body-wrapper"))); + waitUntil(ExpectedConditions.presenceOfElementLocated( + By.cssSelector(".v-table-body-wrapper")), 30); } @Test diff --git a/uitest/src/test/java/com/vaadin/tests/elements/menubar/MenuBarUITest.java b/uitest/src/test/java/com/vaadin/tests/elements/menubar/MenuBarUITest.java index 0fd42421a9..c01832ecdb 100644 --- a/uitest/src/test/java/com/vaadin/tests/elements/menubar/MenuBarUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/elements/menubar/MenuBarUITest.java @@ -31,6 +31,11 @@ import com.vaadin.testbench.elements.MenuBarElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class MenuBarUITest extends MultiBrowserTest { + + @Override + protected boolean requireWindowFocusForIE() { + return true; + } @Before public void init() { 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-", |