From a486f6480979e93812cb1236e89e41d03f79d448 Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Wed, 8 Apr 2020 12:17:11 +0300 Subject: Set DateField value only if it passes range check (#11887) Fixes #11108 --- .../components/datefield/DateFieldBinderCrossValidationTest.java | 2 ++ .../tests/components/datefield/DateFieldFaultyInputNotValidTest.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'uitest/src') diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldBinderCrossValidationTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldBinderCrossValidationTest.java index efbbf3f999..4a47f3786a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldBinderCrossValidationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldBinderCrossValidationTest.java @@ -30,6 +30,8 @@ public class DateFieldBinderCrossValidationTest extends SingleBrowserTest { fromFieldText.sendKeys("2019/01/01", Keys.ENTER); toFieldText.sendKeys("2018/02/02", Keys.ENTER); + sleep(200); + assertEquals("Error message should contain the information", EXPECTED_ERROR, label.getText()); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFaultyInputNotValidTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFaultyInputNotValidTest.java index 3a3b6cd069..87cb115ae5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFaultyInputNotValidTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFaultyInputNotValidTest.java @@ -6,7 +6,9 @@ import java.time.LocalDate; import org.junit.Test; import org.openqa.selenium.By; +import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; +import org.openqa.selenium.WebElement; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.DateFieldElement; @@ -46,6 +48,7 @@ public class DateFieldFaultyInputNotValidTest extends SingleBrowserTest { public void testDateOutOfRange() { openTestURL(); DateFieldElement dateField = $(DateFieldElement.class).first(); + WebElement dateFieldText = dateField.findElement(By.tagName("input")); dateField.setDate(LocalDate.now()); $(ButtonElement.class).first().click(); @@ -53,7 +56,7 @@ public class DateFieldFaultyInputNotValidTest extends SingleBrowserTest { $(NotificationElement.class).first().getText()); $(NotificationElement.class).first().close(); - dateField.setDate(LocalDate.now().minusDays(7)); + dateFieldText.sendKeys(LocalDate.now().minusDays(7).toString(), Keys.ENTER); $(ButtonElement.class).first().click(); assertEquals("Last week should not be ok", "Fail", -- cgit v1.2.3