diff options
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java | 2 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java index 994b2e8e2e..566946a7ea 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java @@ -219,7 +219,7 @@ public class GridEditorTest extends GridBasicFeaturesTest { FixedNotificationElement n = $(FixedNotificationElement.class).first(); assertEquals("Column 7: Could not convert value to Integer", n.getCaption()); - n.click(); + n.close(); editor.cancel(); selectMenuPath(EDIT_ITEM_100); diff --git a/uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java b/uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java index db20016486..ff7715e281 100644 --- a/uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java +++ b/uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java @@ -1,6 +1,8 @@ package com.vaadin.tests.tb3.newelements; import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.NotificationElement; @@ -13,4 +15,11 @@ public class FixedNotificationElement extends NotificationElement { WebElement caption = popup.findElement(By.tagName("h1")); return caption.getText(); } + + public void close() { + click(); + WebDriverWait wait = new WebDriverWait(getDriver(), 10); + wait.until(ExpectedConditions.not(ExpectedConditions + .presenceOfAllElementsLocatedBy(By.className("v-Notification")))); + } } |