modified-common-locator

appsmithorg · Aug 20, 2024 · b41fbe8 · b41fbe8
1 parent bc182d1
commit b41fbe8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts
@@ -298,7 +298,11 @@ describe(
       agHelper.AssertExistingToggleState("Required", "false");
       propPane.TogglePropertyState("Required", "On");
       deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.FORM));
-      cy.get(commonlocators.selectClearButton).should("not.exist");
+      const cancelButton = commonlocators.selectClearButton
+        .split("=")[1]
+        .replace("']", "")
+        .replace("'", "");
+      cy.get(cancelButton).should("not.exist");
     });
   },
 );
diff --git a/app/client/cypress/locators/commonlocators.json b/app/client/cypress/locators/commonlocators.json
@@ -73,7 +73,7 @@
   "singleSelectMenuItem": ".bp3-menu-item.single-select div",
   "singleSelectWidgetMenuItem": ".menu-item-link",
   "singleSelectActiveMenuItem": ".menu-item-active div",
-  "selectClearButton": "selectbutton.btn.cancel",
+  "selectClearButton": "[data-testid='selectbutton.btn.cancel']",
   "selectInputSearch": ".select-popover-wrapper .bp3-input",
   "multiSelectMenuItem": "rc-select-item.rc-select-item-option div",
   "selectMenuItem": ".bp3-menu li>a>div",

diff --git a/app/client/src/widgets/SelectWidget/component/SelectButton.test.tsx b/app/client/src/widgets/SelectWidget/component/SelectButton.test.tsx
@@ -4,6 +4,7 @@ import { fireEvent, render } from "@testing-library/react";
 
 import type { SelectButtonProps } from "./SelectButton";
 import SelectButton from "./SelectButton";
+import commonlocators from "../../../../cypress/locators/commonlocators.json";
 
 // It is necessary to make a mock of the Icon component as the error falls due to React.lazy in importIconImpl
 jest.mock("@design-system/widgets-old", () => {
@@ -60,18 +61,22 @@ describe("SelectButton", () => {
   });
 
   it("should not render cancel button when select widget required is true", () => {
-    const { queryByTestId } = renderComponent({
+    const { container } = renderComponent({
       ...defaultProps,
       isRequired: true,
     });
-    expect(queryByTestId("selectbutton.btn.cancel")).toBeNull();
+    expect(
+      container.querySelector(commonlocators.selectClearButton),
+    ).toBeNull();
   });
 
   it("should render cancel button when select widget required is false", () => {
-    const { getByTestId } = renderComponent({
+    const { container } = renderComponent({
       ...defaultProps,
       isRequired: false,
     });
-    expect(getByTestId("selectbutton.btn.cancel")).not.toBeNull();
+    expect(
+      container.querySelector(commonlocators.selectClearButton),
+    ).not.toBeNull();
   });
 });