Skip to content

Commit eb63c1e

Browse files
DiegoCardosovaadin-bot
authored andcommitted
test: refactor Spreadsheet icon test (#8335)
1 parent f6d41c4 commit eb63c1e

File tree

1 file changed

+8
-6
lines changed
  • vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/src/test/java/com/vaadin/flow/component/spreadsheet/test

1 file changed

+8
-6
lines changed

vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/src/test/java/com/vaadin/flow/component/spreadsheet/test/ContextMenuIT.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ public void contextMenu_itemsContainExpectedIcons() {
117117
Assert.assertEquals("lumo:angle-up", lumoAttr);
118118
}
119119

120-
private WebElement getIconFromAction(String actionText) {
121-
return findElement(By.xpath("//div[@class='popupContent']//*[text()='"
122-
+ actionText
123-
+ "']/ancestor::*[contains(@class,'gwt-MenuItem')]//*[@icon]"));
124-
}
125-
126120
@Test
127121
public void contextMenu_rowHeader_itemsContainExpectedIcons() {
128122
loadTestFixture(TestFixtures.IconAction);
@@ -144,4 +138,12 @@ public void contextMenu_columnHeader_itemsContainExpectedIcons() {
144138
var colIcon = getIconFromAction("Column action");
145139
Assert.assertEquals("lumo:cog", colIcon.getAttribute("icon"));
146140
}
141+
142+
private WebElement getIconFromAction(String actionText) {
143+
return findElements(By.className("gwt-MenuItem")).stream()
144+
.filter(el -> el.getText().equals(actionText))
145+
.map(el -> el.findElement(By.tagName("vaadin-icon")))
146+
.findFirst().orElseThrow();
147+
}
148+
147149
}

0 commit comments

Comments
 (0)