Ignore reconnect tests for long polling and streaming on PhantomJS.

Change-Id: Ia8248f31caafb6c53e967491084d660d89de2c29

diff --git a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
index 28ef30a04ab9518b5aad150a34c81547ef8bd9cd..22d020b63136b8e48ca49595126b09db2598c288 100644 (file)
--- a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
@@ -15,8 +15,21 @@
  */
 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 0a0275c4d04907d79c579db215bdb13bf8caa457..4a669e723ce4a842d6626e86505f35a4448158e4 100755 (executable)
--- a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
@@ -15,8 +15,21 @@
  */
 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 72fb2c18d1df7005ddebd56fb7a7ef188b44e44d..d6eed3e5c8ad238ba7d77c9684624228db187c0e 100644 (file)
--- 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());