diff options
| author | Henri Sara <henri.sara@gmail.com> | 2017-08-07 10:11:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 10:11:02 +0300 |
| commit | 9373b365ecd8ba0a8731139df8081ca8bbcf2b9e (patch) | |
| tree | 3d4c97f12a2eb4d197856f9392591ec1fb3749f2 | |
| parent | 644bee622288e3491a2d2af5d1f6a33242b01eb1 (diff) | |
| download | vaadin-framework-9373b365ecd8ba0a8731139df8081ca8bbcf2b9e.tar.gz vaadin-framework-9373b365ecd8ba0a8731139df8081ca8bbcf2b9e.zip | |
Make frontend resource loading tests stable on PhantomJS (#9772)
| -rw-r--r-- | uitest/src/test/java/com/vaadin/tests/resources/FrontendInitialResourceUITest.java | 5 | ||||
| -rw-r--r-- | uitest/src/test/java/com/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()); |