From b191abbc5bb32a0a3c895facdff14d146da9fb74 Mon Sep 17 00:00:00 2001
From: Kos Korchak <97058061+kkorchak@users.noreply.github.com>
Date: Fri, 6 Oct 2023 17:11:57 -0400
Subject: [PATCH] test(): Nested domains cypress test (#8879)

---
 .../src/app/domain/CreateDomainModal.tsx      |  5 +-
 .../nestedDomains/ManageDomainsPageV2.tsx     |  7 ++-
 .../domainNavigator/DomainNode.tsx            |  2 +-
 .../shared/EntityDropdown/EntityDropdown.tsx  |  4 +-
 .../shared/EntityDropdown/MoveDomainModal.tsx |  5 +-
 .../cypress/e2e/domains/nested_domains.js     | 53 +++++++++++++++++++
 6 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js

diff --git a/datahub-web-react/src/app/domain/CreateDomainModal.tsx b/datahub-web-react/src/app/domain/CreateDomainModal.tsx
index ca1bc30596..606444d34b 100644
--- a/datahub-web-react/src/app/domain/CreateDomainModal.tsx
+++ b/datahub-web-react/src/app/domain/CreateDomainModal.tsx
@@ -191,7 +191,10 @@ export default function CreateDomainModal({ onClose, onCreate }: Props) {
                         rules={[{ whitespace: true }, { min: 1, max: 500 }]}
                         hasFeedback
                     >
-                        <Input.TextArea placeholder="A description for your domain" />
+                        <Input.TextArea
+                            placeholder="A description for your domain"
+                            data-testid="create-domain-description"
+                        />
                     </FormItemNoMargin>
                 </FormItemWithMargin>
                 <Collapse ghost>
diff --git a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx b/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx
index 0e5c035df0..b69f0c5458 100644
--- a/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx
+++ b/datahub-web-react/src/app/domain/nestedDomains/ManageDomainsPageV2.tsx
@@ -42,7 +42,12 @@ export default function ManageDomainsPageV2() {
             <OnboardingTour stepIds={[DOMAINS_INTRO_ID, DOMAINS_CREATE_DOMAIN_ID]} />
             <Header>
                 <DomainsTitle />
-                <Button type="primary" id={DOMAINS_CREATE_DOMAIN_ID} onClick={() => setIsCreatingDomain(true)}>
+                <Button
+                    type="primary"
+                    id={DOMAINS_CREATE_DOMAIN_ID}
+                    onClick={() => setIsCreatingDomain(true)}
+                    data-testid="domains-new-domain-button"
+                >
                     <PlusOutlined /> New Domain
                 </Button>
             </Header>
diff --git a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx
index 09c8e13853..bf70bd043f 100644
--- a/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx
+++ b/datahub-web-react/src/app/domain/nestedDomains/domainNavigator/DomainNode.tsx
@@ -103,7 +103,7 @@ export default function DomainNode({ domain, numDomainChildren, domainUrnToHide,
 
     return (
         <>
-            <RowWrapper>
+            <RowWrapper data-testid="domain-list-item">
                 {hasDomainChildren && (
                     <ButtonWrapper>
                         <RotatingTriangle isOpen={isOpen && !isClosing} onClick={toggle} />
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx
index be975249b2..bfb7ff7e54 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx
@@ -203,7 +203,7 @@ function EntityDropdown(props: Props) {
                                 disabled={isMoveDisabled(entityType, entityData, me.platformPrivileges)}
                                 onClick={() => setIsMoveModalVisible(true)}
                             >
-                                <MenuItem>
+                                <MenuItem data-testid="entity-menu-move-button">
                                     <FolderOpenOutlined /> &nbsp;Move
                                 </MenuItem>
                             </StyledMenuItem>
@@ -223,7 +223,7 @@ function EntityDropdown(props: Props) {
                                             : undefined
                                     }
                                 >
-                                    <MenuItem>
+                                    <MenuItem data-testid="entity-menu-delete-button">
                                         <DeleteOutlined /> &nbsp;Delete
                                     </MenuItem>
                                 </Tooltip>
diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx
index cdbf6fdabf..3826f934c1 100644
--- a/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx
+++ b/datahub-web-react/src/app/entity/shared/EntityDropdown/MoveDomainModal.tsx
@@ -67,6 +67,7 @@ function MoveDomainModal(props: Props) {
     return (
         <Modal
             title="Move"
+            data-testid="move-domain-modal"
             visible
             onCancel={onClose}
             footer={
@@ -74,7 +75,9 @@ function MoveDomainModal(props: Props) {
                     <Button onClick={onClose} type="text">
                         Cancel
                     </Button>
-                    <Button onClick={moveDomain}>Move</Button>
+                    <Button onClick={moveDomain} data-testid="move-domain-modal-move-button">
+                        Move
+                    </Button>
                 </>
             }
         >
diff --git a/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js b/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
new file mode 100644
index 0000000000..a2d4de0f51
--- /dev/null
+++ b/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
@@ -0,0 +1,53 @@
+const domainName = "CypressNestedDomain";
+const domainDescription = "CypressNestedDomainDescription";
+
+describe("nested domains test", () => {
+
+    it("create a domain, move under parent, remove domain", () => {
+        // Create a new domain without a parent
+        cy.loginWithCredentials();
+        cy.goToDomainList();
+        cy.clickOptionWithTestId("domains-new-domain-button");
+        cy.get('[data-testid="create-domain-name"]').click().type(domainName);
+        cy.get('[data-testid="create-domain-description"]').click().type(domainDescription);
+        cy.clickOptionWithTestId("create-domain-button");
+        cy.waitTextVisible(domainName);
+
+        // Ensure the new domain has no parent in the navigation sidebar
+        cy.waitTextVisible(domainDescription);
+
+        // Move a domain from the root level to be under a parent domain
+        cy.clickOptionWithText(domainName);
+        cy.openThreeDotDropdown();
+        cy.clickOptionWithTestId("entity-menu-move-button");
+        cy.get('[data-testid="move-domain-modal"]').contains("Marketing").click({force: true});
+        cy.get('[data-testid="move-domain-modal"]').contains("Marketing").should("be.visible");
+        cy.clickOptionWithTestId("move-domain-modal-move-button").wait(5000);
+
+        // Wnsure domain is no longer on the sidebar navigator at the top level but shows up under the parent
+        cy.goToDomainList();
+        cy.ensureTextNotPresent(domainName);
+        cy.ensureTextNotPresent(domainDescription);
+        cy.waitTextVisible("1 sub-domain");
+
+        // Move a domain from under a parent domain to the root level
+        cy.get('[data-testid="domain-list-item"]').contains("Marketing").prev().click();
+        cy.clickOptionWithText(domainName);
+        cy.openThreeDotDropdown();
+        cy.clickOptionWithTestId("entity-menu-move-button");
+        cy.clickOptionWithTestId("move-domain-modal-move-button").wait(5000);
+        cy.goToDomainList();
+        cy.waitTextVisible(domainName);
+        cy.waitTextVisible(domainDescription);
+
+        // Delete a domain
+        cy.clickOptionWithText(domainName).wait(3000);
+        cy.openThreeDotDropdown();
+        cy.clickOptionWithTestId("entity-menu-delete-button");
+        cy.waitTextVisible("Are you sure you want to remove this Domain?");
+        cy.clickOptionWithText("Yes");
+        cy.waitTextVisible("Deleted Domain!");
+        cy.ensureTextNotPresent(domainName);
+        cy.ensureTextNotPresent(domainDescription);
+    });
+});
\ No newline at end of file