summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-10-17 15:46:40 +0300
committerVaadin Code Review <review@vaadin.com>2013-10-17 13:54:29 +0000
commit0d368961252af5f7dceef7f28a5e83bb2845ff56 (patch)
tree0e9861522d2b51ad6f4bee01de26351fb54beaaa
parent20c28aa2f0cfc7b49a2a7861f0b9427522f34417 (diff)
downloadvaadin-framework-0d368961252af5f7dceef7f28a5e83bb2845ff56.tar.gz
vaadin-framework-0d368961252af5f7dceef7f28a5e83bb2845ff56.zip
Add more hax to make test work with new Atmosphere JS (#12241)
Change-Id: Id75cabd402e243ed4bec7da61771554f2df4fbf6
-rw-r--r--uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
index 67715339da..23702564f9 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
+++ b/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
@@ -34,11 +34,13 @@ import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.JavaScriptFunction;
// Load vaadinPush.js so that jQueryVaadin is defined
-@JavaScript("vaadin://vaadinPush.js")
+@JavaScript("vaadin://vaadinPush.debug.js")
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;};"
+ " var response = {partialMessage: ''};\n"
+ " var messages = [];\n"
+ " for(var i = 0; i < data.length; i++) {\n"
@@ -85,7 +87,7 @@ public class TrackMessageSizeUI extends AbstractTestUIWithLog {
}
private String findMethodImplementation() {
- String filename = "/VAADIN/jquery.atmosphere.js";
+ String filename = "/VAADIN/vaadinPush.debug.js";
URL resourceURL = findResourceURL(filename,
(VaadinServletService) VaadinService.getCurrent());
if (resourceURL == null) {
@@ -141,7 +143,7 @@ public class TrackMessageSizeUI extends AbstractTestUIWithLog {
@Override
protected String getTestDescription() {
- return "Unit tests for _trackMessageSize in jquery.atmosphere.js. Implemented with testbench and a full Vaadin server side since the testing requires some file mangling.";
+ return "Unit tests for _trackMessageSize in vaadinPush.debug.js. Implemented with testbench and a full Vaadin server side since the testing requires some file mangling.";
}
@Override