diff options
author | Anna Koskinen <Ansku@users.noreply.github.com> | 2021-04-27 13:32:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-27 13:32:16 +0300 |
commit | 83ee08eae1a9997298713a6302dc929cc98dedfc (patch) | |
tree | bd3d6f580625bd3d7158b9be9378578a588d8551 /uitest/src/test/java/com/vaadin/tests | |
parent | 24aeb4586625310306c6ded6c5d75df56388c1e7 (diff) | |
download | vaadin-framework-83ee08eae1a9997298713a6302dc929cc98dedfc.tar.gz vaadin-framework-83ee08eae1a9997298713a6302dc929cc98dedfc.zip |
Updated browser versions and screenshots, test tweaks for stability. (#12271)
Diffstat (limited to 'uitest/src/test/java/com/vaadin/tests')
3 files changed, 15 insertions, 6 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java index 1d668a289a..4a83e78ddd 100644 --- a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java @@ -25,10 +25,10 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest { // Chrome version does not necessarily match the desired version // because of auto updates... browserIdentifier = getExpectedUserAgentString( - getDesiredCapabilities()) + "89"; + getDesiredCapabilities()) + "90"; } else if (BrowserUtil.isFirefox(getDesiredCapabilities())) { browserIdentifier = getExpectedUserAgentString( - getDesiredCapabilities()) + "81"; + getDesiredCapabilities()) + "88"; } else { browserIdentifier = getExpectedUserAgentString(desiredCapabilities) + desiredCapabilities.getVersion(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java index bdaaf56d4c..63ab353d81 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java @@ -62,7 +62,7 @@ public class GridResizeHiddenColumnTest extends MultiBrowserTest { // Click on "Last Name" menu item action.click(visibilityToggle).perform(); waitUntilLoadingIndicatorNotVisible(); - sleep(100); // wait for layouting + sleep(200); // wait for layouting // Check if column "Last Name" is visible headerCells = grid.getHeaderCells(0); diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java index a88fc47f6d..1824ba086b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java @@ -18,14 +18,23 @@ public class MenuBarNavigationMouseTest extends MultiBrowserTest { public void testMenuBarMouseNavigation() throws Exception { openTestURL(); MenuBarElement menuBar = $(MenuBarElement.class).first(); - menuBar.clickItem("File", "Export..", "As PDF..."); + + // clicks separated to different calls for more informative errors + menuBar.clickItem("File"); + menuBar.clickItem("Export.."); + menuBar.clickItem("As PDF..."); assertEquals("1. MenuItem File/Export../As PDF... selected", getLogRow(0)); - menuBar.clickItem("Edit", "Copy"); + + menuBar.clickItem("Edit"); + menuBar.clickItem("Copy"); assertEquals("2. MenuItem Edit/Copy selected", getLogRow(0)); + menuBar.clickItem("Help"); assertEquals("3. MenuItem Help selected", getLogRow(0)); - menuBar.clickItem("File", "Exit"); + + menuBar.clickItem("File"); + menuBar.clickItem("Exit"); assertEquals("4. MenuItem File/Exit selected", getLogRow(0)); } } |