Skip to content

Wait for system maintenance page to load when rerunning the task #2615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 1 commit into from
Aug 11, 2025
Merged

Wait for system maintenance page to load when rerunning the task #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/org/labkey/test/WebDriverWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import org.openqa.selenium.Keys;
import org.openqa.selenium.NoAlertPresentException;
import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.NoSuchWindowException;
import org.openqa.selenium.ScriptTimeoutException;
import org.openqa.selenium.SearchContext;
import org.openqa.selenium.StaleElementReferenceException;
Expand Down Expand Up @@ -2132,6 +2133,29 @@ public long doAndMaybeWaitForPageToLoad(int msWait, Supplier<Boolean> action)
return loadTimer.elapsed().toMillis();
}

public long doAndWaitForWindow(Runnable action, String windowName)
{
return doAndMaybeWaitForPageToLoad(10_000, () -> {
String initialWindow = getDriver().getWindowHandle();
boolean targetWindowExists;
try
{
getDriver().switchTo().window(windowName);
getDriver().switchTo().window(initialWindow);
targetWindowExists = true;
}
catch (NoSuchWindowException e)
{
targetWindowExists = false;
}

action.run();

getDriver().switchTo().window(windowName);
return targetWindowExists;
});
}

public long doAndAcceptUnloadAlert(Runnable func, String partialAlertText)
{
return doAndWaitForPageToLoad(() ->
Expand Down
5 changes: 2 additions & 3 deletions src/org/labkey/test/pages/admin/ConfigureSystemMaintenancePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ public static ConfigureSystemMaintenancePage beginAt(WebDriverWrapper webDriverW
*/
public PipelineStatusDetailsPage runMaintenanceTask(String description)
{
click(Locator.tagWithAttribute("input", "type", "checkbox")
.followingSibling("a").withText(description));
getDriver().switchTo().window("systemMaintenance");
doAndWaitForWindow(() -> click(Locator.tagWithAttribute("input", "type", "checkbox")
.followingSibling("a").withText(description)), "systemMaintenance");

PipelineStatusDetailsPage pipelineStatusDetailsPage = new PipelineStatusDetailsPage(getDriver());
pipelineStatusDetailsPage.waitForComplete();
Expand Down