diff options
| author | Artur Signell <artur@vaadin.com> | 2015-08-31 11:43:31 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-08-31 13:23:24 +0300 |
| commit | 9aafe4d1c535e9f79c09f33d2e1a1f8cc344eaa0 (patch) | |
| tree | 59a3e8acc083a06376c62e95a8b2f9ff7c0610a4 /uitest | |
| parent | b71cc2ffa9b96cfcaa045692eee4952678391850 (diff) | |
| download | vaadin-framework-9aafe4d1c535e9f79c09f33d2e1a1f8cc344eaa0.tar.gz vaadin-framework-9aafe4d1c535e9f79c09f33d2e1a1f8cc344eaa0.zip | |
Use Transport.WEBSOCKET_XHR instead of setter for mixing websockets and XHR (#11733)
Change-Id: I2fad7d367d8a4ba476ae0705672ebc2ee7cfeb1c
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/AbstractTestUI.java | 3 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java index 296e68008e..33ff504d8d 100644 --- a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java +++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java @@ -125,8 +125,7 @@ public abstract class AbstractTestUI extends UI { } else if ("websocket".equals(transport)) { enablePush(Transport.WEBSOCKET); } else if ("websocket-xhr".equals(transport)) { - enablePush(Transport.WEBSOCKET); - getPushConfiguration().setAlwaysUseXhrForServerRequests(true); + enablePush(Transport.WEBSOCKET_XHR); } else if ("streaming".equals(transport)) { enablePush(Transport.STREAMING); } else if ("long-polling".equals(transport)) { diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java index 4f0769e3d7..e31eb2a369 100644 --- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java +++ b/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java @@ -20,7 +20,7 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.ui.Transport; import com.vaadin.shared.ui.ui.UIState.PushConfigurationState; -@Push(transport = Transport.WEBSOCKET) +@Push(transport = Transport.WEBSOCKET_XHR) public class BasicPushWebsocketXhr extends BasicPush { @Override @@ -29,7 +29,6 @@ public class BasicPushWebsocketXhr extends BasicPush { // Don't use fallback so we can easier detect if websocket fails getPushConfiguration().setParameter( PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none"); - getPushConfiguration().setAlwaysUseXhrForServerRequests(true); } } |