From 557c4ba9b980a565536fe870867f6688d884c839 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Wed, 17 May 2017 13:47:45 +0300 Subject: Update ES5/ES6 tests for Firefox Expect ES5 for Firefox as the test cluster has an older version. --- .../java/com/vaadin/tests/resources/FrontendInitialResourceUITest.java | 3 ++- .../com/vaadin/tests/resources/FrontendLaterLoadedResourceUITest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'uitest/src') diff --git a/uitest/src/test/java/com/vaadin/tests/resources/FrontendInitialResourceUITest.java b/uitest/src/test/java/com/vaadin/tests/resources/FrontendInitialResourceUITest.java index 555e286427..ea19da72d3 100644 --- a/uitest/src/test/java/com/vaadin/tests/resources/FrontendInitialResourceUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/resources/FrontendInitialResourceUITest.java @@ -29,7 +29,8 @@ public class FrontendInitialResourceUITest extends MultiBrowserTest { openTestURL(); String es; if (BrowserUtil.isIE(getDesiredCapabilities()) - || BrowserUtil.isPhantomJS(getDesiredCapabilities())) { + || BrowserUtil.isPhantomJS(getDesiredCapabilities()) + || BrowserUtil.isFirefox(getDesiredCapabilities())) { es = "es5"; } else { es = "es6"; diff --git a/uitest/src/test/java/com/vaadin/tests/resources/FrontendLaterLoadedResourceUITest.java b/uitest/src/test/java/com/vaadin/tests/resources/FrontendLaterLoadedResourceUITest.java index 9d8d75b715..0ead673567 100644 --- a/uitest/src/test/java/com/vaadin/tests/resources/FrontendLaterLoadedResourceUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/resources/FrontendLaterLoadedResourceUITest.java @@ -31,7 +31,8 @@ public class FrontendLaterLoadedResourceUITest extends MultiBrowserTest { $(ButtonElement.class).first().click(); String es; if (BrowserUtil.isIE(getDesiredCapabilities()) - || BrowserUtil.isPhantomJS(getDesiredCapabilities())) { + || BrowserUtil.isPhantomJS(getDesiredCapabilities()) + || BrowserUtil.isFirefox(getDesiredCapabilities())) { es = "es5"; } else { es = "es6"; -- cgit v1.2.3