summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni@vaadin.com>2012-08-07 15:59:14 +0300
committerJouni Koivuviita <jouni@vaadin.com>2012-08-07 15:59:14 +0300
commit9a83722fde94af949b45d4c091399ba9e1f6ba29 (patch)
treeb2bae141ba0dba97bfce9fd1bdf8cf712975c909
parentd422eba61ba6e8ef82c72fa661ff4991f8918ec0 (diff)
downloadvaadin-framework-9a83722fde94af949b45d4c091399ba9e1f6ba29.tar.gz
vaadin-framework-9a83722fde94af949b45d4c091399ba9e1f6ba29.zip
Fix executeJavascript in a test
-rw-r--r--src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml1
-rw-r--r--tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java8
2 files changed, 7 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
index 77e3127745..697bf992e9 100644
--- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
@@ -93,5 +93,6 @@
<!-- Use the new cross site linker to get a nocache.js without document.write -->
<add-linker name="xsiframe" />
+ <set-configuration-property name="devModeRedirectEnabled" value="true" />
</module>
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
index c493b03eb5..b5e83978b7 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
@@ -40,7 +40,9 @@ public class LayoutResizeTest extends TestBase {
public void buttonClick(ClickEvent event) {
event.getButton()
.getRoot()
- .executeJavaScript(
+ .getPage()
+ .getJavaScript()
+ .execute(
"setTimeout(function() {window.resizeTo(700,400)}, 500)");
}
});
@@ -50,7 +52,9 @@ public class LayoutResizeTest extends TestBase {
public void buttonClick(ClickEvent event) {
event.getButton()
.getRoot()
- .executeJavaScript(
+ .getPage()
+ .getJavaScript()
+ .execute(
"setTimeout(function() {window.resizeTo(900,600)}, 500)");
}
});