Make Grid Editor return focus to last focused cell (#16834)

Change-Id: Ifbea95c2b5b39ca3c4532baa7e3f9298423bc030

1 files changed, 11 insertions, 1 deletions

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
index 58d6559bfb..0dd137db48 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
@@ -81,9 +81,19 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest {
         getGridElement().getCell(4, 0).doubleClick();
         assertNotNull(getEditor());
 
-        getCancelButton().click();
+        // Move focus to the third input field
+        getEditor().findElements(By.className("gwt-TextBox")).get(2).click();
+
+        // Press save button
+        getSaveButton().click();
+
+        // Make sure the editor went away
         assertNull(getEditor());
 
+        // Check that focus has moved to cell 4,2 - the last one that was
+        // focused in Editor
+        assertTrue(getGridElement().getCell(4, 2).isFocused());
+
         // Disable editor
         selectMenuPath("Component", "Editor", "Enabled");