diff options
author | Artur Signell <artur@vaadin.com> | 2015-03-23 22:15:51 +0200 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2015-03-24 08:06:15 +0000 |
commit | 4f3397df74dc737a9c5592d5418e741433e20dee (patch) | |
tree | 8090165af74fc41130d102fca1a5fd5d1db61e2e /uitest | |
parent | 7fa43952ca1b1e26afe79f5c0a75f9e735431be0 (diff) | |
download | vaadin-framework-4f3397df74dc737a9c5592d5418e741433e20dee.tar.gz vaadin-framework-4f3397df74dc737a9c5592d5418e741433e20dee.zip |
Expect Chrome 41
Change-Id: I64c8788c0ae6160c565dfc0cfb4a87a7ed86bc81
Diffstat (limited to 'uitest')
-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")); |