2 files changed, 32 insertions, 2 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
index 56d970308d..c9144e52f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java
@@ -763,6 +763,11 @@ public class GridBasics extends AbstractTestUIWithLog {
         editorMenu.addItem("Save", i -> grid.getEditor().save());
         editorMenu.addItem("Cancel edit", i -> grid.getEditor().cancel());
 
+        Stream.of(0, 5, 100).forEach(i -> editorMenu.addItem("Edit row " + i,
+                menuItem -> grid.getEditor().editRow(i)));
+        editorMenu.addItem("Edit last row", menuItem -> grid.getEditor()
+                .editRow(grid.getDataCommunicator().getDataProviderSize() - 1));
+
         editorMenu.addItem("Change save caption",
                 e -> grid.getEditor().setSaveCaption("ǝʌɐS"));
         editorMenu.addItem("Change cancel caption",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorTest.java
index d8a49a5938..832e5e6651 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basics/GridEditorTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -37,8 +38,8 @@ public abstract class GridEditorTest extends GridBasicsTest {
             .className("v-grid-editor-cancel");
     protected static final org.openqa.selenium.By BY_EDITOR_SAVE = By
             .className("v-grid-editor-save");
-    protected static final String[] TOGGLE_EDIT_ENABLED = {
-            "Component", "Editor", "Enabled" };
+    protected static final String[] TOGGLE_EDIT_ENABLED = { "Component",
+            "Editor", "Enabled" };
 
     @Override
     @Before
@@ -216,6 +217,30 @@ public abstract class GridEditorTest extends GridBasicsTest {
         assertEditorClosed();
     }
 
+    @Test
+    public void testEditorOpeningFromServer() {
+        selectMenuPath("Component", "Editor", "Edit row 5");
+        assertEditorOpen();
+
+        Assert.assertEquals("Unexpected editor field content", "5",
+                getEditor().getField(3).getAttribute("value"));
+        Assert.assertEquals("Unexpected not-editable column content", "(5, 1)",
+                getEditor().findElement(By.className("not-editable"))
+                        .getText());
+    }
+
+    @Test
+    public void testEditorOpenWithScrollFromServer() {
+        selectMenuPath("Component", "Editor", "Edit last row");
+        assertEditorOpen();
+
+        Assert.assertEquals("Unexpected editor field content", "999",
+                getEditor().getField(3).getAttribute("value"));
+        Assert.assertEquals("Unexpected not-editable column content",
+                "(999, 1)", getEditor()
+                        .findElement(By.className("not-editable")).getText());
+    }
+
     protected WebElement getSaveButton() {
         return getDriver().findElement(BY_EDITOR_SAVE);
     }