From fa9ac6fcbbf9690bcc6b76f429aad4908052682f Mon Sep 17 00:00:00 2001 From: IvanJGG Date: Thu, 9 Jan 2025 13:48:46 -0600 Subject: [PATCH 1/2] CAF-42 git Correct Package route and test --- tests/cypress/e2e/dashboard.cy.js | 4 ++-- tests/cypress/e2e/packages.cy.js | 4 ++-- views/dashboard/blocks/parcelControlbutton.html | 2 +- views/{packages => packages-tracking}/assets/index.js | 2 +- views/{packages => packages-tracking}/index.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename views/{packages => packages-tracking}/assets/index.js (97%) rename views/{packages => packages-tracking}/index.html (92%) diff --git a/tests/cypress/e2e/dashboard.cy.js b/tests/cypress/e2e/dashboard.cy.js index 91c5955..9e85a7b 100644 --- a/tests/cypress/e2e/dashboard.cy.js +++ b/tests/cypress/e2e/dashboard.cy.js @@ -28,7 +28,7 @@ describe("Role-based button functionality", () => { cy.visitWithToken("/dashboard"); cy.get("#btnParcelControl").contains("Control de paquetería").click(); - cy.url().should("include", "/packages"); + cy.url().should("include", "/packages-tracking"); cy.visitWithToken("/dashboard"); }); }); @@ -56,7 +56,7 @@ describe("Role-based button functionality", () => { cy.visitWithToken("/dashboard"); cy.get("#btnParcelControl").contains("Control de paquetería").click(); - cy.url().should("include", "/packages"); + cy.url().should("include", "/packages-tracking"); }); }); diff --git a/tests/cypress/e2e/packages.cy.js b/tests/cypress/e2e/packages.cy.js index f52c5f9..34965b1 100644 --- a/tests/cypress/e2e/packages.cy.js +++ b/tests/cypress/e2e/packages.cy.js @@ -17,7 +17,7 @@ describe("Packages Table", () => { }, }).as("getPackages"); - cy.visitWithToken("/packages"); + cy.visitWithToken("/packages-tracking"); }); it("should display the packages table with confirmation buttons", () => { @@ -36,7 +36,7 @@ describe("Packages Table", () => { body: { message: "Internal Server Error" }, }).as("getPackagesError"); - cy.visitWithToken("/packages"); + cy.visitWithToken("/packages-tracking"); cy.wait("@getPackagesError"); cy.get("#packageTable").should("exist"); diff --git a/views/dashboard/blocks/parcelControlbutton.html b/views/dashboard/blocks/parcelControlbutton.html index 5ee724f..3006b52 100644 --- a/views/dashboard/blocks/parcelControlbutton.html +++ b/views/dashboard/blocks/parcelControlbutton.html @@ -4,7 +4,7 @@ id="btnParcelControl" class="btn btn-primary btn-lg me-3" style="width: 150px; height: 150px" - onclick="navigateTo('/packages')" + onclick="navigateTo('/packages-tracking')" > local_shipping
Control de paquetería diff --git a/views/packages/assets/index.js b/views/packages-tracking/assets/index.js similarity index 97% rename from views/packages/assets/index.js rename to views/packages-tracking/assets/index.js index 8cc0ed4..9eb7534 100644 --- a/views/packages/assets/index.js +++ b/views/packages-tracking/assets/index.js @@ -93,7 +93,7 @@ async function loadPackagesTable() { } document.getElementById("registerPackage").addEventListener("click", () => { - window.location.href = "/packages/register.html"; + window.location.href = "/packages-tracking/register.html"; }); window.addEventListener("load", async () => { diff --git a/views/packages/index.html b/views/packages-tracking/index.html similarity index 92% rename from views/packages/index.html rename to views/packages-tracking/index.html index 69d908c..52358c6 100644 --- a/views/packages/index.html +++ b/views/packages-tracking/index.html @@ -23,4 +23,4 @@

Lista de Entregas

- + From 34d66e8b52108aaa53f68be634905a1baac7f913 Mon Sep 17 00:00:00 2001 From: IvanJGG Date: Thu, 9 Jan 2025 20:08:39 -0600 Subject: [PATCH 2/2] CAF-42 git Correcting route --- tests/cypress/e2e/dashboard.cy.js | 4 ++-- tests/cypress/e2e/packages.cy.js | 4 ++-- views/dashboard/blocks/parcelControlbutton.html | 2 +- views/{packages-tracking => package-tracking}/assets/index.js | 2 +- views/{packages-tracking => package-tracking}/index.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename views/{packages-tracking => package-tracking}/assets/index.js (97%) rename views/{packages-tracking => package-tracking}/index.html (92%) diff --git a/tests/cypress/e2e/dashboard.cy.js b/tests/cypress/e2e/dashboard.cy.js index 9e85a7b..7be1098 100644 --- a/tests/cypress/e2e/dashboard.cy.js +++ b/tests/cypress/e2e/dashboard.cy.js @@ -28,7 +28,7 @@ describe("Role-based button functionality", () => { cy.visitWithToken("/dashboard"); cy.get("#btnParcelControl").contains("Control de paquetería").click(); - cy.url().should("include", "/packages-tracking"); + cy.url().should("include", "/package-tracking"); cy.visitWithToken("/dashboard"); }); }); @@ -56,7 +56,7 @@ describe("Role-based button functionality", () => { cy.visitWithToken("/dashboard"); cy.get("#btnParcelControl").contains("Control de paquetería").click(); - cy.url().should("include", "/packages-tracking"); + cy.url().should("include", "/package-tracking"); }); }); diff --git a/tests/cypress/e2e/packages.cy.js b/tests/cypress/e2e/packages.cy.js index 34965b1..eb4c128 100644 --- a/tests/cypress/e2e/packages.cy.js +++ b/tests/cypress/e2e/packages.cy.js @@ -17,7 +17,7 @@ describe("Packages Table", () => { }, }).as("getPackages"); - cy.visitWithToken("/packages-tracking"); + cy.visitWithToken("/package-tracking"); }); it("should display the packages table with confirmation buttons", () => { @@ -36,7 +36,7 @@ describe("Packages Table", () => { body: { message: "Internal Server Error" }, }).as("getPackagesError"); - cy.visitWithToken("/packages-tracking"); + cy.visitWithToken("/package-tracking"); cy.wait("@getPackagesError"); cy.get("#packageTable").should("exist"); diff --git a/views/dashboard/blocks/parcelControlbutton.html b/views/dashboard/blocks/parcelControlbutton.html index 3006b52..5798ece 100644 --- a/views/dashboard/blocks/parcelControlbutton.html +++ b/views/dashboard/blocks/parcelControlbutton.html @@ -4,7 +4,7 @@ id="btnParcelControl" class="btn btn-primary btn-lg me-3" style="width: 150px; height: 150px" - onclick="navigateTo('/packages-tracking')" + onclick="navigateTo('/package-tracking')" > local_shipping
Control de paquetería diff --git a/views/packages-tracking/assets/index.js b/views/package-tracking/assets/index.js similarity index 97% rename from views/packages-tracking/assets/index.js rename to views/package-tracking/assets/index.js index 9eb7534..64bf095 100644 --- a/views/packages-tracking/assets/index.js +++ b/views/package-tracking/assets/index.js @@ -93,7 +93,7 @@ async function loadPackagesTable() { } document.getElementById("registerPackage").addEventListener("click", () => { - window.location.href = "/packages-tracking/register.html"; + window.location.href = "/package-tracking/register.html"; }); window.addEventListener("load", async () => { diff --git a/views/packages-tracking/index.html b/views/package-tracking/index.html similarity index 92% rename from views/packages-tracking/index.html rename to views/package-tracking/index.html index 52358c6..f4fc2c2 100644 --- a/views/packages-tracking/index.html +++ b/views/package-tracking/index.html @@ -23,4 +23,4 @@

Lista de Entregas

- +