additional conditional wait for javascript to run and set the title

JMRI · May 1, 2020 · 0218202 · 0218202
1 parent b802715
commit 0218202
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/java/acceptancetest/step_definitions/jmri/web/WebServerAcceptanceSteps.java b/java/acceptancetest/step_definitions/jmri/web/WebServerAcceptanceSteps.java
@@ -55,9 +55,13 @@ public WebServerAcceptanceSteps(jmri.InstanceManager instance) {
             assertThat(webDriver.getTitle()).isEqualTo(pageTitle);
         });
 
-        Then("^either (.*) or (.*) is returned as the title$", (String pageTitle, String formatedPageTitle) -> {
-            waitLoad();
-            assertThat(webDriver.getTitle()).isIn(newLinkedHashSet(pageTitle, formatedPageTitle));
+        Then("^either (.*) or (.*) is returned as the title$", (String pageTitle, String formattedPageTitle) -> {
+            waitLoad(); //wait for page to load
+            //additional conditional wait for javascript to run and set the title
+            WebDriverWait wait = new WebDriverWait(webDriver, 15);
+            wait.until(ExpectedConditions.or(
+                    ExpectedConditions.titleIs(pageTitle), ExpectedConditions.titleIs(formattedPageTitle)));
+            assertThat(webDriver.getTitle()).isIn(newLinkedHashSet(pageTitle, formattedPageTitle));
         });