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

package/cypress/constants.ts

@@ -48,12 +48,8 @@ export const TEST_DATA = {
     },
     USER_NAME_FOR_ROLES: "User for Test Roles",
     NEW_USER: {
-      NAME: `New User ${Date.now().toString(36)}-${Math.random()
-        .toString(36)
-        .substring(2, 5)}`,
-      EMAIL: `new_user+e2e_test${Date.now().toString(36)}-${Math.random()
-        .toString(36)
-        .substring(2, 5)}@vtex.com`,
+      NAME: "New User",
+      EMAIL: "new_user+e2e_test@vtex.com",
       ROLE: "Buyer",
     },
     USER_FROM_OTHER_ORG_UNIT: {
@@ -83,7 +79,6 @@ export const TEST_DATA = {
     NO_ALLOCATION_MESSAGE: "No allocations yet",
   },
   ADDRESS: {
-    EXISTING_ADDRESS: "Existing Test Address",
     NEW_ADDRESS_NAME: "VTEX RJ",
     NEW_ADDRESS_STREET: "Praia de Botafogo, 300",
     EDIT_ADDRESS_STREET: "Praia de Botafogo, 400",
@@ -93,7 +88,7 @@ export const TEST_DATA = {
     NEW_ADDRESS_POSTAL_CODE: "22250-905",
   },
   LOCATIONS: {
-    LOCATION_ADDRESS_NAME: "ADDRESS FOR LOCATION TEST",
+    LOCATION_ADDRESS_NAME: "LOCATIONS",
     FIRST_LOCATION: "Location 1",
     SECOND_LOCATION: "Location 2",
     THIRD_LOCATION: "Location 3",
@@ -101,7 +96,7 @@ export const TEST_DATA = {
     EDITED_LOCATION: "Edited Location",
   },
   RECIPIENTS: {
-    RECIPIENTS_ADDRESS_NAME: "ADDRESS FOR RECIPIENTS TESTS",
+    RECIPIENTS_ADDRESS_NAME: "RECIPIENTS",
     FIRST_RECIPIENT_NAME: "First Recipient",
     RECIPIENT_PHONE: "9999999999",
     SECOND_RECIPIENT_NAME: "Second Recipient",

package/cypress/integration/addresses.test.ts

@@ -1,5 +1,9 @@
 import { TEST_CONFIG, TEST_DATA } from "../constants";
-import { clickConfirmButton } from "../shared";
+import {
+  clickConfirmButton,
+  generateRandomString,
+  useInternalSearch,
+} from "../shared";
 import {
   goToAddressPage,
   navigateToAddressByName,
@@ -7,7 +11,15 @@ import {
   openAddressActionsDropdown,
 } from "../support/addressHelper";
 
-describe("Address Page", () => {
+let ADDRESS_NAME: string;
+
+describe("Address Page", { retries: 2 }, () => {
+  before(() => {
+    // By using random address names, we stop runs from interfering with each other
+    ADDRESS_NAME = `${
+      TEST_DATA.ADDRESS.NEW_ADDRESS_NAME
+    } ${generateRandomString()}`;
+  });
   beforeEach(() => {
     cy.login();
 
@@ -17,11 +29,6 @@ describe("Address Page", () => {
     goToAddressPage(TEST_DATA.PROFILE.TEST_CONTRACT_NAME);
   });
   it("Should load current addresses, create a new one and be able to see it's details", () => {
-    // Check Existing Address
-    cy.get("[data-fs-addresses-table]").within(() => {
-      cy.contains(TEST_DATA.ADDRESS.EXISTING_ADDRESS).should("exist");
-    });
-
     openCreateAddressDrawer();
 
     // Fill The Address Form
@@ -34,9 +41,7 @@ describe("Address Page", () => {
       });
 
     // Address Name
-    cy.get("[data-fs-bp-autocomplete-dropdown]")
-      .eq(1)
-      .type(TEST_DATA.ADDRESS.NEW_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);
@@ -71,23 +76,14 @@ describe("Address Page", () => {
       });
 
     clickConfirmButton();
-
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-
-    //Sometimes masterdata has cache, the reload helps with that
-    cy.reload();
-
-    // Check to see if address was created
-    cy.get("[data-fs-addresses-table]")
-      .contains(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME)
-      .should("be.visible");
+    cy.contains("Address added successfully").should("be.visible");
   });
   it("Should be able to edit street in specific Address via address details", () => {
     // Navigate to Address Details
-    navigateToAddressByName(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME);
+    navigateToAddressByName(ADDRESS_NAME);
 
     // // Check if sections are rendered correctly
-    cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME).should("be.visible");
+    cy.contains(ADDRESS_NAME).should("be.visible");
     cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_STREET).should("be.visible");
     cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_COMPLEMENT).should("be.visible");
     cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_POSTAL_CODE).should("be.visible");
@@ -95,26 +91,24 @@ describe("Address Page", () => {
     // Open Edit Drawer
     cy.get("[data-fs-address-details-button]").click();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-
     // Edit street
     cy.get("[class=street-address]")
       .clear()
       .type(TEST_DATA.ADDRESS.EDIT_ADDRESS_STREET);
 
     clickConfirmButton();
+    cy.contains("Address updated successfully").should("be.visible");
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
     cy.reload();
 
     // Check to see if information is edited
-    cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME).should("be.visible");
+    cy.contains(ADDRESS_NAME).should("be.visible");
     cy.contains(TEST_DATA.ADDRESS.EDIT_ADDRESS_STREET).should("be.visible");
     cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_COMPLEMENT).should("be.visible");
     cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_POSTAL_CODE).should("be.visible");
   });
   it("Should be able to edit the address from the address list page", () => {
-    openAddressActionsDropdown(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME);
+    openAddressActionsDropdown(ADDRESS_NAME);
 
     cy.contains("Edit details").click();
 
@@ -124,42 +118,37 @@ describe("Address Page", () => {
       .type(TEST_DATA.ADDRESS.NEW_ADDRESS_STREET);
 
     clickConfirmButton();
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.contains("Address updated successfully").should("be.visible");
   });
 
   it("Should be able to set the address as default", () => {
-    openAddressActionsDropdown(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME);
+    openAddressActionsDropdown(ADDRESS_NAME);
 
     cy.contains("Set as default").click();
+    cy.contains("Setting the default address...").should("be.visible");
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-
+    useInternalSearch(ADDRESS_NAME);
     // Check to see if is set as default
     cy.get("[data-fs-addresses-table]")
-      .contains(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME)
+      .contains(ADDRESS_NAME)
       .parent()
       .parent()
       .get("[data-fs-bp-table-row-default-icon]")
       .should("be.visible");
   });
   it("Should be able to Remove the address from the unit", () => {
-    openAddressActionsDropdown(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME);
+    openAddressActionsDropdown(ADDRESS_NAME);
 
     // Inside the Action dropdown, remove from unit
     cy.contains("Remove from Unit").click();
 
     clickConfirmButton();
-
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-    cy.reload();
-
-    // Check to see if the address has been removed
-    cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME).should("not.exist");
+    cy.contains("Address removed successfully").should("be.visible");
   });
 
   it("Should be able to Add existing Address", () => {
     // Check to see if address is really absent
-    cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME).should("not.exist");
+    cy.contains(ADDRESS_NAME).should("not.exist");
 
     openCreateAddressDrawer();
 
@@ -167,39 +156,34 @@ describe("Address Page", () => {
     cy.get('[data-fs-bp-input-text="true"]')
       .eq(1)
       .should("be.visible")
-      .type(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME, { delay: 500 });
+      .type(ADDRESS_NAME, { delay: 500 });
 
     // Select existing address
-    cy.get('[data-fs-bp-autocomplete-dropdown-menu="true"]')
-      .contains(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME)
+    cy.get('[data-fs-bp-autocomplete-dropdown-menu="bottom"]')
+      .contains(ADDRESS_NAME)
       .should("exist")
       .click();
 
     clickConfirmButton();
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-
-    cy.reload();
+    cy.contains("Address added successfully").should("be.visible");
 
+    useInternalSearch(ADDRESS_NAME);
     // Check to see if address has been added
-    cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME).should("be.visible");
+    cy.contains(ADDRESS_NAME).should("be.visible");
   });
 
   it("Should be able to delete the address", () => {
-    openAddressActionsDropdown(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME);
+    openAddressActionsDropdown(ADDRESS_NAME);
 
     cy.contains("Delete").click();
 
     // Fill check to allow deletion
-    cy.get("[class=address-name-confirmation]").type(
-      TEST_DATA.ADDRESS.NEW_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();
+    cy.contains("Address deleted successfully").should("be.visible");
 
     // Check if address has been deleted
-    cy.contains(TEST_DATA.ADDRESS.NEW_ADDRESS_NAME).should("not.exist");
+    cy.contains(ADDRESS_NAME).should("not.exist");
   });
 });

package/cypress/integration/budgets.test.ts

@@ -1,12 +1,25 @@
 import { TEST_CONFIG, TEST_DATA } from "../constants";
-import { clickConfirmButton } from "../shared";
+import { clickConfirmButton, generateRandomString } from "../shared";
 
 function navigateToBudgetByName(budgetName: string) {
   cy.get("[data-fs-bp-budgets-table]").within(() => {
-    cy.contains(budgetName).should("be.visible").parent().parent().click();
+    cy.contains(budgetName).should("be.visible").parent().click();
   });
 
-  cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+  cy.get("[data-fs-bp-budgets-details-layout]", {
+    timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+  }).should("be.visible");
+}
+
+function checkFirstBudget() {
+  cy.get("body").then(($body) => {
+    const exists = $body
+      .html()
+      .includes(`data-fs-bp-budget-add-success-description-wrapper`);
+    if (exists) {
+      clickConfirmButton();
+    }
+  });
 }
 
 function generateDate(daysAfterToday = 1) {
@@ -26,44 +39,46 @@ function goToBudgetsPage() {
   // Navigate to Addresses page
   cy.contains("Budgets").click();
 
-  cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-
   // Check to see if contract details loaded correctly
-  cy.get("[data-fs-bp-header-inside]").should("exist");
-  cy.contains(TEST_DATA.PROFILE.TEST_CONTRACT_NAME).should("be.visible");
+  cy.get("[data-fs-bp-header-inside-title]", {
+    timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+  }).should("exist");
 }
 
 function openActionsDropdown(budgetName: string) {
   cy.get("[data-fs-bp-budgets-table]")
     .contains(budgetName)
     .parent()
-    .parent()
     .find("[data-fs-bp-basic-dropdown-menu-trigger]")
     .click();
 }
 
-describe("Budgets list", () => {
+let NEW_BUDGET_NAME: string;
+let EDITED_BUDGET_NAME: string;
+
+describe("Budgets list", { retries: 2 }, () => {
+  before(() => {
+    NEW_BUDGET_NAME = `${
+      TEST_DATA.BUDGET.FIRST_BUDGET_NAME
+    } ${generateRandomString()}`;
+    EDITED_BUDGET_NAME = `Edited ${NEW_BUDGET_NAME}`;
+  });
   beforeEach(() => {
+    // Visit the homepage
     cy.login();
 
-    // Visit the homepage
     cy.visit(TEST_CONFIG.ROUTES.BUYER_PORTAL);
 
     // Go to Budget Page and check empty state
     goToBudgetsPage();
   });
-  it("Create first budget", () => {
-    // Check to see if the empty section loaded
-    cy.get("[data-fs-empty-state]").should("exist");
-
+  it("Create budget", () => {
     // Open the Budget Creation modal
     cy.get('[data-fs-button-variant="primary"]').click();
 
     // Inside the modal, fill budget information
     cy.get("[data-fs-bp-add-budget-drawer]").within(() => {
-      cy.get("[data-fs-bp-budget-name]").type(
-        TEST_DATA.BUDGET.FIRST_BUDGET_NAME
-      );
+      cy.get("[data-fs-bp-budget-name]").type(NEW_BUDGET_NAME);
       cy.get("[data-fs-bp-budget-amount]").type(TEST_DATA.BUDGET.BUDGET_AMOUNT);
       cy.get("[data-fs-bp-budget-start-date]").type(generateDate());
       cy.get("[data-fs-bp-budget-end-date]").type(generateDate(10));
@@ -73,77 +88,91 @@ describe("Budgets list", () => {
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-budget-allocation-table]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("be.visible");
+
+    cy.get("[data-fs-skeleton-shimmer]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
     // Add Alocation
-    cy.get("[data-fs-bp-budget-allocation-row-select-all]").check();
+    cy.get("[data-fs-bp-budget-allocation-row-select-all]").check({
+      force: true,
+    });
 
     clickConfirmButton();
 
-    cy.contains(TEST_DATA.BUDGET.FIRST_BUDGET_MESSAGE).should("be.visible");
-
-    clickConfirmButton();
+    // Deal with the possibility of being the first budget
+    checkFirstBudget();
 
-    cy.reload();
+    cy.get("[data-fs-bp-budget-allocation-table]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
     // Check to see if the table loaded and has the budget
     cy.get("[data-fs-bp-budgets-table]").should("exist");
-    cy.contains(TEST_DATA.BUDGET.FIRST_BUDGET_NAME).should("be.visible");
+    cy.contains(NEW_BUDGET_NAME).should("be.visible");
   });
   it("Edit a budget from the list", () => {
     // Check to see if the table loaded and has the budget
     cy.get("[data-fs-bp-budgets-table]").should("exist");
-    cy.contains(TEST_DATA.BUDGET.FIRST_BUDGET_NAME).should("be.visible");
+    cy.contains(NEW_BUDGET_NAME).should("be.visible");
 
-    openActionsDropdown(TEST_DATA.BUDGET.FIRST_BUDGET_NAME);
+    openActionsDropdown(NEW_BUDGET_NAME);
 
     cy.contains("Edit settings").click();
 
-    cy.get("[data-fs-bp-budget-name]")
-      .clear()
-      .type(TEST_DATA.BUDGET.EDIT_BUDGET_NAME);
+    cy.get("[data-fs-bp-budget-name]").clear().type(EDITED_BUDGET_NAME);
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-
-    cy.reload();
+    cy.get("[data-fs-bp-edit-budget-drawer]").should("not.exist");
 
     // Check to see if the table loaded and has the budget
     cy.get("[data-fs-bp-budgets-table]").should("exist");
-    cy.contains(TEST_DATA.BUDGET.EDIT_BUDGET_NAME).should("be.visible");
+    cy.contains(EDITED_BUDGET_NAME).should("be.visible");
   });
 
-  it("Add Allocations from list", () => {
+  it("Add and check allocations from list", () => {
     // Check to see if the table loaded and has the budget
     cy.get("[data-fs-bp-budgets-table]").should("exist");
-    cy.contains(TEST_DATA.BUDGET.EDIT_BUDGET_NAME).should("be.visible");
+    cy.contains(EDITED_BUDGET_NAME).should("be.visible");
 
-    openActionsDropdown(TEST_DATA.BUDGET.EDIT_BUDGET_NAME);
+    openActionsDropdown(EDITED_BUDGET_NAME);
 
     cy.contains("Add allocations").click();
 
-    cy.wait(1000);
+    cy.get("[data-fs-bp-budget-allocation-table]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("be.visible");
 
     cy.get("[data-fs-bp-budget-allocation-select-current]").click();
 
     cy.contains("Users").click();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-budget-allocation-row-name]", {
+      timeout: TEST_CONFIG.TIMEOUTS.RETRY_DELAY,
+    }).should("be.visible");
+
+    cy.get("[data-fs-skeleton-shimmer]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
     // Add Alocation
-    cy.get("[data-fs-bp-budget-allocation-row-select-all]").check();
+    cy.get("[data-fs-bp-budget-allocation-row-select-all]")
+      .scrollIntoView()
+      .check({ force: true });
+
+    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-  });
-  it("Enter budget details and check allocations", () => {
-    // Check to see if the table loaded and has the budget
-    cy.get("[data-fs-bp-budgets-table]").should("exist");
-    cy.contains(TEST_DATA.BUDGET.EDIT_BUDGET_NAME).should("be.visible");
+    cy.get("[data-fs-bp-budget-allocation-table]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
-    navigateToBudgetByName(TEST_DATA.BUDGET.EDIT_BUDGET_NAME);
+    navigateToBudgetByName(EDITED_BUDGET_NAME);
 
     cy.get("[data-fs-bp-budget-details-allocation-table]")
       .should("exist")
@@ -152,33 +181,34 @@ describe("Budgets list", () => {
         cy.contains(TEST_DATA.BUDGET.ALLOCATION_TYPE_2).should("exist");
       });
   });
-
   it("Delete a budget from list", () => {
     // Check to see if the table loaded and has the budget
     cy.get("[data-fs-bp-budgets-table]").should("exist");
-    cy.contains(TEST_DATA.BUDGET.EDIT_BUDGET_NAME).should("be.visible");
+    cy.contains(EDITED_BUDGET_NAME).should("be.visible");
 
-    openActionsDropdown(TEST_DATA.BUDGET.EDIT_BUDGET_NAME);
+    openActionsDropdown(EDITED_BUDGET_NAME);
 
     cy.contains("Delete").click();
 
     cy.get("[data-fs-bp-basic-drawer-body-wrapper]").within(() => {
-      cy.get("[data-fs-bp-input-text-input]").type(
-        TEST_DATA.BUDGET.EDIT_BUDGET_NAME,
-        { delay: 500 }
-      );
+      cy.get("[data-fs-bp-input-text-input]").type(EDITED_BUDGET_NAME, {
+        delay: 300,
+      });
     });
 
     cy.get('[data-fs-bp-basic-drawer-button-variant="danger"]').click();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-
-    // Check to see if the empty section loaded
-    cy.get("[data-fs-empty-state]").should("exist");
+    cy.get("[data-fs-bp-budget-delete-drawer]").should("not.exist");
   });
 });
 
 describe("Budget Details", () => {
+  before(() => {
+    NEW_BUDGET_NAME = `${
+      TEST_DATA.BUDGET.BUDGET_DETAILS_NAME
+    } ${generateRandomString()}`;
+    EDITED_BUDGET_NAME = `Edited ${NEW_BUDGET_NAME}`;
+  });
   beforeEach(() => {
     cy.login();
 
@@ -189,17 +219,12 @@ describe("Budget Details", () => {
     goToBudgetsPage();
   });
   it("Create budget", () => {
-    // Check to see if the empty section loaded
-    cy.get("[data-fs-empty-state]").should("exist");
-
     // Open the Budget Creation modal
     cy.get('[data-fs-button-variant="primary"]').click();
 
     // Inside the modal, fill budget information
     cy.get("[data-fs-bp-add-budget-drawer]").within(() => {
-      cy.get("[data-fs-bp-budget-name]").type(
-        TEST_DATA.BUDGET.BUDGET_DETAILS_NAME
-      );
+      cy.get("[data-fs-bp-budget-name]").type(NEW_BUDGET_NAME);
       cy.get("[data-fs-bp-budget-amount]").type(TEST_DATA.BUDGET.BUDGET_AMOUNT);
       cy.get("[data-fs-bp-budget-start-date]").type(generateDate());
       cy.get("[data-fs-bp-budget-end-date]").type(generateDate(10));
@@ -209,59 +234,59 @@ describe("Budget Details", () => {
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-budget-allocation-table]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("be.visible");
+
+    cy.get("[data-fs-skeleton-shimmer]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
     // Add Alocation
-    cy.get("[data-fs-bp-budget-allocation-row-select-all]").check();
+    cy.get("[data-fs-bp-budget-allocation-row-select-all]").check({
+      force: true,
+    });
 
     clickConfirmButton();
 
-    cy.contains(TEST_DATA.BUDGET.FIRST_BUDGET_MESSAGE).should("be.visible");
-
-    clickConfirmButton();
+    checkFirstBudget();
 
-    cy.reload();
+    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
 
     // Check to see if the table loaded and has the budget
     cy.get("[data-fs-bp-budgets-table]").should("exist");
-    cy.contains(TEST_DATA.BUDGET.BUDGET_DETAILS_NAME).should("be.visible");
+    cy.contains(NEW_BUDGET_NAME).should("be.visible");
   });
 
   it("Edit Inside Budget Details", () => {
-    navigateToBudgetByName(TEST_DATA.BUDGET.BUDGET_DETAILS_NAME);
-
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    navigateToBudgetByName(NEW_BUDGET_NAME);
 
     cy.get("[data-fs-budget-settings-edit-button]").click();
-    cy.get("[data-fs-bp-budget-name")
-      .clear()
-      .type(TEST_DATA.BUDGET.EDIT_BUDGET_DETAILS);
+    cy.get("[data-fs-bp-budget-name").clear().type(EDITED_BUDGET_NAME);
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-edit-budget-drawer]").should("not.exist");
     cy.reload();
 
-    cy.contains(TEST_DATA.BUDGET.EDIT_BUDGET_DETAILS).should("exist");
+    cy.contains(EDITED_BUDGET_NAME).should("exist");
   });
 
   it("Remove allocation inside details", () => {
-    navigateToBudgetByName(TEST_DATA.BUDGET.EDIT_BUDGET_DETAILS);
-
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    navigateToBudgetByName(EDITED_BUDGET_NAME);
 
     cy.get("[data-fs-bp-budget-allocation-table-trash-icon]").click();
 
     cy.get("[data-fs-bp-delete-allocation-drawer-body]").within(() => {
       cy.get("[data-fs-bp-input-text-input]").type(
-        TEST_DATA.CUSTOM_FIELDS.EXISTING_PO_NUMBER,
-        { delay: 500 }
+        TEST_DATA.CUSTOM_FIELDS.EXISTING_PO_NUMBER
       );
     });
 
     clickConfirmButton();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-delete-allocation-drawer]").should("not.exist");
+
     cy.reload();
 
     cy.get("[data-fs-empty-state-section]")
@@ -272,24 +297,33 @@ describe("Budget Details", () => {
   });
 
   it("Add alocation from inside details", () => {
-    navigateToBudgetByName(TEST_DATA.BUDGET.EDIT_BUDGET_DETAILS);
+    navigateToBudgetByName(EDITED_BUDGET_NAME);
+    cy.get("[data-fs-budget-details-allocation-table-edit-button]").click();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-budget-allocation-table]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("be.visible");
 
-    cy.get("[data-fs-budget-details-allocation-table-edit-button]").click();
+    cy.get("[data-fs-skeleton-shimmer]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
+    cy.get("[data-fs-bp-budget-allocation-row-select-all]").check({
+      force: true,
+    });
 
-    cy.get("[data-fs-bp-budget-allocation-row-select-all]").check();
+    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
 
     clickConfirmButton();
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-    cy.reload();
+
+    cy.get("[data-fs-bp-budget-allocation-table]", {
+      timeout: TEST_CONFIG.TIMEOUTS.PAGE_LOAD,
+    }).should("not.exist");
 
     cy.get("[data-fs-bp-budget-allocation-table-row-name-td]").should("exist");
   });
   it("Delete budget from inside details", () => {
-    navigateToBudgetByName(TEST_DATA.BUDGET.EDIT_BUDGET_DETAILS);
+    navigateToBudgetByName(EDITED_BUDGET_NAME);
 
     cy.get("[data-fs-bp-budgets-details-header-wrapper]").within(() => {
       cy.get("[data-fs-bp-basic-dropdown-menu-trigger]").click();
@@ -300,17 +334,13 @@ describe("Budget Details", () => {
     cy.get("[data-fs-bp-input-wrapper]")
       .last()
       .within(() => {
-        cy.get("[data-fs-bp-input-text-input]").type(
-          TEST_DATA.BUDGET.EDIT_BUDGET_DETAILS,
-          { delay: 500 }
-        );
+        cy.get("[data-fs-bp-input-text-input]").type(EDITED_BUDGET_NAME, {
+          delay: 300,
+        });
       });
 
     cy.get('[data-fs-bp-basic-drawer-button-variant="danger"]').last().click();
 
-    cy.wait(TEST_CONFIG.TIMEOUTS.PAGE_LOAD);
-
-    // Check to see if the empty section loaded
-    cy.get("[data-fs-empty-state]").should("exist");
+    cy.get("[data-fs-bp-budget-delete-drawer]").should("not.exist");
   });
 });