summaryrefslogtreecommitdiffstats
path: root/uitest/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-12-18 09:12:43 +0200
committerVaadin Code Review <review@vaadin.com>2014-12-18 08:20:42 +0000
commit8742e11f7cdd6b8f91d593b459ff4a0e9875754e (patch)
tree5ba363a5d7128578ef3225dff519a6ee7d55fc70 /uitest/src
parent7bea56d1606dc1a06d348badbf4a436bcf2f3835 (diff)
downloadvaadin-framework-8742e11f7cdd6b8f91d593b459ff4a0e9875754e.tar.gz
vaadin-framework-8742e11f7cdd6b8f91d593b459ff4a0e9875754e.zip
Update to Atmosphere 2.2 (#14534)
Does not use the new heartbeat mechanism in Atmosphere 2.2 because the heartbeat mechanism will cause the client to reconnect every 60 seconds when idle. It does not currently work with Vaadin because no onreopen event is fired by Atmosphere (https://github.com/Atmosphere/atmosphere-javascript/issues/141) and thus Vaadin will wait forever for Atmosphere to indicate that the connection is available again after the disconnect. Change-Id: I3a61b2c5d611f09c3092f817834e6382e1ca9894
Diffstat (limited to 'uitest/src')
-rw-r--r--uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
index e7a74775bf..182a2e67e4 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
@@ -30,6 +30,7 @@ import com.vaadin.server.VaadinService;
import com.vaadin.server.VaadinServletService;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.JavaScriptFunction;
+
import elemental.json.JsonArray;
// Load vaadinPush.js so that jQueryVaadin is defined
@@ -39,7 +40,7 @@ public class TrackMessageSizeUI extends AbstractTestUIWithLog {
private String testMethod = "function testSequence(expected, data) {\n"
+ " var request = {trackMessageLength: true, messageDelimiter: '|'};\n"
+ " _request = {trackMessageLength: true, messageDelimiter: '|'};\n"
- + " _handleProtocol = function(a,b) {return true;};"
+ + " _handleProtocol = function(a,message) {return message;};"
+ " var response = {partialMessage: ''};\n"
+ " var messages = [];\n"
+ " for(var i = 0; i < data.length; i++) {\n"