From b557037c0848ce360efdcf4c2df07c43f8bf9f99 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Wed, 22 Jan 2025 23:17:09 -0800 Subject: [PATCH] Empty grid cell for an integer field should only show "required" message. Mark upgrade tests as disabled so they don't show up in other git tests. --- src/org/labkey/test/tests/ServerUpgradeTest.java | 5 +++-- src/org/labkey/test/tests/component/EditableGridTest.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/org/labkey/test/tests/ServerUpgradeTest.java b/src/org/labkey/test/tests/ServerUpgradeTest.java index c426e28610..5ab12e6f98 100644 --- a/src/org/labkey/test/tests/ServerUpgradeTest.java +++ b/src/org/labkey/test/tests/ServerUpgradeTest.java @@ -6,13 +6,14 @@ import org.labkey.test.BaseWebDriverTest; import org.labkey.test.Locator; import org.labkey.test.WebTestHelper; -import org.labkey.test.categories.Git; +import org.labkey.test.categories.Disabled; import org.openqa.selenium.WebElement; import java.util.Collections; import java.util.List; -@Category({Git.class}) +// Don't run as a git test, explicitly add this test to a suite file. +@Category({Disabled.class}) public class ServerUpgradeTest extends BaseWebDriverTest { diff --git a/src/org/labkey/test/tests/component/EditableGridTest.java b/src/org/labkey/test/tests/component/EditableGridTest.java index f678f9106d..ce4157184d 100644 --- a/src/org/labkey/test/tests/component/EditableGridTest.java +++ b/src/org/labkey/test/tests/component/EditableGridTest.java @@ -1377,7 +1377,7 @@ public void testInputCellValidation() mouseOver(testGrid.getCell(0, "Row")); // dismiss warning popup testGrid.setCellValue(1, REQ_INT_FIELD_NAME + " *", " "); checker().verifyEquals("Cell warning status not as expected at row " + 1 + " for col " + REQ_INT_FIELD_NAME, true, testGrid.hasCellWarning(1, REQ_INT_FIELD_NAME + " *")); - checker().verifyEquals("Cell warning msg not as expected at row " + 1 + " for col " + REQ_INT_FIELD_NAME, "Invalid integer. " + REQ_INT_FIELD_NAME + " is required.", testGrid.getCellPopoverText(1, REQ_INT_FIELD_NAME + " *")); + checker().verifyEquals("Cell warning msg not as expected at row " + 1 + " for col " + REQ_INT_FIELD_NAME, REQ_INT_FIELD_NAME + " is required.", testGrid.getCellPopoverText(1, REQ_INT_FIELD_NAME + " *")); log("Correct values should remove cell warning, keep entering wrong values should update warning"); mouseOver(testGrid.getCell(0, "Row")); // dismiss warning popup