waitAjaxMinLoadAnimation

jepsar · Jan 7, 2024 · 2df5406 · 2df5406
1 parent 9d962c9
commit 2df5406
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/...sts/src/test/java/org/primefaces/integrationtests/confirmdialog/ConfirmDialog001Test.java b/...sts/src/test/java/org/primefaces/integrationtests/confirmdialog/ConfirmDialog001Test.java
@@ -47,7 +47,6 @@ class ConfirmDialog001Test extends AbstractPrimePageTest {
     void showDialog(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         assertFalse(dialog.isVisible());
 
         // Act
@@ -65,7 +64,6 @@ void showDialog(Page page) {
     void showWidget(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
 
         // Act
         dialog.show();
@@ -80,7 +78,6 @@ void showWidget(Page page) {
     void hideWidget(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         dialog.show();
         assertTrue(dialog.isVisible());
 
@@ -97,7 +94,6 @@ void hideWidget(Page page) {
     void confirmNo(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         assertFalse(dialog.isVisible());
         page.confirm.click();
 
@@ -115,7 +111,6 @@ void confirmNo(Page page) {
     void confirmYes(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         page.confirm.click();
         assertTrue(dialog.isVisible());
 
@@ -133,7 +128,6 @@ void confirmYes(Page page) {
     void deleteNo(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         assertFalse(dialog.isVisible());
         page.delete.click();
 
@@ -151,7 +145,6 @@ void deleteNo(Page page) {
     void deleteYes(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         assertFalse(dialog.isVisible());
         page.delete.click();
 
@@ -216,6 +209,7 @@ private void assertDialog(Page page, boolean visible) {
             }
         }
         else {
+            waitAjaxMinLoadAnimation();
             assertClickable(page.confirm);
             assertClickable(page.delete);
         }

diff --git a/...sts/src/test/java/org/primefaces/integrationtests/confirmdialog/ConfirmDialog002Test.java b/...sts/src/test/java/org/primefaces/integrationtests/confirmdialog/ConfirmDialog002Test.java
@@ -47,7 +47,6 @@ class ConfirmDialog002Test extends AbstractPrimePageTest {
     void showDialog(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         assertFalse(dialog.isVisible());
 
         // Act
@@ -65,7 +64,6 @@ void showDialog(Page page) {
     void showWidget(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
 
         // Act
         dialog.show();
@@ -80,7 +78,6 @@ void showWidget(Page page) {
     void hideWidget(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         dialog.show();
         assertTrue(dialog.isVisible());
 
@@ -97,7 +94,6 @@ void hideWidget(Page page) {
     void confirmNo(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         assertFalse(dialog.isVisible());
         page.confirm.click();
 
@@ -115,7 +111,6 @@ void confirmNo(Page page) {
     void confirmYes(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         page.confirm.click();
         assertTrue(dialog.isVisible());
 
@@ -133,7 +128,6 @@ void confirmYes(Page page) {
     void deleteNo(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         assertFalse(dialog.isVisible());
         page.delete.click();
 
@@ -151,7 +145,6 @@ void deleteNo(Page page) {
     void deleteYes(Page page) {
         // Arrange
         ConfirmDialog dialog = page.dialog;
-        noAjaxMinLoadAnimation();
         assertFalse(dialog.isVisible());
         page.delete.click();
 
@@ -216,6 +209,7 @@ private void assertDialog(Page page, boolean visible) {
             }
         }
         else {
+            waitAjaxMinLoadAnimation();
             assertClickable(page.confirm);
             assertClickable(page.delete);
         }

diff --git a/...primefaces-selenium-core/src/main/java/org/primefaces/selenium/AbstractPrimePageTest.java b/...primefaces-selenium-core/src/main/java/org/primefaces/selenium/AbstractPrimePageTest.java
@@ -38,6 +38,8 @@
 import org.primefaces.selenium.spi.WebDriverProvider;
 
 import java.lang.reflect.InvocationTargetException;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -325,6 +327,13 @@ protected void setAjaxMinLoadAnimation(int milliseconds) {
         PrimeSelenium.executeScript("PrimeFaces.ajax.minLoadAnimation = " + milliseconds + ";");
     }
 
+    /**
+     * Waits for the default minimal Ajax load animation duration.
+     */
+    protected void waitAjaxMinLoadAnimation() {
+        getWebDriver().manage().timeouts().implicitlyWait(Duration.of(500, ChronoUnit.MILLIS));
+    }
+
     /**
      * <p>
      * Similar to <a href="http://www.w3.org/TR/xpath/#function-normalize-space">http://www.w3.org/TR/xpath/#function-normalize -space</a>