XWIKI-17052: Allow to inject Javascript / CSS in Notification Displayer

* Small change in Notification Page object to wait the async macro to be finished when loading notifications in order to avoid flickers
xwiki · Mar 20, 2020 · 3d144f8 · 3d144f8
1 parent 923a54b
commit 3d144f8
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/...objects/src/main/java/org/xwiki/platform/notifications/test/po/NotificationsTrayPage.java b/...objects/src/main/java/org/xwiki/platform/notifications/test/po/NotificationsTrayPage.java
@@ -24,6 +24,7 @@
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
+import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.xwiki.test.ui.po.BootstrapSwitch;
@@ -167,7 +168,16 @@ public void showNotificationTray()
 
     private void waitUntilNotificationsAreLoaded()
     {
-        getDriver().waitUntilCondition(webDriver -> !notificationsArea.getAttribute(CLASS).contains("loading"));
+        getDriver().waitUntilCondition(webDriver -> {
+            if (!notificationsArea.getAttribute(CLASS).contains("loading")) {
+                try {
+                    getDriver().findElementWithoutWaiting(notificationsArea, By.className("xwiki-async"));
+                } catch (NoSuchElementException e) {
+                    return true;
+                }
+            }
+            return false;
+        });
     }
 
     private List<WebElement> getNotifications()