diff options
| author | Henri Sara <hesara@vaadin.com> | 2017-05-17 13:47:45 +0300 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-05-17 14:48:46 +0300 |
| commit | 557c4ba9b980a565536fe870867f6688d884c839 (patch) | |
| tree | 5bf709f4ee1d8a2692a09638b6e4fdfa26c2b63c | |
| parent | f9966fde8d7e3cd7b4b07b15e6db3f42fa870365 (diff) | |
| download | vaadin-framework-557c4ba9b980a565536fe870867f6688d884c839.tar.gz vaadin-framework-557c4ba9b980a565536fe870867f6688d884c839.zip | |
Update ES5/ES6 tests for Firefox
Expect ES5 for Firefox as the test cluster has an older version.
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/resources/FrontendInitialResourceUITest.java | 3 | ||||
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/resources/FrontendLaterLoadedResourceUITest.java | 3 |
2 files changed, 4 insertions, 2 deletions
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"; |