Make frontend resource loading tests stable on PhantomJS (#9772)

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 ea19da72d32c2a9e58841b708a558d0a3599b127..2c5039717bbd3d59680b7e2f7bc33b776a9bc43f 100644 (file)
--- 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 0ead673567c99a79a50e3d0f07667fdc5268efbc..4709ebbcc0b33a065b1336d7112c5731185fa114 100644 (file)
--- 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());