Waiting for edit series dialog due to some indeterministic test failures

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java

@@ -19,6 +19,7 @@ import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.FluentWait;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.sap.sailing.selenium.core.AjaxCallsComplete;
 import com.sap.sailing.selenium.core.AjaxCallsExecuted;
@@ -289,6 +290,27 @@ public class PageObject {
         return findElementBySeleniumId(this.context, id);
     }
     
+    /**
+     * <p>Waits for an element with the specified selenium id to appear in the given search context. If multiple
+     *   elements exists, the element closest to the context is returned.</p>
+     * 
+     * @param context
+     *   The search context to use for the search.
+     * @param id
+     *   The selenium id of the element.
+     * @return
+     *   The first matching element in the given context.
+     */
+    protected WebElement waitForElementBySeleniumId(SearchContext context, String id, int timeout) {
+        FluentWait<SearchContext> wait = createFluentWait(context, timeout, DEFAULT_POLLING_INTERVAL);
+        return (WebElement) wait.until(new Function<SearchContext, Object>() {
+            @Override
+            public Object apply(SearchContext context) {
+                return context.findElement(new BySeleniumId(id));
+            }
+        });
+    }
+    
     /**
      * <p>Finds and returns the first element with the specified selenium id in the given search context. If multiple
      *   elements exists, the element closest to the context is returned.</p>
@@ -440,6 +462,21 @@ public class PageObject {
         return supplier.get(driver, findElementBySeleniumId(driver, seleniumId));
     }
     
+    /**
+     * Waits for the element with the given seleniumId and returns a {@link PageArea} instance representing the element. The 
+     * {@link WebDriver} is used as search context.
+     * 
+     * @param supplier {@link PageAreaSupplier} used to instantiate the {@link PageArea}
+     * @param seleniumId the selenium id of the desired element
+     * @param timeout the timeout in seconds to wait for the element
+     * @return {@link PageArea} representing the first matching element
+     * 
+     * @see #findElementBySeleniumId(SearchContext, String)
+     */
+    protected <T extends PageArea> T waitForPO(PageAreaSupplier<T> supplier, String seleniumId, int timeout) {
+        return supplier.get(driver, waitForElementBySeleniumId(driver, seleniumId, timeout));
+    }
+    
     /**
      * Returns a {@link PageArea} instance representing the element with the specified selenium id in the search
      * context of this page area.

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/RegattaDetailsCompositePO.java

@@ -56,7 +56,7 @@ public class RegattaDetailsCompositePO extends PageArea {
         if (entry != null) {
             WebElement action = ActionsHelper.findEditAction(entry.getWebElement());
             action.click();
-            return getPO(SeriesEditDialogPO::new, "SeriesEditDialog");
+            return waitForPO(SeriesEditDialogPO::new, "SeriesEditDialog", 5);
         }
         return null;
     }