Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 11 additions & 6 deletions src/org/labkey/test/LabKeySiteWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,7 @@ public void simpleSignIn()
}
else
{
log("Signing in as " + PasswordUtil.getUsername());
assertElementPresent(Locator.tagWithName("form", "login"));
setFormElement(Locator.name("email"), PasswordUtil.getUsername());
setFormElement(Locator.name("password"), PasswordUtil.getPassword());
acceptTermsOfUse(null, false);
clickButton("Sign In", 0);
fillSignInFormAndSubmit();

// verify we're signed in now
if (!waitFor(() ->
Expand Down Expand Up @@ -202,6 +197,16 @@ else if (errors.contains("log in and approve the terms of use."))
WebTestHelper.saveSession(PasswordUtil.getUsername(), getDriver());
}

public void fillSignInFormAndSubmit()
{
log("Signing in as " + PasswordUtil.getUsername());
assertElementPresent(Locator.tagWithName("form", "login"));
setFormElement(Locator.name("email"), PasswordUtil.getUsername());
setFormElement(Locator.name("password"), PasswordUtil.getPassword());
acceptTermsOfUse(null, false);
clickButton("Sign In", 0);
}

/**
* Call the LogoutApi to sign out
*/
Expand Down
6 changes: 6 additions & 0 deletions src/org/labkey/test/WebDriverWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -1169,6 +1169,12 @@ public Connection createDefaultConnection(boolean reuseSession)
return createDefaultConnection();
}

// Exempt the provided URL from controller-first URL warnings and exceptions
public void allowControllerFirstUrl(String url)
{
_controllerFirstUrls.add(url);
}

public long beginAt(String url)
{
return beginAt(url, defaultWaitForPage);
Expand Down