fix: update openRowForEditing to get vaadin-crud-edit based on row.in…

…dex (#541) (#542)
vaadin · Dec 21, 2020 · b4731de · b4731de
1 parent 39f1b59
commit b4731de
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...in-crud-testbench/src/main/java/com/vaadin/flow/component/crud/testbench/CrudElement.java b/...in-crud-testbench/src/main/java/com/vaadin/flow/component/crud/testbench/CrudElement.java
@@ -20,13 +20,16 @@
 
 import com.vaadin.flow.component.button.testbench.ButtonElement;
 import com.vaadin.flow.component.grid.testbench.GridElement;
+import com.vaadin.flow.component.grid.testbench.GridTHTDElement;
+import com.vaadin.flow.component.grid.testbench.GridTRElement;
 import com.vaadin.flow.component.textfield.testbench.TextFieldElement;
 import com.vaadin.testbench.ElementQuery;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elementsbase.Element;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * TestBench element for the vaadin-crud element
@@ -82,7 +85,13 @@ public void openRowForEditing(int row) {
         if (isEditOnClick()) {
             this.getGrid().getCell(row, 0).click();
         } else {
-            this.$("vaadin-crud-edit").all().get(row).click();
+            GridTRElement editedRow = getGrid().getRow(row);
+            GridTHTDElement editCell = getGrid().getAllColumns().stream()
+                    .map(column -> editedRow.getCell(column))
+                    .filter(cell -> cell.getInnerHTML()
+                            .contains("vaadin-crud-edit"))
+                    .collect(Collectors.toList()).get(0);
+            editCell.$("vaadin-crud-edit").get(0).click();
         }
     }