Skip to content

Update test expectations for new login failure response #1984

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-jeckels merged 3 commits into from
Jul 23, 2024
Merged

Update test expectations for new login failure response #1984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c95278
Update expected failed auth message
labkey-adam Jul 16, 2024
985bcfc
Don't pass in credentials before initial user is set
labkey-adam Jul 16, 2024
e420bec
Really don't pass in credentials before initial user is set
labkey-adam Jul 17, 2024
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
2 changes: 1 addition & 1 deletion src/org/labkey/test/LabKeySiteWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ private void waitForStartup()
try
{
String startPage = buildURL("project", "home", "start");
SimpleHttpResponse httpResponse = WebTestHelper.getHttpResponse(startPage);
SimpleHttpResponse httpResponse = WebTestHelper.getHttpResponse(startPage, null, null);
if (httpResponse.getResponseCode() >= 400)
{
log("Waiting for server: " + httpResponse.getResponseCode());
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/test/tests/ClientAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ public void contentTypeResponseTest()

Map<String, Object> expectedProps = new HashMap<>();
expectedProps.put("success", false);
expectedProps.put("exception", "You must log in to view this content.");
expectedProps.put("exception", "The email address and password you entered did not match any accounts on file.");

validateUnauthorizedResponses(cn, command, expectedProps);

Expand Down Expand Up @@ -1506,7 +1506,7 @@ protected HttpGet getHttpRequest(Connection connection, String folderPath) throw
assertThat(responseContentType, containsString(expectedResponseContentType));

// Command only supports parsing the body of a JSON response.
if ("application/json".equalsIgnoreCase(expectedResponseContentType) && expectedProps != null && expectedProps.size() > 0)
if ("application/json".equalsIgnoreCase(expectedResponseContentType) && expectedProps != null && !expectedProps.isEmpty())
{
Map<String, Object> body = exception.getProperties();

Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/test/util/SimpleHttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ protected PasswordAuthentication getPasswordAuthentication()
{
useCopiedSession(con);
}
else
else if (_username != null && _password != null)
{
// Authenticator.setDefault() call above doesn't seem to work (I don't know why), so add the basic auth header explicitly
String encoded = Base64.getEncoder().encodeToString((_username + ":" + _password).getBytes(StandardCharsets.UTF_8));
Expand Down