diff options
3 files changed, 34 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java index 28ef30a04a..22d020b631 100644 --- a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java +++ b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java @@ -15,9 +15,22 @@ */ package com.vaadin.tests.push; +import org.openqa.selenium.remote.DesiredCapabilities; + +import java.util.List; + public class ReconnectLongPollingTest extends ReconnectTest { @Override + public List<DesiredCapabilities> getBrowsersToTest() { + + // PhantomJS doesn't seem to detect disconnection on + // Long-Polling/Streaming: + // https://github.com/ariya/phantomjs/issues/11938 + return getBrowsersExcludingPhantomJS(); + } + + @Override protected Class<?> getUIClass() { return BasicPushLongPolling.class; } diff --git a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java index 0a0275c4d0..4a669e723c 100755 --- a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java +++ b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java @@ -15,9 +15,22 @@ */ package com.vaadin.tests.push; +import org.openqa.selenium.remote.DesiredCapabilities; + +import java.util.List; + public class ReconnectStreamingTest extends ReconnectTest { @Override + public List<DesiredCapabilities> getBrowsersToTest() { + + // PhantomJS doesn't seem to detect disconnection on + // Long-Polling/Streaming: + // https://github.com/ariya/phantomjs/issues/11938 + return getBrowsersExcludingPhantomJS(); + } + + @Override protected Class<?> getUIClass() { return BasicPushStreaming.class; } diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java index 72fb2c18d1..d6eed3e5c8 100644 --- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java +++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java @@ -40,6 +40,14 @@ import org.openqa.selenium.remote.DesiredCapabilities; */ public abstract class MultiBrowserTest extends PrivateTB3Configuration { + protected List<DesiredCapabilities> getBrowsersExcludingPhantomJS() { + List<DesiredCapabilities> browsers = new ArrayList<DesiredCapabilities>(getAllBrowsers()); + + browsers.remove(Browser.PHANTOMJS.getDesiredCapabilities()); + + return browsers; + } + protected List<DesiredCapabilities> getBrowsersExcludingIE() { List<DesiredCapabilities> browsers = new ArrayList<DesiredCapabilities>(getAllBrowsers()); browsers.remove(Browser.IE8.getDesiredCapabilities()); @@ -50,7 +58,6 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration { return browsers; } - protected List<DesiredCapabilities> getBrowsersSupportingShiftClick() { List<DesiredCapabilities> browsers = new ArrayList<DesiredCapabilities>(getAllBrowsers()); |