Update Chrome version check to 85 (#12090)

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 edc504c48b905cf144e3a58c0f2130bd7b014551..e9624f11d00cf579eed3814fe4f3586889086caf 100755 (executable)
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 2d8d4e9aac1ff02de061de79866899dead8130c9..5c88b26c276bdfdc589107173d07dc30e875eab3 100755 (executable)
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 6b961a0cc4af1b3401c5e335dae8f7aca0fbfe9f..0d68db48872fb3f47556e720408241c480480e11 100644 (file)
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 167a70eda0c68bcd714e8e8046ec65a01b117f24..fc3b459af2abcd86a12e03eaa888c124f0cc2e85 100755 (executable)
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 7ae4701802721f57be000740a57a7f605fe24fe6..0a208e0518824067464259d46a1cca0e9e011bf0 100644 (file)
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 378625277c1a60c583f05e070cc714a27dad5777..d0bd7fed43a32c42a32e39e1fa5f4896849b42e5 100755 (executable)
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 1d6c456d97ee57e6a20ec51ab0bbc0e5b570606f..0fd81161080c4992f84bafd7d5730ad6d4100a2c 100755 (executable)
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 c259e348377756883078378f185f8a200ac9fcdf..f1a91a2590cfaed31c483ae03be26c06b693ee4b 100644 (file)
--- 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 87982dfdc270ba8d5e4edfd8224becfb953f2c94..a719b56abb56f3d8877b3aa8dd3629dc8058f23b 100644 (file)
--- 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 c8356964707a4b4479c0cf3766b75012e0bad3e8..cd5eb5d17e5f1bc213f65871bda7b98daf2e43c8 100644 (file)
--- 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);
     }