diff options
| author | Anna Koskinen <Ansku@users.noreply.github.com> | 2020-09-09 13:29:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 13:29:57 +0300 |
| commit | 7b236a4537bae11924b4819326d05a1b816ec255 (patch) | |
| tree | a3fb0c882c51530131c056633de339d04dd0464f /uitest/src | |
| parent | ee48d43aac693df7a8f157f888c6b06006c9f35f (diff) | |
| download | vaadin-framework-8.11.3.tar.gz vaadin-framework-8.11.3.zip | |
* Update Chrome version check to 85 (#12090)
Diffstat (limited to 'uitest/src')
3 files changed, 7 insertions, 1 deletions
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); } |