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
55 changes: 0 additions & 55 deletions src/org/labkey/test/pages/assay/SampleTypeImportPage.java

This file was deleted.

25 changes: 19 additions & 6 deletions src/org/labkey/test/tests/list/ListTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ public void testLongName()
checker().verifyEquals("Default value not as expected ", "42", updatePage.getTextInputValue(fieldWithDefault));
updatePage.submit();
}

/* Issue 51572: Bug with creating a new list by uploading a csv file in "UTF-8 with BOM" format
*/
@Test
Expand Down Expand Up @@ -580,7 +581,7 @@ public void testCustomViews()
setUpList(getProjectName());

goToProjectHome();
clickAndWait(Locator.linkWithText(LIST_NAME_COLORS));
waitAndClickAndWait(Locator.linkWithText(LIST_NAME_COLORS));

log("Test Sort and Filter in Data View");
DataRegionTable region = new DataRegionTable("query", getDriver());
Expand All @@ -595,7 +596,7 @@ public void testCustomViews()
log("Test Customize View");
// Re-navigate to the list to clear filters and sorts
clickTab("List");
clickAndWait(Locator.linkWithText(LIST_NAME_COLORS));
waitAndClickAndWait(Locator.linkWithText(LIST_NAME_COLORS));
_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.removeColumn(_listColGood.getName());
_customizeViewsHelper.addFilter(_listColGood.getName(), "Is Less Than", "10");
Expand Down Expand Up @@ -660,10 +661,19 @@ public void testCustomViews()

log("Test list history");
clickAndWait(Locator.linkWithText("manage lists"));
clickAndWait(Locator.linkWithText("view history"));
checker().wrapAssertion(()->assertTextPresent(":History"));
checker().wrapAssertion(()->assertTextPresent("record was modified", 2)); // An existing list record was modified
DataRegionTable drt = new DataRegionTable.DataRegionFinder(getDriver()).find();
drt.setFilter("Name", "Equals", LIST_NAME_COLORS);
waitFor(()->drt.getDataRowCount()==1,
String.format("DataRegion table did not filter to list %s", LIST_NAME_COLORS), 2_500);
waitAndClickAndWait(Locator.linkWithText("view history"));

// Wait for the header to load on the page.
waitForElementToBeVisible(Locator.tagContainingText("h3", ":History"));

checker().verifyTrue("DataRegions didn't load.",
waitFor(()->new DataRegionTable.DataRegionFinder(getDriver()).findAll().size() == 2, 3_000));

checker().wrapAssertion(()->assertTextPresent("record was modified", 2)); // An existing list record was modified
checker().wrapAssertion(()->assertTextPresent(" was created. The column(s) of domain ", 1));// Create domain and update columns combined into a single event
checker().wrapAssertion(()->assertTextPresent(" were modified.", 7)); // The column(s) of LIST_NAME_COLORS domain were modified
checker().wrapAssertion(()->assertTextPresent("The descriptor of domain", 1)); // The description LIST_NAME_COLORS domain were modified
Expand All @@ -674,13 +684,16 @@ public void testCustomViews()
checker().wrapAssertion(()->assertEquals("details Links", 6/*List Events*/ + 8/*Domain Audit*/, DataRegionTable.detailsLinkLocator().findElements(getDriver()).size()));
checker().wrapAssertion(()->assertEquals("Project Links", 17, DataRegionTable.Locators.table().append(Locator.linkWithText(PROJECT_VERIFY)).findElements(getDriver()).size()));
checker().wrapAssertion(()->assertEquals("List Links", 17, DataRegionTable.Locators.table().append(Locator.linkWithText(LIST_NAME_COLORS)).findElements(getDriver()).size()));
checker().screenShotIfNewError("List_History_Error");

DataRegionTable dataRegionTable = new DataRegionTable("query", getDriver());
dataRegionTable.clickRowDetails(0);
checker().wrapAssertion(()->assertTextPresent("List Item Details"));
checker().wrapAssertion(()->assertTextNotPresent("No details available for this event.", "Unable to find the audit history detail for this event"));
checker().screenShotIfNewError("History_Detail_Error");

clickButton("Done");
clickAndWait(Locator.linkWithText(PROJECT_VERIFY).index(3));
waitAndClickAndWait(Locator.linkWithText(PROJECT_VERIFY).index(3));

log("Test single list web part");
new PortalHelper(this).addWebPart("List - Single");
Expand Down