Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.nio.file.AccessDeniedException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;

/**
* Issue 54156: Regression test to ensure a reasonable error message is shown when an assay design references
Expand All @@ -40,10 +41,9 @@ public void testMissingParentDirectoryRegression() throws Exception
TestFileUtils.writeFile(transformFile, transformContent);

// Create a General assay and add the transform by absolute path (not upload)
var protocolResponse = new GeneralAssayDesign(assayName).createAssay(getProjectName(), createDefaultConnection());
var protocolResponse = new GeneralAssayDesign(assayName).setBatchFields(List.of(), false).createAssay(getProjectName(), createDefaultConnection());
var assayDesignerPage = ReactAssayDesignerPage.beginAt(this, getProjectName(), protocolResponse.getProtocolId(),
"general", getURL().toString());
assayDesignerPage.goToBatchFields().removeAllFields(true);
"general", "");
// add by path so the absolute path is stored; this allows reproducing the missing parent dir scenario
assayDesignerPage.addTransformScript(transformFile);
assayDesignerPage.clickSave();
Expand Down Expand Up @@ -78,7 +78,6 @@ public void testMissingParentDirectoryRegression() throws Exception
1\tP1\timport after parent deleted
""";

clickAndWait(Locator.linkWithText(assayName));
new AssayRunsPage(getDriver()).getTable().clickHeaderButtonAndWait("Import Data");
var importPage = new AssayImportPage(getDriver());
importPage.setNamedInputText("Name", "missingParentImport");
Expand Down
11 changes: 9 additions & 2 deletions src/org/labkey/test/tests/list/ListTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,11 @@ public void testCustomViews()

customizeURLTest();
crossContainerLookupTest();

// Prevent crawler errors after the list is deleted
// A Query WebPart for a missing query contains links that will 404
goToProjectHome();
new PortalHelper(this).removeAllWebParts();
}

/* Issue 23487: add regression coverage for batch insert into list with multiple errors
Expand Down Expand Up @@ -1128,8 +1133,10 @@ private void filterTest()
clickProject(PROJECT_VERIFY);

PortalHelper portalHelper = new PortalHelper(this);
portalHelper.addQueryWebPart(null, "lists", LIST_NAME_COLORS, null);
portalHelper.addQueryWebPart(null, "lists", LIST_NAME_COLORS, null);
portalHelper.doInAdminMode(ph -> {
portalHelper.addQueryWebPart(null, "lists", LIST_NAME_COLORS, null);
portalHelper.addQueryWebPart(null, "lists", LIST_NAME_COLORS, null);
});

log("Test that the right filters are present for each type");
DataRegionTable region = new DataRegionTable("qwp3", getDriver());
Expand Down
Loading