diff options
Diffstat (limited to 'uitest/src')
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java | 2 | ||||
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java | 2 |
2 files changed, 3 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 f1a91a2590..5357a5bc52 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()) + "85"; + getDesiredCapabilities()) + "86"; } else if (BrowserUtil.isFirefox(getDesiredCapabilities())) { browserIdentifier = getExpectedUserAgentString( getDesiredCapabilities()) + "75"; 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 c0350bbc15..489b7aba40 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 @@ -265,6 +265,7 @@ public class ValoThemeUITest extends MultiBrowserTest { } $(ButtonElement.class).caption(link).first().click(); + waitUntilLoadingIndicatorNotVisible(); CssLayoutElement content = wrap(CssLayoutElement.class, findElement(By.className("valo-content"))); LabelElement captionElem = content.$(LabelElement.class).first(); @@ -285,6 +286,7 @@ public class ValoThemeUITest extends MultiBrowserTest { testBenchElement(testMenu).scroll(top); testBenchElement(testMenu).scrollLeft(left); + waitUntilLoadingIndicatorNotVisible(); } @Override |