Skip to content

Commit 5f0fc95

Browse files
mshabarovmshabarov
committed
feat: Add HasClearButton mixin to TestBench elements (#7337)
--------- Co-authored-by: Tatu Lund <tatu@vaadin.com> (cherry picked from commit 2c76563)
1 parent c1e1728 commit 5f0fc95

File tree

19 files changed

+33
-34
lines changed

19 files changed

+33
-34
lines changed

‎vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/src/test/java/com/vaadin/flow/component/combobox/test/ClearValueIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void openPopup_clearButton_selectedItemIsReset() {
7070
comboBox.openPopup();
7171
comboBox.closePopup();
7272

73-
comboBox.$("[part~='clear-button']").get(0).click();
73+
comboBox.clickClearButton();
7474

7575
comboBox.openPopup();
7676

‎vaadin-combo-box-flow-parent/vaadin-combo-box-testbench/src/main/java/com/vaadin/flow/component/combobox/testbench/ComboBoxElement.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import org.openqa.selenium.By;
2121

22+
import com.vaadin.testbench.HasClearButton;
2223
import com.vaadin.testbench.HasHelper;
2324
import com.vaadin.testbench.HasLabel;
2425
import com.vaadin.testbench.HasSelectByText;
@@ -31,8 +32,8 @@
3132
* element.
3233
*/
3334
@Element("vaadin-combo-box")
34-
public class ComboBoxElement extends TestBenchElement
35-
implements HasLabel, HasSelectByText, HasHelper, HasValidation {
35+
public class ComboBoxElement extends TestBenchElement implements HasLabel,
36+
HasSelectByText, HasHelper, HasValidation, HasClearButton {
3637

3738
/**
3839
* Clears the value of the combobox.

‎vaadin-combo-box-flow-parent/vaadin-combo-box-testbench/src/main/java/com/vaadin/flow/component/combobox/testbench/MultiSelectComboBoxElement.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import org.openqa.selenium.By;
2121

22+
import com.vaadin.testbench.HasClearButton;
2223
import com.vaadin.testbench.HasHelper;
2324
import com.vaadin.testbench.HasLabel;
2425
import com.vaadin.testbench.HasValidation;
@@ -31,7 +32,7 @@
3132
*/
3233
@Element("vaadin-multi-select-combo-box")
3334
public class MultiSelectComboBoxElement extends TestBenchElement
34-
implements HasLabel, HasHelper, HasValidation {
35+
implements HasLabel, HasHelper, HasValidation, HasClearButton {
3536

3637
public String getInputElementValue() {
3738
return this.getPropertyString("_inputElementValue");

‎vaadin-date-picker-flow-parent/vaadin-date-picker-testbench/src/main/java/com/vaadin/flow/component/datepicker/testbench/DatePickerElement.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.openqa.selenium.Keys;
2424

2525
import com.vaadin.flow.component.button.testbench.ButtonElement;
26+
import com.vaadin.testbench.HasClearButton;
2627
import com.vaadin.testbench.HasHelper;
2728
import com.vaadin.testbench.HasLabel;
2829
import com.vaadin.testbench.HasValidation;
@@ -35,7 +36,7 @@
3536
*/
3637
@Element("vaadin-date-picker")
3738
public class DatePickerElement extends TestBenchElement
38-
implements HasLabel, HasHelper, HasValidation {
39+
implements HasLabel, HasHelper, HasValidation, HasClearButton {
3940

4041
public static class OverlayContentElement extends TestBenchElement {
4142
/**

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/BigDecimalFieldPageIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,7 @@ public void assertClearValue() {
167167
input.sendKeys("300");
168168
blur();
169169

170-
TestBenchElement clearButton = field.$(TestBenchElement.class)
171-
.attributeContains("part", "clear-button").first();
172-
clearButton.click();
170+
field.clickClearButton();
173171

174172
assertValueChange(2, 300, null);
175173
}

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/EmailFieldPageIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@ public void assertClearValue() {
119119
input.sendKeys("foo");
120120
blur();
121121

122-
WebElement clearButton = field.$("*")
123-
.attributeContains("part", "clear-button").first();
124-
clearButton.click();
122+
field.clickClearButton();
125123

126124
String value = findElement(By.id("clear-message")).getText();
127125
Assert.assertEquals("Old value: 'foo'. New value: ''.", value);

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/IntegerFieldPageIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,7 @@ public void assertClearValue() {
124124
input.sendKeys("300");
125125
blur();
126126

127-
TestBenchElement clearButton = field.$(TestBenchElement.class)
128-
.attributeContains("part", "clear-button").first();
129-
clearButton.click();
127+
field.clickClearButton();
130128

131129
assertValueChange(2, 300, null);
132130
}

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/NumberFieldPageIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ public void assertClearValue() {
125125
input.sendKeys("300");
126126
blur();
127127

128-
WebElement clearButton = field.$("*")
129-
.attributeContains("part", "clear-button").first();
130-
clearButton.click();
128+
field.clickClearButton();
131129

132130
String value = findElement(By.id("clear-message")).getText();
133131
Assert.assertEquals("Old value: '300.0'. New value: 'null'.", value);

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/PasswordFieldPageIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ public void assertClearValue() {
7979
.id("clear-password-field");
8080
field.setValue("foo");
8181

82-
WebElement clearButton = field.$("*")
83-
.attributeContains("part", "clear-button").first();
84-
clearButton.click();
82+
field.clickClearButton();
8583

8684
String value = findElement(By.id("clear-message")).getText();
8785
Assert.assertEquals("Old value: 'foo'. New value: ''.", value);

‎vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/src/test/java/com/vaadin/flow/component/textfield/tests/TextAreaPageIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ public void assertClearValue() {
5252
input.sendKeys("foo");
5353
blur();
5454

55-
WebElement clearButton = field.$("*")
56-
.attributeContains("part", "clear-button").first();
57-
clearButton.click();
55+
field.clickClearButton();
5856

5957
String value = findElement(By.id("clear-message")).getText();
6058
Assert.assertEquals("Old value: 'foo'. New value: ''.", value);

0 commit comments

Comments
 (0)