Skip to content

[bot] Merge 25.3 to develop #2509

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
github-actions merged 5 commits into from
Jun 24, 2025
Merged

[bot] Merge 25.3 to develop #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1d682f
Fix some intermittent test failures (#2495)
labkey-tchad Jun 18, 2025
60fa9ef
Rearrange the interaction with the Manually Define button to make sur…
labkey-jeckels Jun 18, 2025
8562980
Don't check the new "CSP Report" link for a navtrail (#2504)
labkey-adam Jun 19, 2025
5a195dc
Merge 24.11 to 25.3
labkey-teamcity Jun 23, 2025
44301a0
Merge 25.3 to develop
labkey-teamcity Jun 24, 2025
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
4 changes: 2 additions & 2 deletions src/org/labkey/test/WebDriverWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ public <T> T executeScript(@Language("JavaScript") String script, Class<T> expec
* Wrapper for synchronous execution of asynchronous JavaScript. This wrapper extracts the 'callback' from the argument list
* See {@link JavascriptExecutor#executeAsyncScript(java.lang.String, java.lang.Object...)} for details
*/
public Object executeAsyncScript(@Language("XPath") String script, Object... arguments)
public Object executeAsyncScript(@Language("JavaScript") String script, Object... arguments)
{
script = "var callback = arguments[arguments.length - 1];\n" + // See WebDriver documentation for details on injected callback
"try {" +
Expand All @@ -551,7 +551,7 @@ public Object executeAsyncScript(@Language("XPath") String script, Object... arg
return ((JavascriptExecutor) getDriver()).executeAsyncScript(script, arguments);
}

public <T> T executeAsyncScript(String script, Class<T> expectedResultType, Object... arguments)
public <T> T executeAsyncScript(@Language("JavaScript") String script, Class<T> expectedResultType, Object... arguments)
{
Object o = executeAsyncScript(script, arguments);
if (o != null && !expectedResultType.isAssignableFrom(o.getClass()))
Expand Down
9 changes: 8 additions & 1 deletion src/org/labkey/test/components/domain/DomainFormPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.stream.Collectors;

import static org.labkey.test.WebDriverWrapper.WAIT_FOR_JAVASCRIPT;
import static org.labkey.test.WebDriverWrapper.waitFor;

/**
* Automates the LabKey ui component defined in: packages/components/src/components/domainproperties/DomainForm.tsx
Expand All @@ -43,6 +44,12 @@ private DomainFormPanel(WebElement element, WebDriver driver)
super(element, driver);
}

@Override
protected void waitForReady()
{
waitFor(() -> !BootstrapLocators.loadingSpinner.existsIn(this), "Loading spinner still present", 2_000);
}

public static List<AdvancedFieldSetting> advancedSettingsFromFieldDefinition(FieldDefinition def)
{
List<AdvancedFieldSetting> advancedSettings = new ArrayList<>();
Expand Down Expand Up @@ -256,8 +263,8 @@ else if (validator instanceof FieldDefinition.TextChoiceValidator textChoiceVali
*/
public DomainFormPanel clickManuallyDefineFields()
{
getWrapper().scrollIntoView(elementCache().manuallyDefineButton, true);
getWrapper().shortWait().until(ExpectedConditions.elementToBeClickable(elementCache().manuallyDefineButton)); // give modal dialogs time to disappear
getWrapper().scrollIntoView(elementCache().manuallyDefineButton, true);
elementCache().manuallyDefineButton.click();

return this;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/test/tests/AdminConsoleNavigationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ private void doSetup()
_apiPermissionsHelper.addMemberToRole(TROUBLESHOOTER, "Troubleshooter", PermissionsHelper.MemberType.user, "/");

_userHelper.createUser(NON_ADMIN);
_apiPermissionsHelper.setUserPermissions(NON_ADMIN, "Reader");
}

@Override
Expand All @@ -76,6 +75,7 @@ public void testAdminNavTrails()
"Memory Usage", // Slow to load
"View All Site Errors", // No nav trail
"View All Site Errors Since Reset", // No nav trail
"View CSP Report Log File", // No nav trail
"View Primary Site Log File" // No nav trail
));
List<WebElement> adminLinks = ShowAdminPage.beginAt(this).getAllAdminConsoleLinks();
Expand Down
98 changes: 49 additions & 49 deletions src/org/labkey/test/tests/SimpleModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
*/
package org.labkey.test.tests;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.similarity.LevenshteinDistance;
import org.apache.hc.core5.http.HttpStatus;
import org.intellij.lang.annotations.Language;
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
Expand Down Expand Up @@ -58,6 +61,7 @@
import org.labkey.test.util.Maps;
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.RReportHelper;
import org.labkey.test.util.TestLogger;
import org.labkey.test.util.WikiHelper;
import org.labkey.test.util.ext4cmp.Ext4FieldRef;
import org.openqa.selenium.By;
Expand All @@ -76,6 +80,8 @@
import java.util.List;
import java.util.Map;
import java.util.StringJoiner;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Expand Down Expand Up @@ -228,8 +234,6 @@ protected void doSetup()

goToProjectHome();
portalHelper.addWebPart("Data Views");
for (int i = 0; i < 5; i ++)
portalHelper.moveWebPart("Data Views", PortalHelper.Direction.UP);

ProjectSettingsPage projectSettingsPage = goToProjectSettings();
projectSettingsPage.setDefaultDateTimeDisplayInherited(false);
Expand Down Expand Up @@ -436,7 +440,7 @@ private void doTestColumnValidators() throws Exception
deleteCmd.execute(createDefaultConnection(), getProjectName());
}

private void submitAndTestExpectedFailure(Command cmd, String expectedError) throws Exception
private void submitAndTestExpectedFailure(Command<?, ?> cmd, String expectedError) throws Exception
{
try
{
Expand Down Expand Up @@ -725,7 +729,7 @@ else if (name.equalsIgnoreCase("F150"))
));
try
{
SaveRowsResponse updateRows = updateCmd.execute(cn, getProjectName() + "/" + FOLDER_NAME);
updateCmd.execute(cn, getProjectName() + "/" + FOLDER_NAME);
fail("Expected to throw CommandException");
}
catch (CommandException ex)
Expand All @@ -737,7 +741,7 @@ else if (name.equalsIgnoreCase("F150"))
// Make sure that the schema isn't resolved if the module is not enabled in the container
try
{
SaveRowsResponse updateRows = updateCmd.execute(cn, "Shared");
updateCmd.execute(cn, "Shared");
fail("Expected to throw CommandException");
}
catch (CommandException ex)
Expand Down Expand Up @@ -809,7 +813,7 @@ else if (name.equalsIgnoreCase("F150"))
try
{
log("** Trying to delete Vehicles from a different container");
SaveRowsResponse deleteResp = deleteCmd.execute(cn, getProjectName() + "/" + FOLDER_NAME);
deleteCmd.execute(cn, getProjectName() + "/" + FOLDER_NAME);
fail("Expected to throw CommandException");
}
catch (CommandException ex)
Expand Down Expand Up @@ -845,7 +849,7 @@ private void validateThumbnails(String thumbnailImage, @Nullable String thumbnai
Locator popup = Locator.tag("div").withAttribute("id", "helpDiv").descendant("img").withAttributeContaining("src", popupImage).
withAttributeContaining("style", popupWidth != null ? "width:" + popupWidth : "max-width:300px");
shortWait().until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector("#helpDiv")));
String src = popup.findElement(getDriver()).getAttribute("src");
String src = StringUtils.trimToEmpty(popup.findElement(getDriver()).getDomAttribute("src"));

fireEvent(thumbnail, SeleniumEvent.mouseout);
Locator.tagWithClass("th", "labkey-selectors").findElement(getDriver()).click(); // safe out-click in the first header cell
Expand All @@ -857,7 +861,7 @@ private void validateThumbnails(String thumbnailImage, @Nullable String thumbnai
else
{
Locator popup = Locator.tag("div").withAttribute("id", "helpDiv").descendant("img").withAttributeContaining("src", popupImage);
assertTrue("Popup should not be present", !popup.existsIn(getDriver()));
assertFalse("Popup should not be present", popup.existsIn(getDriver()));
}
}

Expand All @@ -884,7 +888,7 @@ private void doTestViewEditing()

assertTrue("should be able to select default view", saveWindow.defaultViewRadio.isEnabled());
saveWindow.defaultViewRadio.check();
Window saveError = saveWindow.saveError();
Window<?> saveError = saveWindow.saveError();
saveError.clickButton("OK", 0);
saveError.waitForClose();

Expand Down Expand Up @@ -1004,10 +1008,8 @@ private void cleanupTable(Connection cn, String tableName) throws IOException
Object value = convertedRow.getValue(keyField);
newRow.put(keyField, value);

List<Map<String, Object>> rows = rowsByContainer.get(container);
if (rows == null)
rowsByContainer.put(container, rows = new ArrayList<>());
rows.add(newRow);
rowsByContainer.computeIfAbsent(container, k -> new ArrayList<>())
.add(newRow);
}

