From 7b236a4537bae11924b4819326d05a1b816ec255 Mon Sep 17 00:00:00 2001 From: Anna Koskinen Date: Wed, 9 Sep 2020 13:29:57 +0300 Subject: Update Chrome version check to 85 (#12090) (#12102) * Update Chrome version check to 85 (#12090) --- .../BaseThemeTest-testTheme_ANY_Chrome__labels.png | Bin 33057 -> 33079 bytes ...ComboBoxIcons_ANY_Chrome__icons-32x32-page2.png | Bin 57327 -> 57341 bytes ...-checkScreenshot_ANY_Chrome__allVaadinIcons.png | Bin 141280 -> 141260 bytes ...ditorWithFrozenColumns_ANY_Chrome__scrolled.png | Bin 49317 -> 48683 bytes ...ipChameleonTheme_ANY_Chrome__tooltipVisible.png | Bin 24538 -> 24538 bytes ...hangeIcon_ANY_Chrome__allVaadinIcons-switch.png | Bin 61556 -> 59990 bytes ...reenshot_initial_ANY_Chrome__allVaadinIcons.png | Bin 60923 -> 59359 bytes .../com/vaadin/tests/VerifyBrowserVersionTest.java | 2 +- .../grid/GridInitiallyHiddenColumnsTest.java | 1 + .../java/com/vaadin/tests/tb3/AbstractTB3Test.java | 5 +++++ 10 files changed, 7 insertions(+), 1 deletion(-) diff --git a/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__labels.png b/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__labels.png index edc504c48b..e9624f11d0 100755 Binary files a/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__labels.png and b/uitest/reference-screenshots/chrome/BaseThemeTest-testTheme_ANY_Chrome__labels.png differ diff --git a/uitest/reference-screenshots/chrome/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Chrome__icons-32x32-page2.png b/uitest/reference-screenshots/chrome/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Chrome__icons-32x32-page2.png index 2d8d4e9aac..5c88b26c27 100755 Binary files a/uitest/reference-screenshots/chrome/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Chrome__icons-32x32-page2.png and b/uitest/reference-screenshots/chrome/ComboBoxLargeIconsTest-testComboBoxIcons_ANY_Chrome__icons-32x32-page2.png differ diff --git a/uitest/reference-screenshots/chrome/FontIconsTest-checkScreenshot_ANY_Chrome__allVaadinIcons.png b/uitest/reference-screenshots/chrome/FontIconsTest-checkScreenshot_ANY_Chrome__allVaadinIcons.png index 6b961a0cc4..0d68db4887 100644 Binary files a/uitest/reference-screenshots/chrome/FontIconsTest-checkScreenshot_ANY_Chrome__allVaadinIcons.png and b/uitest/reference-screenshots/chrome/FontIconsTest-checkScreenshot_ANY_Chrome__allVaadinIcons.png differ diff --git a/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__scrolled.png b/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__scrolled.png index 167a70eda0..fc3b459af2 100755 Binary files a/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__scrolled.png and b/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__scrolled.png differ diff --git a/uitest/reference-screenshots/chrome/LabelTooltipTest-testLabelToolTipChameleonTheme_ANY_Chrome__tooltipVisible.png b/uitest/reference-screenshots/chrome/LabelTooltipTest-testLabelToolTipChameleonTheme_ANY_Chrome__tooltipVisible.png index 7ae4701802..0a208e0518 100644 Binary files a/uitest/reference-screenshots/chrome/LabelTooltipTest-testLabelToolTipChameleonTheme_ANY_Chrome__tooltipVisible.png and b/uitest/reference-screenshots/chrome/LabelTooltipTest-testLabelToolTipChameleonTheme_ANY_Chrome__tooltipVisible.png differ diff --git a/uitest/reference-screenshots/chrome/VaadinIconSetTest-checkScreenshot_changeIcon_ANY_Chrome__allVaadinIcons-switch.png b/uitest/reference-screenshots/chrome/VaadinIconSetTest-checkScreenshot_changeIcon_ANY_Chrome__allVaadinIcons-switch.png index 378625277c..d0bd7fed43 100755 Binary files a/uitest/reference-screenshots/chrome/VaadinIconSetTest-checkScreenshot_changeIcon_ANY_Chrome__allVaadinIcons-switch.png and b/uitest/reference-screenshots/chrome/VaadinIconSetTest-checkScreenshot_changeIcon_ANY_Chrome__allVaadinIcons-switch.png differ diff --git a/uitest/reference-screenshots/chrome/VaadinIconSetTest-checkScreenshot_initial_ANY_Chrome__allVaadinIcons.png b/uitest/reference-screenshots/chrome/VaadinIconSetTest-checkScreenshot_initial_ANY_Chrome__allVaadinIcons.png index 1d6c456d97..0fd8116108 100755 Binary files a/uitest/reference-screenshots/chrome/VaadinIconSetTest-checkScreenshot_initial_ANY_Chrome__allVaadinIcons.png and b/uitest/reference-screenshots/chrome/VaadinIconSetTest-checkScreenshot_initial_ANY_Chrome__allVaadinIcons.png differ diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java index c259e34837..f1a91a2590 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()) + "84"; + getDesiredCapabilities()) + "85"; } else if (BrowserUtil.isFirefox(getDesiredCapabilities())) { browserIdentifier = getExpectedUserAgentString( getDesiredCapabilities()) + "75"; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java index 87982dfdc2..a719b56abb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java @@ -39,6 +39,7 @@ public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest { @Test public void ensureCorrectlyRenderedAllInitiallyHidden() { openTestURL("debug&allHidden"); + waitUntilLoadingIndicatorNotVisible(); GridElement grid = $(GridElement.class).first(); getSidebarOpenButton(grid).click(); diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java index c835696470..cd5eb5d17e 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -136,6 +136,10 @@ public abstract class AbstractTB3Test extends ParallelTest { int h = SCREENSHOT_HEIGHT; try { + if (BrowserUtil.isChrome(getDesiredCapabilities())) { + // Chrome 85 keeps failing in this task... + sleep(200); + } testBench().resizeViewPortTo(w, h); } catch (UnsupportedOperationException e) { // Opera does not support this... @@ -365,6 +369,7 @@ public abstract class AbstractTB3Test extends ParallelTest { * {@link org.openqa.selenium.JavascriptExecutor#executeScript(String, Object...)} * returns */ + @Override protected Object executeScript(String script, Object... args) { return ((JavascriptExecutor) getDriver()).executeScript(script, args); } -- cgit v1.2.3