Skip to content
Open
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
16 changes: 2 additions & 14 deletions src/org/labkey/test/LabKeySiteWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.labkey.test.components.ui.navigation.UserMenu;
import org.labkey.test.pages.core.admin.CustomizeSitePage;
import org.labkey.test.pages.core.admin.ShowAdminPage;
import org.labkey.test.pages.core.login.SignInPage;
import org.labkey.test.pages.user.UserDetailsPage;
import org.labkey.test.util.APIUserHelper;
import org.labkey.test.util.ApiPermissionsHelper;
Expand Down Expand Up @@ -404,20 +405,7 @@ public void attemptSignIn(String email, String password)
}
}

assertTitleContains("Sign In");

assertElementPresent(Locator.tagWithName("form", "login"));
setFormElement(Locator.id("email"), email);
setFormElement(Locator.id("password"), password);
WebElement signInButton = Locator.button("Sign In").findElement(getDriver());
doAndMaybeWaitForPageToLoad(10_000, () -> {
signInButton.click();
shortWait().until(ExpectedConditions.invisibilityOfElementLocated(Locator.byClass("signing-in-msg")));
shortWait().until(ExpectedConditions.or(
ExpectedConditions.stalenessOf(signInButton), // Successful login
ExpectedConditions.presenceOfElementLocated(Locators.labkeyError.withText()))); // Error during sign-in
return ExpectedConditions.stalenessOf(signInButton).apply(null);
});
new SignInPage(getDriver()).signIn(email, password);
}

public void signInShouldFail(String email, String password, String... expectedMessages)
Expand Down
70 changes: 70 additions & 0 deletions src/org/labkey/test/pages/core/login/SignInPage.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/*
* Copyright (c) 2026 LabKey Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.labkey.test.pages.core.login;

import org.labkey.test.Locator;
import org.labkey.test.Locators;
import org.labkey.test.pages.LabKeyPage;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;

/**
* Page object for the LabKey "Sign In" page. This object assumes the browser is already on the Sign In page; it does
* not handle navigating to it (e.g. clicking a "Sign In" link).
*/
public class SignInPage extends LabKeyPage<SignInPage.ElementCache>
{
public SignInPage(WebDriver driver)
{
super(driver);
}

@Override
protected void waitForPage()
{
waitFor(() -> getDriver().getTitle().contains("Sign In") && isElementPresent(Locator.tagWithName("form", "login")),
"Sign In page did not load in time.", WAIT_FOR_PAGE);
}

public void signIn(String userName, String password)
{
setFormElement(elementCache().emailInput, userName);
setFormElement(elementCache().passwordInput, password);
WebElement signInButton = elementCache().signInButton;
doAndMaybeWaitForPageToLoad(10_000, () -> {
signInButton.click();
shortWait().until(ExpectedConditions.invisibilityOfElementLocated(Locator.byClass("signing-in-msg")));
shortWait().until(ExpectedConditions.or(
ExpectedConditions.stalenessOf(signInButton), // Successful login
ExpectedConditions.presenceOfElementLocated(Locators.labkeyError.withText()))); // Error during sign-in
return ExpectedConditions.stalenessOf(signInButton).apply(null);
});
}

@Override
protected ElementCache newElementCache()
{
return new ElementCache();
}

protected class ElementCache extends LabKeyPage<?>.ElementCache

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These question marks are a relic of a time when I didn't understand generics as well.

Suggested change
protected class ElementCache extends LabKeyPage<?>.ElementCache
protected class ElementCache extends LabKeyPage<ElementCache>.ElementCache

(Someday I will do a massive refactor to purge all of the messed up generic types in our test pages/components.)

{
WebElement emailInput = Locator.id("email").findWhenNeeded(getDriver());
WebElement passwordInput = Locator.id("password").findWhenNeeded(getDriver());
WebElement signInButton = Locator.byClass("signin-btn").findWhenNeeded(getDriver());
}
}