summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorHenrik Paul <henrik@vaadin.com>2014-09-09 13:15:36 +0300
committerHenrik Paul <henrik@vaadin.com>2014-09-22 11:05:50 +0300
commitb845b9e5f7e2586eb6436b6e6a9b8e5eb7cdaf46 (patch)
tree56ee5921f773f85fbca73d0360e400483fbcee27 /uitest
parent9542a79187efc287e0ac5d1c7ca3911587e6f059 (diff)
downloadvaadin-framework-b845b9e5f7e2586eb6436b6e6a9b8e5eb7cdaf46.tar.gz
vaadin-framework-b845b9e5f7e2586eb6436b6e6a9b8e5eb7cdaf46.zip
Makes Escalator and Grid DeferredWorkers (#13334)
Change-Id: Ia8c1b98e4e2c021b570e74f3527f58f15a469a17
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java b/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java
index 2656407023..d8ab7a896d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java
@@ -118,6 +118,8 @@ public class GridClientRenderers extends MultiBrowserTest {
@Test
public void rowsWithDataHasStyleName() throws Exception {
+ testBench().disableWaitForVaadin();
+
// Simulate network latency with 2000ms
latency = 2000;
@@ -143,6 +145,8 @@ public class GridClientRenderers extends MultiBrowserTest {
@Test
public void complexRendererSetVisibleContent() throws Exception {
+ testBench().disableWaitForVaadin();
+
DesiredCapabilities desiredCapabilities = getDesiredCapabilities();
// Simulate network latency with 2000ms
@@ -163,6 +167,12 @@ public class GridClientRenderers extends MultiBrowserTest {
openTestURL();
+ /*
+ * because there's no wait for vaadin, we need to wait for a little
+ * while.
+ */
+ sleep(200);
+
// Test initial renderering with contentVisible = False
TestBenchElement cell = getGrid().getCell(51, 1);
String backgroundColor = cell.getCssValue("backgroundColor");