for (String container : rowsByContainer.keySet())
Expand All @@ -1028,8 +1030,7 @@ private void cleanupTable(Connection cn, String tableName) throws IOException
// Don't log project not found error
if (e.getStatusCode() != 404)
{
log("** Error during cleanupTable:");
e.printStackTrace(System.out);
TestLogger.info("** Error during cleanupTable:", e);
}
}
}
Expand Down Expand Up @@ -1076,14 +1077,10 @@ protected void createList() throws Exception
new FieldDefinition("Age", FieldDefinition.ColumnType.Integer).setDescription("Age"),
new FieldDefinition("Crazy", FieldDefinition.ColumnType.Boolean).setDescription("Crazy?")
));
listDef.create(createDefaultConnection(), getProjectName());

log("Importing some data...");
goToManageLists();
_listHelper.goToList(LIST_NAME);
_listHelper.clickImportData()
.setText(LIST_DATA)
.submit();
Connection connection = createDefaultConnection();
listDef.create(connection, getProjectName())
.getQueryHelper(connection)
.importData(LIST_DATA);
}

@LogMethod
Expand Down Expand Up @@ -1198,16 +1195,18 @@ private void doTestReportIcon()
File expectedIconFile = TestFileUtils.getSampleData(THUMBNAIL_FOLDER + KNITR_PEOPLE + ICON_FILENAME);
String expectedIcon = TestFileUtils.getFileContents(expectedIconFile);

