Disable fallback in a way compatible with Atmosphere JS 2.0.3 (#12241)

Change-Id: I4023b50038288e39559cb8542ed59be807274d40

diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
index 905b80fd85701114979329bf11b21a9a483ec998..d7c525f202427b659843c2d26975410c6bbf8e25 100644 (file)
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
@@ -18,6 +18,7 @@ package com.vaadin.tests.integration;
 import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 
 /**
  * Server test which uses websockets
@@ -39,7 +40,9 @@ public class ServletIntegrationWebsocketUI extends ServletIntegrationUI {
     protected void init(VaadinRequest request) {
         super.init(request);
         // Ensure no fallback is used
-        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+        getPushConfiguration().setParameter(
+                PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
+
     }
 
 }

diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
index 96793a90f8b33f87e5889ca18e764a384ee128cb..465caf0165703bb6af36d242adcbda95ef72a6ed 100644 (file)
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
@@ -18,6 +18,7 @@ package com.vaadin.tests.push;
 import com.vaadin.annotations.Push;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 
 @Push(transport = Transport.WEBSOCKET)
 public class BasicPushWebsocket extends BasicPush {
@@ -26,7 +27,8 @@ public class BasicPushWebsocket extends BasicPush {
     public void init(VaadinRequest request) {
         super.init(request);
         // Don't use fallback so we can easier detect if websocket fails
-        getPushConfiguration().setFallbackTransport(Transport.WEBSOCKET);
+        getPushConfiguration().setParameter(
+                PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
     }
 
 }