summaryrefslogtreecommitdiffstats
path: root/uitest/src/test
diff options
context:
space:
mode:
authoreriklumme <erik@vaadin.com>2018-08-21 09:59:09 +0300
committerIlia Motornyi <elmot@vaadin.com>2018-08-21 09:59:09 +0300
commit6080cbbc56954fc297253e30a679f1aa346734d3 (patch)
tree00290aa0b3cb2546109912dc990ba91571d5dbee /uitest/src/test
parent738f620b73c2c7a3663744e0de5403b574eb7c84 (diff)
downloadvaadin-framework-6080cbbc56954fc297253e30a679f1aa346734d3.tar.gz
vaadin-framework-6080cbbc56954fc297253e30a679f1aa346734d3.zip
Fix Chrome version and Chrome border width in tests (#11119)
Diffstat (limited to 'uitest/src/test')
-rw-r--r--uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
index 8fddd8c722..fb85ac40b8 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()) + "56";
+ getDesiredCapabilities()) + "68";
} else {
browserIdentifier = getExpectedUserAgentString(desiredCapabilities)
+ desiredCapabilities.getVersion();
diff --git a/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
index d4a4de33a0..07ec81a2e1 100644
--- a/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
@@ -70,8 +70,7 @@ public class WidgetUtilTest extends MultiBrowserTest {
DesiredCapabilities capabilities) {
// Note that this is how the Windows browsers in the test cluster work.
// On Mac, Firefox works slightly differently (rounds border to 1.5px).
- return (BrowserUtil.isChrome(capabilities)
- || BrowserUtil.isPhantomJS(capabilities)
+ return (BrowserUtil.isPhantomJS(capabilities)
|| BrowserUtil.isFirefox(capabilities));
}