Skip to content
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

[bot] Merge 24.11 to develop #2157

Merged
merged 3 commits into from
Nov 26, 2024
Merged

[bot] Merge 24.11 to develop #2157

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
acc5f37
give large excel assay test more time on windows/sql (#2149)
labkey-chrisj Nov 21, 2024
f6152bc
SM Test Fixes (#2146)
labkey-danield Nov 25, 2024
e6ddcea
Merge 24.11 to develop
labkey-teamcity Nov 26, 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
4 changes: 2 additions & 2 deletions src/org/labkey/test/tests/assay/UploadLargeExcelAssayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void testUpload200kRows() throws Exception
clickButton("Save and Finish");

// wait for import complete
waitForPipelineJobsToComplete(1, "200k", false);
waitForPipelineJobsToComplete(1, "200k", false, 12 * 60000);

// export assay1 data to excel
log("exporting samples fields to excel");
Expand All @@ -133,7 +133,7 @@ public void testUpload200kRows() throws Exception
setFormElement(Locator.input("__primaryFile__"), largeExportExcelFile);
clickButton("Save and Finish");

waitForPipelineJobsToComplete(2, "200k take 2", false);
waitForPipelineJobsToComplete(2, "200k take 2", false, 12 * 60000);

var qPage = SourceQueryPage.beginAt(this, getProjectName(), "assay.General.large_assay_2", "Data");
var dataregion = qPage.viewData(Duration.ofSeconds(60));
Expand Down
8 changes: 7 additions & 1 deletion src/org/labkey/test/tests/component/EditableGridTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.labkey.remoteapi.query.InsertRowsCommand;
import org.labkey.test.BaseWebDriverTest;
import org.labkey.test.Locator;
import org.labkey.test.WebDriverWrapper;
import org.labkey.test.categories.Daily;
import org.labkey.test.components.ui.grids.EditableGrid;
import org.labkey.test.pages.test.CoreComponentsTestPage;
Expand Down Expand Up @@ -1444,7 +1445,12 @@ public void testPasteCellValidation()
List<String> expectedWarnings = expectedCellWarnings.get(row);
verifyCellWarning(testGrid, expectedWarnings, row);
}
mouseOver(testGrid.getCell(0, STR_FIELD_NAME)); // dismiss warning popup

// Dismiss warning popup by moving off the grid.
mouseOver(Locator.tagWithClass("a", "brand-logo").findWhenNeeded(getDriver()));

WebDriverWrapper.waitFor(()->!Locator.tagWithClass("div", "popover").findWhenNeeded(getDriver()).isDisplayed(),
"Bad value popup did not go away.", 500);

log("Correct missing required fields should remove corresponding cell warnings");
testGrid.setCellValue(1, REQ_STR_FIELD_NAME + " *", " ");
Expand Down