Merge branch 'master' into grid

Conflicts:
	WebContent/release-notes.html

Change-Id: Icccb2e30199f99a7b0b00f05b1a12d5f7297402f

1 files changed, 4 insertions, 2 deletions

diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationStreamingTest.java b/uitest/src/com/vaadin/tests/push/PushConfigurationStreamingTest.java
index 46fcc5f44b..8dc960c9ac 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationStreamingTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushConfigurationStreamingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 Vaadin Ltd.
+ * Copyright 2000-2014 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -38,6 +38,8 @@ public class PushConfigurationStreamingTest extends PushConfigurationTest {
 
     @Test
     public void testStreaming() throws InterruptedException {
+        openDebugLogTab();
+
         new Select(getTransportSelect()).selectByVisibleText("STREAMING");
         new Select(getPushModeSelect()).selectByVisibleText("AUTOMATIC");
 
@@ -54,4 +56,4 @@ public class PushConfigurationStreamingTest extends PushConfigurationTest {
         assertThat(driver.getPageSource(),
                 containsString("Push connection established using streaming"));
     }
-}
\ No newline at end of file
+}