From 0c82dad0ab225aeb9920b2e5c6f061da871bea66 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Fri, 6 Feb 2015 00:05:21 +0200 Subject: Grid editor theme redesign (#16593) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Editor theme is now more flexible with regards to CSS. There are now separate elements for containing the edited cells and the “footer” which contains an optional message area and the save and cancel buttons. Change-Id: I9addcb6adca792a9251ffada99fbe9b77502c77a --- uitest/src/com/vaadin/testbench/elements/GridElement.java | 6 ++---- .../components/grid/basicfeatures/client/GridEditorClientTest.java | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'uitest') diff --git a/uitest/src/com/vaadin/testbench/elements/GridElement.java b/uitest/src/com/vaadin/testbench/elements/GridElement.java index 5a27bc1444..6b1279d2c2 100644 --- a/uitest/src/com/vaadin/testbench/elements/GridElement.java +++ b/uitest/src/com/vaadin/testbench/elements/GridElement.java @@ -106,8 +106,7 @@ public class GridElement extends AbstractComponentElement { * useless. */ public void save() { - List buttons = findElements(By.xpath("./button")); - buttons.get(0).click(); + findElement(By.className("v-grid-editor-save")).click(); } /** @@ -117,8 +116,7 @@ public class GridElement extends AbstractComponentElement { * useless. */ public void cancel() { - List buttons = findElements(By.xpath("./button")); - buttons.get(1).click(); + findElement(By.className("v-grid-editor-cancel")).click(); } } 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 f6f2fac074..30481ebc65 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 @@ -117,8 +117,9 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest { selectMenuPath("Component", "State", "Selection mode", "multi"); selectMenuPath(EDIT_ROW_5); - WebElement editor = getEditor(); - List selectorDivs = editor.findElements(By + WebElement editorCells = findElement(By + .className("v-grid-editor-cells")); + List selectorDivs = editorCells.findElements(By .cssSelector("div")); assertTrue("selector column cell should've been empty", selectorDivs -- cgit v1.2.3