diff options
author | Artur Signell <artur@vaadin.com> | 2015-03-23 22:15:51 +0200 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2015-03-24 13:16:13 +0200 |
commit | cb53601d9bc9be366635df51a8f9af3e92d3c5c7 (patch) | |
tree | c21675775e9081eb2480a832d51ed9dd663b5945 | |
parent | d7156b1142ade28a5ef47b6c5824c6f41de9893e (diff) | |
download | vaadin-framework-cb53601d9bc9be366635df51a8f9af3e92d3c5c7.tar.gz vaadin-framework-cb53601d9bc9be366635df51a8f9af3e92d3c5c7.zip |
Expect Chrome 41
Change-Id: I64c8788c0ae6160c565dfc0cfb4a87a7ed86bc81
-rw-r--r-- | uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java index 5b4f4df788..8d0530204a 100644 --- a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java +++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java @@ -33,9 +33,20 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest { DesiredCapabilities desiredCapabilities = getDesiredCapabilities(); - assertThat(vaadinElementById("userAgent").getText(), - containsString(getExpectedUserAgentString(desiredCapabilities) - + desiredCapabilities.getVersion())); + String userAgent = vaadinElementById("userAgent").getText(); + String browserIdentifier; + + if (BrowserUtil.isChrome(getDesiredCapabilities())) { + // Chrome version does not necessarily match the desired version + // because of auto updates... + browserIdentifier = getExpectedUserAgentString(getDesiredCapabilities()) + + "41"; + } else { + browserIdentifier = getExpectedUserAgentString(desiredCapabilities) + + desiredCapabilities.getVersion(); + } + + assertThat(userAgent, containsString(browserIdentifier)); assertThat(vaadinElementById("touchDevice").getText(), is("Touch device? No")); |