Merge changes from origin/7.1

c7ae45c Validate that the connector is enabled before triggering actions for it (#12743)
ce89a75 Created constants for tested browser versions (#12786)
f9ea9b3 Allow running tests locally by overriding runLocally() (#12786)
e70ba25 Added liferay module for building liferay.zip #12748
7c12694 Add sub directory support to sass test scanner (#12790)
39fdf66 Handle numbers in the same way if they do not have a unit (#12732)
6155d61 Disable fallback in a way compatible with Atmosphere JS 2.0.3 (#12241)
f401595 Test for pushing large chunks of data (#12567)
d41967d Skip compilation of TB2 tests if tests.tb2.skip is set
6c1ba81 Reverted button click() logic check (#12743)
779c8a0 Disable automated testing on Opera until issues are resolved (#12487, #12367, #12800)
962c1c3 Fix compilation error
7ee11a7 Remove unused test super class (#12786)
a4211dc Resolve concurrency issue in running TB3 tests
20c28aa Fixed javadoc
0d36896 Add more hax to make test work with new Atmosphere JS (#12241)
ed50200 Fix serialization issue (#12703)
dd51b7f Added more exception handling to PushHandler (#12578, #11882)
6f76840 Sass variables can now start with underscore (#12716)
ab5b20c Ticket #12727 - Panels get unnecessary scroll bars in WebKit when content is 100% wide.
361ad17 Fixed focus issue in TableMoveFocusWithSelectionTest (#12540)
ee809e5 Revert broken fix and test (#12446)

Change-Id: I71b6e3c2dc6b02845794df0934ba807d7ccac784

1 files changed, 16 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
index f567106d60..8f92ff3118 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
@@ -9,6 +9,7 @@ import com.vaadin.server.WebBrowser;
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.shared.ui.ui.Transport;
+import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
@@ -100,6 +101,15 @@ public abstract class AbstractTestUI extends UI {
         }
     }
 
+    /**
+     * Sets the push transport according to the transport= URL parameter if such
+     * is given. Supports transport=xhr (disables push), transport=websocket
+     * (forces websocket into use), transport=streaming (forces streaming into
+     * use). Using ?transport=xyz disables the fallback transport.
+     * 
+     * @param request
+     *            The UI init request
+     */
     protected void setTransport(VaadinRequest request) {
         String transport = request.getParameter("transport");
         PushConfiguration config = getPushConfiguration();
@@ -112,11 +122,17 @@ public abstract class AbstractTestUI extends UI {
                 config.setPushMode(PushMode.AUTOMATIC);
             }
             config.setTransport(Transport.WEBSOCKET);
+            // Ensure no fallback is used
+            getPushConfiguration().setParameter(
+                    PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
         } else if ("streaming".equals(transport)) {
             if (!mode.isEnabled()) {
                 config.setPushMode(PushMode.AUTOMATIC);
             }
             config.setTransport(Transport.STREAMING);
+            // Ensure no fallback is used
+            getPushConfiguration().setParameter(
+                    PushConfigurationState.FALLBACK_TRANSPORT_PARAM, "none");
         }
     }