From ad742c4ed476615d612cc95509351039da7d3707 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sauli=20T=C3=A4hk=C3=A4p=C3=A4=C3=A4?= <sauli@vaadin.com>
Date: Mon, 13 Oct 2014 13:48:24 +0300
Subject: [PATCH] Ignore reconnect tests for long polling and streaming on
 PhantomJS.

Change-Id: Ia8248f31caafb6c53e967491084d660d89de2c29
---
 .../vaadin/tests/push/ReconnectLongPollingTest.java | 13 +++++++++++++
 .../vaadin/tests/push/ReconnectStreamingTest.java   | 13 +++++++++++++
 .../src/com/vaadin/tests/tb3/MultiBrowserTest.java  |  9 ++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

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,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 0a0275c4d0..4a669e723c 100755
--- 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 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());
 
-- 
2.39.5