summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2015-01-14 10:15:03 +0200
committerLeif Åstrand <leif@vaadin.com>2015-01-14 10:21:53 +0200
commit61430e669b3bbbd702373791854650bc3844c11f (patch)
treec15da61282def61730cbe703a02b5d24f6dcf507 /uitest
parent032bcef30f5ada7dc1ca6eade07ee596afa25bb3 (diff)
downloadvaadin-framework-61430e669b3bbbd702373791854650bc3844c11f.tar.gz
vaadin-framework-61430e669b3bbbd702373791854650bc3844c11f.zip
Update JS renderer to work with latest grid branch (#15485)
* Cope with createRenderer not being run deferred * Update test to not assume there's a selection column Change-Id: Ic6f053d2ef76d7227eb9ca00b960629e34ae380c
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
index a3bb736086..96fd672ab1 100644
--- a/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
@@ -30,17 +30,17 @@ public class JavaScriptRenderersTest extends MultiBrowserTest {
openTestURL();
GridElement grid = $(GridElement.class).first();
- GridCellElement cell_1_2 = grid.getCell(1, 2);
+ GridCellElement cell_1_1 = grid.getCell(1, 1);
// Verify render functionality
- Assert.assertEquals("Bean(2, 0)", cell_1_2.getText());
+ Assert.assertEquals("Bean(2, 0)", cell_1_1.getText());
// Verify init functionality
- Assert.assertEquals("2", cell_1_2.getAttribute("column"));
+ Assert.assertEquals("1", cell_1_1.getAttribute("column"));
// Verify onbrowserevent
- cell_1_2.click();
- Assert.assertTrue(cell_1_2.getText().startsWith(
+ cell_1_1.click();
+ Assert.assertTrue(cell_1_1.getText().startsWith(
"Clicked 1 with key 1 at"));
}
}