From 9373b365ecd8ba0a8731139df8081ca8bbcf2b9e Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Mon, 7 Aug 2017 10:11:02 +0300 Subject: Make frontend resource loading tests stable on PhantomJS (#9772) --- .../com/vaadin/tests/resources/FrontendInitialResourceUITest.java | 5 ++++- .../vaadin/tests/resources/FrontendLaterLoadedResourceUITest.java | 5 ++++- 2 files changed, 8 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 ea19da72d3..2c5039717b 100644 --- a/uitest/src/test/java/com/vaadin/tests/resources/FrontendInitialResourceUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/resources/FrontendInitialResourceUITest.java @@ -35,7 +35,10 @@ public class FrontendInitialResourceUITest extends MultiBrowserTest { } else { es = "es6"; } - testBench().disableWaitForVaadin(); // For some reason needed by IE11 + if (BrowserUtil.isIE(getDesiredCapabilities())) { + // For some reason needed by IE11 + testBench().disableWaitForVaadin(); + } Assert.assertEquals("/VAADIN/frontend/" + es + "/logFilename.js", findElement(By.tagName("body")).getText()); 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 0ead673567..4709ebbcc0 100644 --- a/uitest/src/test/java/com/vaadin/tests/resources/FrontendLaterLoadedResourceUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/resources/FrontendLaterLoadedResourceUITest.java @@ -37,7 +37,10 @@ public class FrontendLaterLoadedResourceUITest extends MultiBrowserTest { } else { es = "es6"; } - testBench().disableWaitForVaadin(); // For some reason needed by IE11 + if (BrowserUtil.isIE(getDesiredCapabilities())) { + // For some reason needed by IE11 + testBench().disableWaitForVaadin(); + } Assert.assertEquals("/VAADIN/frontend/" + es + "/logFilename.js", findElement(By.tagName("body")).getText()); -- cgit v1.2.3