From 18569de9bb51aaa5f8f0ce9e009ec327efd4868d Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Mon, 8 Dec 2025 11:38:25 -0800 Subject: [PATCH 1/2] Avoid some UI test issues. --- src/org/labkey/test/tests/SampleTypeRenameTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/org/labkey/test/tests/SampleTypeRenameTest.java b/src/org/labkey/test/tests/SampleTypeRenameTest.java index f75a3fe7be..a63cb9f73d 100644 --- a/src/org/labkey/test/tests/SampleTypeRenameTest.java +++ b/src/org/labkey/test/tests/SampleTypeRenameTest.java @@ -21,6 +21,7 @@ import org.labkey.test.util.TestDataGenerator; import org.labkey.test.util.exp.SampleTypeAPIHelper; import org.labkey.test.util.search.SearchAdminAPIHelper; +import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import java.io.IOException; @@ -106,6 +107,11 @@ public void testSampleTypeFieldRename() throws IOException, CommandException SearchAdminAPIHelper.waitForIndexer(); goToProjectHome(); + + // Sometimes sample types created by the API don't immediately show up in the UI, a refresh helps. + refresh(); + waitForElement(Locator.linkContainingText(sampleTypeName)); + SampleTypeHelper sampleHelper = new SampleTypeHelper(this); UpdateSampleTypePage updatePage = sampleHelper.goToEditSampleType(sampleTypeName); updatePage.getFieldsPanel().getField(FIELD_INT).setName(FIELD_INT + " Updated"); @@ -173,6 +179,9 @@ public void testCustomViewWithSampleTypeRename() .verifyTrue(String.format("Doesn't look like custom view '%s' was saved. Fatal error.", customViewName), menuItems.contains(customViewName)); + // Dismiss the menu so it doesn't get in the way. + menu.findVisibleMenuItems().get(0).sendKeys(Keys.ESCAPE); + log(String.format("Rename the sample type to '%s'.", SAMPLE_TYPE_NAME_UPDATED)); clickAndWait(editButton); From 6b0f2c353f137ae69d27e7f0aa424f766ceed5b4 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Mon, 8 Dec 2025 16:05:16 -0800 Subject: [PATCH 2/2] Use the collapse method. --- src/org/labkey/test/tests/SampleTypeRenameTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/SampleTypeRenameTest.java b/src/org/labkey/test/tests/SampleTypeRenameTest.java index a63cb9f73d..13168753d7 100644 --- a/src/org/labkey/test/tests/SampleTypeRenameTest.java +++ b/src/org/labkey/test/tests/SampleTypeRenameTest.java @@ -180,7 +180,7 @@ public void testCustomViewWithSampleTypeRename() menuItems.contains(customViewName)); // Dismiss the menu so it doesn't get in the way. - menu.findVisibleMenuItems().get(0).sendKeys(Keys.ESCAPE); + menu.collapse(); log(String.format("Rename the sample type to '%s'.", SAMPLE_TYPE_NAME_UPDATED));