summaryrefslogtreecommitdiffstats
path: root/vaadin-grid/test
diff options
context:
space:
mode:
authorSauli Tähkäpää <sauli@vaadin.com>2015-05-08 16:38:15 +0300
committerSauli Tähkäpää <sauli@vaadin.com>2015-05-08 16:38:15 +0300
commitd99f4218df47db258c7412cf9bc5ce0d293b029e (patch)
treeeb99cbaa7988b2c7bac223e7a926c72365b6b6f3 /vaadin-grid/test
parente24713b10f37f9ee14ec9ed8c6e89ac581dd5f38 (diff)
downloadvaadin-core-0.2.0.tar.gz
vaadin-core-0.2.0.zip
Release version 0.2.0.0.2.0.final0.2.0
Diffstat (limited to 'vaadin-grid/test')
-rw-r--r--vaadin-grid/test/grid-binding-data.html2
-rw-r--r--vaadin-grid/test/grid-scrolling-rows.html10
2 files changed, 10 insertions, 2 deletions
diff --git a/vaadin-grid/test/grid-binding-data.html b/vaadin-grid/test/grid-binding-data.html
index 3c2c144..30de8fc 100644
--- a/vaadin-grid/test/grid-binding-data.html
+++ b/vaadin-grid/test/grid-binding-data.html
@@ -157,7 +157,7 @@
grid.columns.splice(0, 1);
grid.columns.push(first);
grid.columns.splice(1, 1);
- grid.grid.setRows(5);
+ grid._grid.setRows(5);
var mydata = [
diff --git a/vaadin-grid/test/grid-scrolling-rows.html b/vaadin-grid/test/grid-scrolling-rows.html
index 0e62449..a0ff781 100644
--- a/vaadin-grid/test/grid-scrolling-rows.html
+++ b/vaadin-grid/test/grid-scrolling-rows.html
@@ -51,9 +51,17 @@
});
beforeEach(function() {
+ //reset position to an arbitrary row.
return grid.scrollToRow(24).then(function () {
+ // calling scrollToRow - scrollToRow - then seems to quite often
+ // run the callback in 'then' before the latter scrolling has finished.
+ // This is most likely caused by multiple timers being fired inside the Grid,
+ // and there's some gap between them - which makes grid.isWorkPending() to return
+ // 'false' too soon.
+ // Adding one 'then' in between the scrolling calls
+ // doesn't seem to remedy the situation. So let's add more.
return grid;
- }); //reset position to an arbitrary row.
+ });
});
it('should throw an error when scrolling to an invalid row', function() {