@vtex/faststore-plugin-buyer-portal 1.1.93 → 1.1.94

package/cypress/integration/locations.test.ts

@@ -1,5 +1,5 @@
 import { TEST_CONFIG, TEST_DATA } from "../constants";
-import { clickConfirmButton } from "../shared";
+import { clickConfirmButton, generateRandomString } from "../shared";
 import {
   clickAddressTab,
   goToAddressPage,
@@ -8,7 +8,14 @@ import {
   openAddressActionsDropdown,
 } from "../support/addressHelper";
 
-describe("Locations", () => {
+let ADDRESS_NAME: string;
+
+describe("Locations", { retries: 2 }, () => {
+  before(() => {
+    ADDRESS_NAME = `${
+      TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME
+    } ${generateRandomString()}`;
+  });
   beforeEach(() => {
     cy.login();
     // Visit the homepage
@@ -29,9 +36,7 @@ describe("Locations", () => {
       });
 
     // Address Name
-    cy.get("[data-fs-bp-autocomplete-dropdown]")
-      .eq(1)
-      .type(TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME);
+    cy.get("[data-fs-bp-autocomplete-dropdown]").eq(1).type(ADDRESS_NAME);
 
     // Street
     cy.get("[class=street-address]").type(TEST_DATA.ADDRESS.NEW_ADDRESS_STREET);
@@ -66,15 +71,9 @@ describe("Locations", () => {
       });
 
     clickConfirmButton();
+    cy.contains("Address added successfully").should("be.visible");
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.LONG_DELAY);
-
-    // Check to see if address was created
-    cy.get("[data-fs-addresses-table]")
-      .contains(TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME)
-      .should("be.visible");
-
-    openAddressActionsDropdown(TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME);
+    openAddressActionsDropdown(ADDRESS_NAME);
 
     // Inside the Action dropdown, open locations drawer
     cy.contains("Add Locations").click();
@@ -92,10 +91,12 @@ describe("Locations", () => {
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-location-form]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
   });
   it("Enter addressDetails and add locations", () => {
-    navigateToAddressByName(TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME);
+    navigateToAddressByName(ADDRESS_NAME);
 
     clickAddressTab("Locations");
 
@@ -119,16 +120,14 @@ describe("Locations", () => {
 
     clickConfirmButton();
 
-    cy.reload();
-    clickAddressTab("Locations");
+    cy.get("[data-fs-bp-location-form]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
-    cy.contains(TEST_DATA.LOCATIONS.FIRST_LOCATION).should("be.visible");
-    cy.contains(TEST_DATA.LOCATIONS.SECOND_LOCATION).should("be.visible");
-    cy.contains(TEST_DATA.LOCATIONS.THIRD_LOCATION).should("be.visible");
-    cy.contains(TEST_DATA.LOCATIONS.FOURTH_LOCATION).should("be.visible");
+    cy.contains("Locations added successfully").should("exist");
   });
   it("Enter addressDetails and edit location", () => {
-    navigateToAddressByName(TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME);
+    navigateToAddressByName(ADDRESS_NAME);
 
     clickAddressTab("Locations");
 
@@ -140,21 +139,20 @@ describe("Locations", () => {
       cy.get("[data-fs-bp-input-text-input]")
         .clear()
         .type(TEST_DATA.LOCATIONS.EDITED_LOCATION);
-
-      // Save
-      clickConfirmButton();
-
-      // Confirm shared
-      clickConfirmButton();
     });
+    // Save
+    clickConfirmButton();
 
-    cy.reload();
-    clickAddressTab("Locations");
+    // Confirm shared
+    clickConfirmButton();
+    cy.get("[data-fs-bp-location-form]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
-    cy.contains(TEST_DATA.LOCATIONS.EDITED_LOCATION).should("be.visible");
+    cy.contains("Location edited successfully").should("exist");
   });
   it("Delete one location", () => {
-    navigateToAddressByName(TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME);
+    navigateToAddressByName(ADDRESS_NAME);
 
     clickAddressTab("Locations");
 
@@ -175,26 +173,24 @@ describe("Locations", () => {
 
     cy.get('[data-fs-bp-basic-drawer-button-variant="danger"').click();
 
-    cy.reload();
+    cy.get("[data-fs-bp-location-form]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
-    cy.contains(TEST_DATA.LOCATIONS.EDITED_LOCATION).should("not.exist");
+    cy.contains("Location removed successfully").should("exist");
   });
   it("Delete Address Test", () => {
-    openAddressActionsDropdown(TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME);
+    openAddressActionsDropdown(ADDRESS_NAME);
 
     cy.contains("Delete").click();
 
     // Fill check to allow deletion
-    cy.get("[class=address-name-confirmation]").type(
-      TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME
-    );
+    cy.get("[class=address-name-confirmation]").type(ADDRESS_NAME);
 
     cy.get('[data-fs-bp-basic-drawer-button-variant="danger"]').click();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-    cy.reload();
-
-    // Check if address has been deleted
-    cy.contains(TEST_DATA.LOCATIONS.LOCATION_ADDRESS_NAME).should("not.exist");
+    cy.contains("Address deleted successfully", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("be.visible");
   });
 });

package/cypress/integration/organizational-units.test.ts

@@ -1,4 +1,5 @@
 import { TEST_CONFIG, TEST_DATA } from "../constants";
+import { generateRandomString, useInternalSearch } from "../shared";
 
 const verifyOrgUnitState = (
   orgUnitName: string,
@@ -6,10 +7,19 @@ const verifyOrgUnitState = (
   maxRetries = TEST_CONFIG.RETRY.DEFAULT_MAX_ATTEMPTS
 ) => {
   const verifyAndRetry = (currentRetry = 0) => {
-    cy.get("[data-fs-org-units-section]").should("exist");
+    if (shouldExist) {
+      cy.get("[data-fs-org-units-section]", {
+        timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+      }).should("exist");
+
+      useInternalSearch(orgUnitName);
+    } else {
+      cy.get("[data-fs-buyer-portal-internal-search-input]").clear();
+    }
 
     cy.get("body").then(($body) => {
       const exists = $body.text().includes(orgUnitName);
+      cy.log("Searching for Org Unit", orgUnitName, exists);
       if (exists !== shouldExist && currentRetry < maxRetries) {
         cy.log(`Retry attempt ${currentRetry + 1} of ${maxRetries}`);
         cy.wait(TEST_CONFIG.TIMEOUTS.RETRY_DELAY);
@@ -28,29 +38,43 @@ const verifyOrgUnitState = (
 
   // Final verification
   if (shouldExist) {
-    cy.contains(orgUnitName).should("be.visible");
+    cy.contains(orgUnitName).scrollIntoView().should("be.visible");
   } else {
     cy.contains(orgUnitName).should("not.exist");
   }
 };
 
-describe("Organizational Units", () => {
+let UNIT_NAME: string;
+let EDITED_UNIT_NAME: string;
+
+describe("Organizational Units", { retries: 2 }, () => {
+  before(() => {
+    UNIT_NAME = `${TEST_DATA.ORG_UNITS.NEW_UNIT} ${generateRandomString()}`;
+    EDITED_UNIT_NAME = `Edited ${UNIT_NAME}`;
+  });
   beforeEach(() => {
     cy.login();
-  });
-
-  it("Should load successfully", () => {
     // Visit the homepage
     cy.visit(TEST_CONFIG.ROUTES.BUYER_PORTAL);
+  });
 
+  it("Should load successfully", () => {
     // Navigate to organizational units page
     cy.contains("Organizational Units").click();
 
     // Wait for the page to be fully loaded by checking for specific elements
-    cy.get("[data-fs-org-units-section]").should("exist");
-    cy.get("[data-fs-hierarchy-tree-wrapper]").should("exist");
-
-    cy.contains(TEST_DATA.ORG_UNITS.CHILD_1).should("be.visible");
+    cy.get("[data-fs-org-units-section]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("exist");
+    cy.get("[data-fs-hierarchy-tree-wrapper]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("exist");
+
+    // Make sure that a change in order doesn't break the test
+    useInternalSearch(TEST_DATA.ORG_UNITS.CHILD_1);
+    cy.contains(TEST_DATA.ORG_UNITS.CHILD_1)
+      .scrollIntoView()
+      .should("be.visible");
 
     // Check if the page loads without errors
     cy.window().should("exist");
@@ -58,17 +82,20 @@ describe("Organizational Units", () => {
   });
 
   it("Should load org unit details page successfully", () => {
-    // Visit the homepage and navigate to org units
-    cy.visit(TEST_CONFIG.ROUTES.BUYER_PORTAL);
     cy.contains("Organizational Units").click();
 
     // Wait for the org units page to be fully loaded
-    cy.get("[data-fs-org-units-section]").should("exist");
-    cy.get("[data-fs-hierarchy-tree-wrapper]").should("exist");
+    cy.get("[data-fs-org-units-section]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("exist");
+    cy.get("[data-fs-hierarchy-tree-wrapper]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("exist");
 
     // Check if the organizational units tree is visible and expand nodes
     cy.get("[data-fs-org-unit-item-name]")
       .contains(TEST_DATA.ORG_UNITS.CHILD_2)
+      .scrollIntoView()
       .should("be.visible")
       .parents("[data-fs-org-unit-item]")
       .find("[data-fs-org-unit-item-toggle]")
@@ -78,10 +105,12 @@ describe("Organizational Units", () => {
     // Wait for the child nodes to be visible after expanding
     cy.get("[data-fs-hierarchy-tree-structure]")
       .contains("[data-fs-org-unit-item-name]", TEST_DATA.ORG_UNITS.CHILD_2_1)
+      .scrollIntoView()
       .should("be.visible");
 
     cy.get("[data-fs-org-unit-item-name]")
       .contains("Org Unit for E2E Tests Child 1")
+      .scrollIntoView()
       .should("be.visible")
       .parents("[data-fs-org-unit-item]")
       .find("[data-fs-org-unit-item-toggle]")
@@ -91,17 +120,22 @@ describe("Organizational Units", () => {
     // Wait for the child nodes to be visible after expanding
     cy.get("[data-fs-hierarchy-tree-structure]")
       .contains("[data-fs-org-unit-item-name]", TEST_DATA.ORG_UNITS.CHILD_1_1)
+      .scrollIntoView()
       .should("be.visible");
   });
 
   it("Should display org unit details page correctly", () => {
-    // Visit the homepage and navigate to org units
-    cy.visit(TEST_CONFIG.ROUTES.BUYER_PORTAL);
     cy.contains("Organizational Units").click();
 
     // Wait for the org units page to be fully loaded
-    cy.get("[data-fs-org-units-section]").should("exist");
-    cy.get("[data-fs-hierarchy-tree-wrapper]").should("exist");
+    cy.get("[data-fs-org-units-section]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("exist");
+    cy.get("[data-fs-hierarchy-tree-wrapper]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("exist");
+
+    useInternalSearch(TEST_DATA.ORG_UNITS.CHILD_1);
 
     // Click on an org unit to go to details page
     cy.get("[data-fs-org-unit-item-name]")
@@ -150,9 +184,6 @@ describe("Organizational Units", () => {
   });
 
   it("Should perform CRUD operations on organization unit", () => {
-    // Visit the org unit details page directly
-    cy.visit(TEST_CONFIG.ROUTES.BUYER_PORTAL);
-
     // Wait for the page to be fully loaded
     cy.get("[data-fs-org-units-details-section]").should("exist");
 
@@ -171,7 +202,7 @@ describe("Organizational Units", () => {
       .contains("Name")
       .parent()
       .find("[data-fs-bp-input-text-input]")
-      .type(TEST_DATA.ORG_UNITS.NEW_UNIT);
+      .type(UNIT_NAME);
 
     // Click on Add button and verify creation
     cy.contains("button", "Add").click();
@@ -179,12 +210,15 @@ describe("Organizational Units", () => {
     // Navigate to organizational units page
     cy.contains("Organizational Units").click();
 
+    cy.get("[data-fs-hierarchy-tree-wrapper]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("be.visible");
     // Verify the org unit was created
-    verifyOrgUnitState(TEST_DATA.ORG_UNITS.NEW_UNIT, true);
+    verifyOrgUnitState(UNIT_NAME, true);
 
     // Click on the more actions button for renaming
     cy.get("[data-fs-org-unit-item-name]")
-      .contains(TEST_DATA.ORG_UNITS.NEW_UNIT)
+      .contains(UNIT_NAME)
       .parents("[data-fs-org-unit-item]")
       .find("[data-fs-bp-basic-dropdown-menu-trigger]")
       .click();
@@ -194,19 +228,20 @@ describe("Organizational Units", () => {
 
     // Verify the rename drawer is open and type the new name
     cy.contains("Edit organization unit").should("be.visible");
-    cy.get("[data-fs-bp-input-text-input]")
-      .clear()
-      .type(TEST_DATA.ORG_UNITS.EDITED_UNIT);
+    cy.get("[data-fs-bp-input-text-input]").clear().type(EDITED_UNIT_NAME);
 
     // Click on Save button and verify the rename
     cy.contains("button", "Save").click();
 
+    cy.get("[data-fs-bp-update-org-unit-drawer]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("not.exist");
     // Verify the org unit was renamed
-    verifyOrgUnitState(TEST_DATA.ORG_UNITS.EDITED_UNIT, true);
+    verifyOrgUnitState(EDITED_UNIT_NAME, true);
 
     // Click on the more actions button for deleting
     cy.get("[data-fs-org-unit-item-name]")
-      .contains(TEST_DATA.ORG_UNITS.EDITED_UNIT)
+      .contains(EDITED_UNIT_NAME)
       .parents("[data-fs-org-unit-item]")
       .find("[data-fs-bp-basic-dropdown-menu-trigger]")
       .click();
@@ -216,14 +251,16 @@ describe("Organizational Units", () => {
 
     // Verify the delete drawer is open and type the org unit name to confirm
     cy.contains("Delete organizational unit").should("be.visible");
-    cy.get("[data-fs-bp-input-text-input]").type(
-      TEST_DATA.ORG_UNITS.EDITED_UNIT
-    );
+    cy.get("[data-fs-bp-input-text-input]").type(EDITED_UNIT_NAME);
 
     // Click on Delete button and verify deletion
     cy.contains("button", "Delete").click();
 
+    cy.get("[data-fs-bp-delete-org-unit-drawer]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
+
     // Verify the org unit was deleted
-    verifyOrgUnitState(TEST_DATA.ORG_UNITS.EDITED_UNIT, false);
+    verifyOrgUnitState(EDITED_UNIT_NAME, false);
   });
 });

package/cypress/integration/recipients.test.ts

@@ -1,5 +1,5 @@
 import { TEST_CONFIG, TEST_DATA } from "../constants";
-import { clickConfirmButton } from "../shared";
+import { clickConfirmButton, generateRandomString } from "../shared";
 import {
   clickAddressTab,
   goToAddressPage,
@@ -8,7 +8,14 @@ import {
   openAddressActionsDropdown,
 } from "../support/addressHelper";
 
+let ADDRESS_NAME: string;
+
 describe("Recipients", () => {
+  before(() => {
+    ADDRESS_NAME = `${
+      TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME
+    } ${generateRandomString()}`;
+  });
   beforeEach(() => {
     cy.login();
 
@@ -30,9 +37,7 @@ describe("Recipients", () => {
       });
 
     // Address Name
-    cy.get("[data-fs-bp-autocomplete-dropdown]")
-      .eq(1)
-      .type(TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME);
+    cy.get("[data-fs-bp-autocomplete-dropdown]").eq(1).type(ADDRESS_NAME);
 
     // Street
     cy.get("[class=street-address]").type(TEST_DATA.ADDRESS.NEW_ADDRESS_STREET);
@@ -68,14 +73,8 @@ describe("Recipients", () => {
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.LONG_DELAY);
-
-    // Check to see if address was created
-    cy.get("[data-fs-addresses-table]")
-      .contains(TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME)
-      .should("be.visible");
-
-    openAddressActionsDropdown(TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME);
+    cy.contains("Address added successfully").should("be.visible");
+    openAddressActionsDropdown(ADDRESS_NAME);
 
     // Inside the Action dropdown, open recipients drawer
     cy.contains("Add Recipients").click();
@@ -101,10 +100,12 @@ describe("Recipients", () => {
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-recipients-form]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("not.exist");
   });
   it("Enter addressDetails and add recipients", () => {
-    navigateToAddressByName(TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME);
+    navigateToAddressByName(ADDRESS_NAME);
 
     clickAddressTab("Recipients");
 
@@ -138,20 +139,14 @@ describe("Recipients", () => {
 
     clickConfirmButton();
 
-    cy.reload();
-    clickAddressTab("Recipients");
+    cy.get("[data-fs-bp-recipients-form]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("not.exist");
 
-    cy.contains(TEST_DATA.RECIPIENTS.FIRST_RECIPIENT_NAME).should("be.visible");
-    cy.contains(TEST_DATA.RECIPIENTS.SECOND_RECIPIENT_NAME).should(
-      "be.visible"
-    );
-    cy.contains(TEST_DATA.RECIPIENTS.THIRD_RECIPIENT_NAME).should("be.visible");
-    cy.contains(TEST_DATA.RECIPIENTS.FOURTH_RECIPIENT_NAME).should(
-      "be.visible"
-    );
+    cy.contains("Recipients added successfully").should("exist");
   });
   it("Enter addressDetails and edit recipients", () => {
-    navigateToAddressByName(TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME);
+    navigateToAddressByName(ADDRESS_NAME);
 
     clickAddressTab("Recipients");
 
@@ -170,17 +165,14 @@ describe("Recipients", () => {
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-
-    cy.reload();
-    clickAddressTab("Recipients");
-
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-recipients-form]", {
+      timeout: TEST_CONFIG.TIMEOUTS.LONG_DELAY,
+    }).should("not.exist");
 
-    cy.contains(TEST_DATA.RECIPIENTS.EDITED_RECIPIENT_NAME).should("exist");
+    cy.contains("Recipient edited successfully").should("exist");
   });
   it("Delete one recipient", () => {
-    navigateToAddressByName(TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME);
+    navigateToAddressByName(ADDRESS_NAME);
 
     clickAddressTab("Recipients");
 
@@ -201,28 +193,24 @@ describe("Recipients", () => {
 
     cy.get('[data-fs-bp-basic-drawer-button-variant="danger"').click();
 
-    cy.reload();
+    cy.get("[data-fs-bp-remove-recipient-form]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
-    cy.contains(TEST_DATA.RECIPIENTS.EDITED_RECIPIENT_NAME).should("not.exist");
+    cy.contains("Recipient deleted successfully").should("exist");
   });
   it("Delete Address Test", () => {
-    openAddressActionsDropdown(TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME);
+    openAddressActionsDropdown(ADDRESS_NAME);
 
     cy.contains("Delete").click();
 
     // Fill check to allow deletion
-    cy.get("[class=address-name-confirmation]").type(
-      TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME
-    );
+    cy.get("[class=address-name-confirmation]").type(ADDRESS_NAME);
 
     cy.get('[data-fs-bp-basic-drawer-button-variant="danger"]').click();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-    cy.reload();
-
-    // Check if address has been deleted
-    cy.contains(TEST_DATA.RECIPIENTS.RECIPIENTS_ADDRESS_NAME).should(
-      "not.exist"
-    );
+    cy.contains("Address deleted successfully", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("be.visible");
   });
 });