String iconStyle = waitForElement(Locator.tag("img").withClass("dataview-icon").withoutClass("x4-tree-icon-parent").notHidden()).getAttribute("style");
assertTrue("Module report icon style is not as expected", iconStyle.indexOf("background-image") == 0);
String iconSrc = iconStyle.replace("background-image:url(\"", "").replace("background-image: url(\"", "").replace("\");", "");

String portPortion = 80 == WebTestHelper.getWebPort() ? "" : ":" + WebTestHelper.getWebPort();
String protocol = WebTestHelper.getTargetServer() + portPortion;
String iconData = WebTestHelper.getHttpResponse(protocol + iconSrc).getResponseBody();
WebElement img = waitForElement(Locator.tag("img").withClass("dataview-icon").withoutClass("x4-tree-icon-parent").notHidden());
String backgroundImage = StringUtils.trimToEmpty(img.getCssValue("background-image"));
Matcher matcher = Pattern.compile("^url\\(\"(.+)\"\\)$").matcher(backgroundImage);
if (!matcher.find())
{
Assert.fail("Module report icon style is not as expected: " + img.getDomAttribute("style"));
}
String iconUrl = matcher.group(1);
String iconData = WebTestHelper.getHttpResponse(iconUrl).getResponseBody();

int lengthToCompare = 3000;
int diff = new LevenshteinDistance().apply(expectedIcon.substring(0, lengthToCompare), iconData.substring(0, lengthToCompare));
int diff = LevenshteinDistance.getDefaultInstance().apply(expectedIcon.substring(0, lengthToCompare), iconData.substring(0, lengthToCompare));
assertTrue("Module report icon is not as expected, diff is " + diff, expectedIcon.equals(iconData) ||
diff <= lengthToCompare * 0.03); // Might be slightly different due to indentations, etc
}
Expand All @@ -1229,16 +1228,16 @@ private void verifyReportThumbnail(@LoggedParam String reportTitle)
WebElement reportLink = waitForElement(Locator.xpath("//a[text()='" + reportTitle + "']"));
mouseOver(reportLink);
WebElement thumbnail = waitForElement(Locator.xpath("//div[@class='thumbnail']/img").notHidden());
String thumbnailData = WebTestHelper.getHttpResponse(thumbnail.getAttribute("src")).getResponseBody();
String thumbnailData = WebTestHelper.getHttpResponse(thumbnail.getDomAttribute("src")).getResponseBody();

