diff options
| author | Jouni Koivuviita <jouni@vaadin.com> | 2015-02-06 00:05:21 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-02-06 07:43:44 +0000 |
| commit | 0c82dad0ab225aeb9920b2e5c6f061da871bea66 (patch) | |
| tree | eecfb95c58e2d4e75e6dc5eba84f930dedeb98e3 /uitest/src/com | |
| parent | bc9db74216f654901154a08ad877d74bf63c64b5 (diff) | |
| download | vaadin-framework-0c82dad0ab225aeb9920b2e5c6f061da871bea66.tar.gz vaadin-framework-0c82dad0ab225aeb9920b2e5c6f061da871bea66.zip | |
Grid editor theme redesign (#16593)
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
Diffstat (limited to 'uitest/src/com')
| -rw-r--r-- | uitest/src/com/vaadin/testbench/elements/GridElement.java | 6 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java | 5 |
2 files changed, 5 insertions, 6 deletions
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<WebElement> 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<WebElement> 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<WebElement> selectorDivs = editor.findElements(By + WebElement editorCells = findElement(By + .className("v-grid-editor-cells")); + List<WebElement> selectorDivs = editorCells.findElements(By .cssSelector("div")); assertTrue("selector column cell should've been empty", selectorDivs |