Fix button text and waitUntil rule (#9720)

diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushToggleComponentVisibility.java b/uitest/src/main/java/com/vaadin/tests/push/PushToggleComponentVisibility.java
index bbb004bcb1ac6a87d3a8d8d1164c4583a37beac3..805551853822807e9e875de58417452ae2c3193a 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/push/PushToggleComponentVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushToggleComponentVisibility.java
@@ -37,7 +37,7 @@ public class PushToggleComponentVisibility extends UI {
         label.setVisible(false);
         mainLayout.addComponent(label);
 
-        Button button = new Button("Hide me 3 secondes");
+        Button button = new Button("Hide me for 3 seconds");
         button.setId("hide");
         button.addClickListener(event1 -> {
             button.setVisible(false);

diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushToggleComponentVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushToggleComponentVisibilityTest.java
index 831d6a11b2f3cc8db4fcd1299427182814dccaf1..11ad287240a533266e0da4f4ac36de1d640d699e 100644 (file)
--- a/uitest/src/test/java/com/vaadin/tests/push/PushToggleComponentVisibilityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushToggleComponentVisibilityTest.java
@@ -17,7 +17,6 @@ package com.vaadin.tests.push;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openqa.selenium.By;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.LabelElement;
@@ -35,7 +34,7 @@ public class PushToggleComponentVisibilityTest extends SingleBrowserTest {
         Assert.assertEquals("Please wait",
                 $(LabelElement.class).first().getText());
 
-        waitForElementPresent(By.id(HIDE));
+        waitUntil(driver -> isElementPresent(ButtonElement.class));
         $(ButtonElement.class).id(HIDE).click();
         Assert.assertEquals("Please wait",
                 $(LabelElement.class).first().getText());