Skip to content

[bot] Merge 25.10 to develop #2747

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 6 commits into from
Oct 15, 2025
Merged

[bot] Merge 25.10 to develop #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c865bfe
Fix Locator.xq to handle trailing quotes (backport) (#2733)
labkey-tchad Oct 7, 2025
4362609
refactor testLongName to use FieldInfo (#2737)
labkey-chrisj Oct 9, 2025
1e70153
Backport base classes for upgrade pipeline (#2728)
labkey-tchad Oct 10, 2025
69880b6
Merge 25.7 to 25.10
labkey-klum Oct 14, 2025
40c9c7e
Issue 54094: escape form field names ending with "\" (#2743)
labkey-nicka Oct 14, 2025
89b980c
Merge 25.10 to develop
labkey-teamcity Oct 15, 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
13 changes: 7 additions & 6 deletions src/org/labkey/test/tests/list/ListTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,26 +527,27 @@ public void testNameTrimming()
public void testLongName()
{
String listName = "A_+-:''.¡™£¢∞§¶•ªº–≠œ∑´®†¥¨ˆøπ“‘«æ…¬˚∆˙©√ƒ∂ßΩ≈ç√∫µ≤≥÷‹›fifl‡°·‚—±⁄€‹›‡‰Æ«»¢∫√∑∏∂";
String fieldWithDefault = TestDataGenerator.randomFieldName("With Default", null, DomainUtils.DomainKind.IntList);
var fieldWithDefault = FieldInfo.random("With Default", ColumnType.String);
EditListDefinitionPage listEditPage = _listHelper.beginCreateList(getProjectName(), listName);
listEditPage.manuallyDefineFieldsWithAutoIncrementingKey("Key");
listEditPage.addField(new FieldDefinition(fieldWithDefault, ColumnType.String));
listEditPage.addField(fieldWithDefault.getFieldDefinition());
listEditPage.clickSave();

listEditPage = _listHelper.goToEditDesign(listName);
var page = listEditPage.getFieldsPanel()
.expand()
.getField(fieldWithDefault)
.getField(fieldWithDefault.getName())
.clickAdvancedSettings()
.clickDefaultValuesLink();
var input = Locator.tagContainingText("td", "With Default").followingSibling("td").descendant("input").findElement(page.getDriver());
var input = Locator.tagContainingText("td", fieldWithDefault.getLabel()).followingSibling("td")
.descendant("input").findElement(page.getDriver());
setFormElement(input, "42");
clickButton("Save Defaults");
_listHelper.beginAtList(getProjectName(), listName);

DataRegionTable list = new DataRegionTable("query", getDriver());
UpdateQueryRowPage updatePage = list.clickInsertNewRow();
checker().verifyEquals("Default value not as expected ", "42", updatePage.getTextInputValue(fieldWithDefault));
checker().verifyEquals("Default value not as expected ", "42", updatePage.getTextInputValue(fieldWithDefault.getName()));
updatePage.submit();
}

Expand Down Expand Up @@ -1047,7 +1048,7 @@ public void listSelfJoinTest()
final String dummyCol = dummyBase + TRICKY_CHARACTERS;
final String lookupField = "lookupField" + TRICKY_CHARACTERS;
final String lookupSchema = "lists";
final String keyCol = "Key &%<+";
final String keyCol = "Key &%<+\\"; // Issue 54094: Verify key field ending with "\"

log("Issue 6883: test list self join");

Expand Down
1 change: 0 additions & 1 deletion src/org/labkey/test/util/TestUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import org.labkey.remoteapi.CommandException;
import org.labkey.remoteapi.Connection;
import org.labkey.remoteapi.security.CreateUserResponse;
import org.labkey.test.WebDriverWrapper;
import org.labkey.test.WebTestHelper;

Expand Down