From 4e309f2488ad8c3e6d10d1f3d22410e016e667a9 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Mon, 12 Aug 2024 10:53:15 +0300 Subject: [PATCH 1/3] fix CI build --- .github/workflows/publish-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-and-test.yml b/.github/workflows/publish-and-test.yml index d0b0d64fe..dd5ffa4b3 100644 --- a/.github/workflows/publish-and-test.yml +++ b/.github/workflows/publish-and-test.yml @@ -204,7 +204,7 @@ jobs: repository: ${{github.repository}} - name: Run OpenELS image - run: docker-compose -f test.docker-compose.yml up -d + run: docker compose -f test.docker-compose.yml up -d - name: Cypress run uses: cypress-io/github-action@v6 From 1df3d118f035f2c153a0b3f7f2bb41f32668a509 Mon Sep 17 00:00:00 2001 From: Manish Jha Date: Mon, 12 Aug 2024 18:36:27 +0530 Subject: [PATCH 2/3] minor fix --- frontend/cypress/e2e/batchOrderEntry.cy.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/cypress/e2e/batchOrderEntry.cy.js b/frontend/cypress/e2e/batchOrderEntry.cy.js index 5ade8134b..d1d3d882f 100644 --- a/frontend/cypress/e2e/batchOrderEntry.cy.js +++ b/frontend/cypress/e2e/batchOrderEntry.cy.js @@ -51,9 +51,9 @@ describe("Batch Order Entry On Demand", function () { it("Should Validate Fields And Generate BarCode", function () { cy.fixture("BatchOrder").then((batchOrderData) => { - batchOrder.validateField("#tag-54", batchOrderData.sampleType); - batchOrder.validateField("#tag-56", batchOrderData.panel); - batchOrder.validateField("#tag-58", batchOrderData.facility); + batchOrder.validateField(":nth-child(1) > .cds--subgrid > :nth-child(8)", batchOrderData.sampleType); + batchOrder.validateField(".cds--lg\\:col-span-12", batchOrderData.panel); + batchOrder.validateField(":nth-child(1) > .cds--subgrid > :nth-child(13)", batchOrderData.facility); batchOrder.checkNextLabel().should("be.disabled"); batchOrder.clickGenerateAndSaveBarcode(); batchOrder.checkNextLabel().should("be.visible"); @@ -95,9 +95,9 @@ describe("Batch Order Entry Pre Printed", function () { it("Should Validate Fields", function () { cy.fixture("BatchOrder").then((batchOrderData) => { - batchOrder.validateField("#tag-58", batchOrderData.sampleType); - batchOrder.validateField("#tag-60", batchOrderData.panel); - batchOrder.validateField("#tag-62", batchOrderData.facility); + batchOrder.validateField(":nth-child(1) > .cds--subgrid > :nth-child(8)", batchOrderData.sampleType); + batchOrder.validateField(".cds--lg\\:col-span-12", batchOrderData.panel); + batchOrder.validateField(":nth-child(1) > .cds--subgrid > :nth-child(13)", batchOrderData.facility); }); }); From a75253ad2c92e95480438f5f7f82cbb1743ccded Mon Sep 17 00:00:00 2001 From: Manish Jha Date: Mon, 12 Aug 2024 18:37:42 +0530 Subject: [PATCH 3/3] formatting fix --- frontend/cypress/e2e/batchOrderEntry.cy.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/frontend/cypress/e2e/batchOrderEntry.cy.js b/frontend/cypress/e2e/batchOrderEntry.cy.js index d1d3d882f..eb84d94e6 100644 --- a/frontend/cypress/e2e/batchOrderEntry.cy.js +++ b/frontend/cypress/e2e/batchOrderEntry.cy.js @@ -51,9 +51,15 @@ describe("Batch Order Entry On Demand", function () { it("Should Validate Fields And Generate BarCode", function () { cy.fixture("BatchOrder").then((batchOrderData) => { - batchOrder.validateField(":nth-child(1) > .cds--subgrid > :nth-child(8)", batchOrderData.sampleType); + batchOrder.validateField( + ":nth-child(1) > .cds--subgrid > :nth-child(8)", + batchOrderData.sampleType, + ); batchOrder.validateField(".cds--lg\\:col-span-12", batchOrderData.panel); - batchOrder.validateField(":nth-child(1) > .cds--subgrid > :nth-child(13)", batchOrderData.facility); + batchOrder.validateField( + ":nth-child(1) > .cds--subgrid > :nth-child(13)", + batchOrderData.facility, + ); batchOrder.checkNextLabel().should("be.disabled"); batchOrder.clickGenerateAndSaveBarcode(); batchOrder.checkNextLabel().should("be.visible"); @@ -95,9 +101,15 @@ describe("Batch Order Entry Pre Printed", function () { it("Should Validate Fields", function () { cy.fixture("BatchOrder").then((batchOrderData) => { - batchOrder.validateField(":nth-child(1) > .cds--subgrid > :nth-child(8)", batchOrderData.sampleType); + batchOrder.validateField( + ":nth-child(1) > .cds--subgrid > :nth-child(8)", + batchOrderData.sampleType, + ); batchOrder.validateField(".cds--lg\\:col-span-12", batchOrderData.panel); - batchOrder.validateField(":nth-child(1) > .cds--subgrid > :nth-child(13)", batchOrderData.facility); + batchOrder.validateField( + ":nth-child(1) > .cds--subgrid > :nth-child(13)", + batchOrderData.facility, + ); }); });