diff options
| author | Artur Signell <artur@vaadin.com> | 2013-10-16 14:09:45 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-10-16 14:10:49 +0300 |
| commit | 6155d61cda45c1b0370ead08a0d3c97539590059 (patch) | |
| tree | 8eaf883a274b614e0662e0098b32c5ad67fb7cce /uitest | |
| parent | 39fdf66c3a2fb4033306ace1b7cbdaff0b63d882 (diff) | |
| download | vaadin-framework-6155d61cda45c1b0370ead08a0d3c97539590059.tar.gz vaadin-framework-6155d61cda45c1b0370ead08a0d3c97539590059.zip | |
Disable fallback in a way compatible with Atmosphere JS 2.0.3 (#12241)
Change-Id: I4023b50038288e39559cb8542ed59be807274d40
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java | 5 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java index 905b80fd85..d7c525f202 100644 --- 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 96793a90f8..465caf0165 100644 --- 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"); } } |