int lengthToCompare = 5000;
int diff = new LevenshteinDistance().apply(expectedThumbnail.substring(0, lengthToCompare), thumbnailData.substring(0, lengthToCompare));
int diff = LevenshteinDistance.getDefaultInstance().apply(expectedThumbnail.substring(0, lengthToCompare), thumbnailData.substring(0, lengthToCompare));
assertTrue("Module report thumbnail is not as expected, diff is " + diff, expectedThumbnail.equals(thumbnailData) ||
diff <= lengthToCompare * 0.03); // Might be slightly different due to indentations, etc
}

@LogMethod
private void doTestImportTemplates() throws Exception
private void doTestImportTemplates()
{
log("Testing import templates...");

Expand All @@ -1251,7 +1250,7 @@ private void doTestImportTemplates() throws Exception
assertTrue("Import message not present", isTextPresent("Please read this before you import data"));

Locator l = Locator.xpath("//select[@id='importTemplate']//option");
assertTrue("Wrong number of templates found", getElementCount(l) == 2);
assertEquals("Wrong number of templates found", 2, l.findElements(getDriver()).size());
}

@LogMethod
Expand Down Expand Up @@ -1401,7 +1400,7 @@ private void doTestFilterSort() throws Exception
selectResp = selectCmd.execute(cn, getProjectName());
assertEquals("Expected first row to be 2001.", 2001, selectResp.getRows().get(0).get("ModelYear"));
assertEquals("Expected first row to be 2000.", 2000, selectResp.getRows().get(1).get("ModelYear"));
assertTrue("Expected the column 'ModelId/ManufacturerId/Name' to be included based on the default view", selectResp.getColumnModel("ModelId/ManufacturerId/Name") != null);
assertNotNull("Expected the column 'ModelId/ManufacturerId/Name' to be included based on the default view", selectResp.getColumnModel("ModelId/ManufacturerId/Name"));
assertEquals("Expected to return 6 columns, based on the default view", 6, selectResp.getColumnModel().size());
}

Expand Down Expand Up @@ -1449,37 +1448,37 @@ private void doTestFilterSort() throws Exception
labkey.ensureRLibPath <- function(append=FALSE)
{
propValue <- labkey.getModuleProperty(baseUrl, folderPath, moduleName, propName)
\s

splits <- strsplit(propValue, '\\r\\n|\\n|\\r')
paths <- splits[[1]]
\s

if (append == TRUE)
\t.libPaths(c(paths, .libPaths()))
.libPaths(c(paths, .libPaths()))
else
\t.libPaths(c(paths[1], paths[2]))
\s
.libPaths(c(paths[1], paths[2]))

.libPaths()
}
\s

folderPath = "SimpleModuleTest Project/subfolder"
print("BEGIN-FIRST-CALL")
labkey.ensureRLibPath() \s
labkey.ensureRLibPath()
print("END-FIRST-CALL")
\s
folderPath = "SimpleModuleTest Project/subfolder2" \s

folderPath = "SimpleModuleTest Project/subfolder2"
print("BEGIN-SECOND-CALL")
labkey.ensureRLibPath()
print("END-SECOND-CALL") \s
print("END-SECOND-CALL")

folderPath = "SimpleModuleTest Project/subfolder" \s
folderPath = "SimpleModuleTest Project/subfolder"
print("BEGIN-THIRD-CALL")
labkey.ensureRLibPath(append=TRUE)
print("END-THIRD-CALL")
\s""";
""";

@LogMethod
@Test
public void testModuleProperties() throws Exception
public void testModuleProperties()
{
RReportHelper rReportHelper = new RReportHelper(this);
rReportHelper.ensureRConfig(false);
Expand Down Expand Up @@ -1705,6 +1704,7 @@ private void editMetadata(String schemaName, String tableName, String operations
clickButton("Save & Finish");
}

@Language("JavaScript")
private static final String vehicleMetadataJsQuery = """
function onFailure(errorInfo, options, responseObj)
{
Expand Down