diff options
Diffstat (limited to 'uitest/src')
10 files changed, 30 insertions, 9 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java index 5fd3ddbdc4..795c971775 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java @@ -29,7 +29,12 @@ public class ContextMenuSize extends AbstractReindeerTestUI { public Action[] getActions(Object target, Object sender) { return new Action[] { new Action("action1"), new Action("action2"), new Action("action3"), - new Action("action4") }; + new Action("action4"), new Action("action5"), + new Action("action6"), new Action("action7"), + new Action("action8"), new Action("action9"), + new Action("action10"), new Action("action11"), + new Action("action12"), new Action("action13"), + new Action("action14") }; } }); BeanItemContainer<Bean> container = new BeanItemContainer<>(Bean.class); diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java index 0bfbf90953..c33e36d8a4 100644 --- a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java @@ -25,7 +25,7 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest { // Chrome version does not necessarily match the desired version // because of auto updates... browserIdentifier = getExpectedUserAgentString( - getDesiredCapabilities()) + "68"; + getDesiredCapabilities()) + "69"; } else if (BrowserUtil.isFirefox(getDesiredCapabilities())) { browserIdentifier = getExpectedUserAgentString( getDesiredCapabilities()) + "58"; diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateTimeFieldStatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateTimeFieldStatesTest.java index fda31a3928..3f14123139 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateTimeFieldStatesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateTimeFieldStatesTest.java @@ -16,12 +16,7 @@ public class PopupDateTimeFieldStatesTest extends MultiBrowserTest { throws IOException, InterruptedException { openTestURL(); - // wait until loading indicator becomes invisible - WebElement loadingIndicator = findElement( - By.className("v-loading-indicator")); - Pattern pattern = Pattern.compile("display: *none;"); - waitUntil(driver -> pattern - .matcher(loadingIndicator.getAttribute("style")).find()); + waitUntilLoadingIndicatorNotVisible(); compareScreen("dateFieldStates"); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java index 9d04032930..e508a247e8 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java @@ -9,7 +9,7 @@ public class MinimalWidthColumnsTest extends MultiBrowserTest { @Test public void testFor1pxDifference() throws Exception { openTestURL(); - sleep(500); + waitUntilLoadingIndicatorNotVisible(); compareScreen("onepixdifference"); } diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java index a9bff793da..d0ba8f2e14 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java @@ -35,10 +35,12 @@ public class BasicCrudGridEditorRowTest extends MultiBrowserTest { @Test public void lookAndFeel() throws Exception { GridCellElement ritaBirthdate = grid.getCell(2, 3); + waitUntilLoadingIndicatorNotVisible(); compareScreen("grid"); // Open editor row new Actions(getDriver()).doubleClick(ritaBirthdate).perform(); + sleep(200); compareScreen("editorrow"); } diff --git a/uitest/src/test/java/com/vaadin/tests/fonticon/VaadinIconSetTest.java b/uitest/src/test/java/com/vaadin/tests/fonticon/VaadinIconSetTest.java index c55bf80a5f..d0d5ea1d8e 100644 --- a/uitest/src/test/java/com/vaadin/tests/fonticon/VaadinIconSetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fonticon/VaadinIconSetTest.java @@ -16,12 +16,15 @@ public class VaadinIconSetTest extends MultiBrowserTest { @Test public void checkScreenshot_initial() throws IOException { openTestURL(); + waitUntilLoadingIndicatorNotVisible(); + compareScreen("allVaadinIcons"); } @Test public void checkScreenshot_changeIcon() throws IOException { openTestURL(); + waitUntilLoadingIndicatorNotVisible(); $(ButtonElement.class).first().click(); @@ -31,6 +34,8 @@ public class VaadinIconSetTest extends MultiBrowserTest { @Test public void comboBoxItemIconsOnKeyboardNavigation() throws Exception { openTestURL(); + waitUntilLoadingIndicatorNotVisible(); + ComboBoxElement comboBox = $(ComboBoxElement.class).first(); // No initial value. diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java index e4590dff24..34a2f38b79 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java @@ -12,6 +12,7 @@ public class GridDisabledTest extends MultiBrowserTest { @Test public void disabledGrid() throws IOException { openTestURL(); + waitUntilLoadingIndicatorNotVisible(); $(ButtonElement.class).caption("Disable").first().click(); diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java index 04ba10b9f4..074d72f4f9 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java @@ -39,6 +39,7 @@ public class ResponsiveStylesTest extends MultiBrowserTest { @Test public void testValoMenuResponsiveParentSize() throws Exception { openTestURL(); + waitUntilLoadingIndicatorNotVisible(); List<WebElement> menus = findElements( com.vaadin.testbench.By.className(MENU_STYLENAME)); @@ -50,6 +51,7 @@ public class ResponsiveStylesTest extends MultiBrowserTest { WebElement wideMenu = menus.get(WIDE_ELEMENT_INDEX); int wideWidth = wideMenu.getSize().width; assertThat(wideWidth, equalTo(WIDE_WIDTH)); + sleep(200); compareScreen("defaultMenuWidths"); } @@ -62,6 +64,7 @@ public class ResponsiveStylesTest extends MultiBrowserTest { @Test public void testValoMenuResponsiveHover() throws Exception { openTestURL(COLLAPSED_MENU_TEST_PARAM); + waitUntilLoadingIndicatorNotVisible(); // Make sure mouse is not hovering the menu new Actions(getDriver()).moveToElement($(LabelElement.class).first()) @@ -78,6 +81,7 @@ public class ResponsiveStylesTest extends MultiBrowserTest { Actions actions = new Actions(getDriver()); actions.moveToElement(toggle); actions.perform(); + sleep(200); compareScreen("expandedMenu"); } diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java index 0efb4933b0..9fe927e84c 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java @@ -17,6 +17,7 @@ public class TableSortIndicatorTest extends MultiBrowserTest { @Test public void ascendingIndicatorIsShown() throws IOException { openTestURL(); + waitUntilLoadingIndicatorNotVisible(); clickOnCellHeader(); @@ -26,6 +27,7 @@ public class TableSortIndicatorTest extends MultiBrowserTest { @Test public void descendingIndicatorIsShown() throws IOException { openTestURL(); + waitUntilLoadingIndicatorNotVisible(); clickOnCellHeader(); clickOnSortIndicator(); diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java index 6ab6f94aae..4ed665fbc2 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java @@ -151,6 +151,7 @@ public class ValoThemeUITest extends MultiBrowserTest { public void tabs() throws Exception { openTestURL("test"); open("Tabs <span class=\"valo-menu-badge\">123</span>", "Tabs"); + sleep(200); compareScreen("tabs"); } @@ -162,6 +163,7 @@ public class ValoThemeUITest extends MultiBrowserTest { check("Closable"); check("Disable tabs"); check("Overflow"); + sleep(200); compareScreen("tabs-closable-disabled"); } @@ -173,6 +175,7 @@ public class ValoThemeUITest extends MultiBrowserTest { // Framed option is checked by default so we are actually unchecking check("Framed"); check("Overflow"); + sleep(200); compareScreen("tabs-closable-unframed"); } @@ -181,6 +184,7 @@ public class ValoThemeUITest extends MultiBrowserTest { openTestURL("test"); open("Tabs <span class=\"valo-menu-badge\">123</span>", "Tabs"); check("Right-aligned tabs"); + sleep(200); compareScreen("tabs-align-right"); } @@ -196,6 +200,7 @@ public class ValoThemeUITest extends MultiBrowserTest { openTestURL("test"); open("Tabs <span class=\"valo-menu-badge\">123</span>", "Tabs"); check("Centered tabs"); + sleep(200); compareScreen("tabs-align-center"); } @@ -204,6 +209,7 @@ public class ValoThemeUITest extends MultiBrowserTest { openTestURL("test"); open("Tabs <span class=\"valo-menu-badge\">123</span>", "Tabs"); check("Icons on top"); + sleep(200); compareScreen("tabs-icons-on-top"); } @@ -214,6 +220,7 @@ public class ValoThemeUITest extends MultiBrowserTest { check("Equal-width tabs"); check("Padded tabbar"); check("Compact"); + compareScreen("tabs-equal-compact-padded"); } |