From 9669817dceb69104cde68aa5e0d76583dc07dfce Mon Sep 17 00:00:00 2001 From: sumukhswamy Date: Thu, 20 Feb 2025 20:47:14 -0800 Subject: [PATCH 1/2] Reports falkey test fix Signed-off-by: sumukhswamy --- .../plugins/reports-dashboards/04-download.spec.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cypress/integration/plugins/reports-dashboards/04-download.spec.js b/cypress/integration/plugins/reports-dashboards/04-download.spec.js index 381fb6ce9..5aabb34bb 100644 --- a/cypress/integration/plugins/reports-dashboards/04-download.spec.js +++ b/cypress/integration/plugins/reports-dashboards/04-download.spec.js @@ -28,6 +28,9 @@ describe('Cypress', () => { }); it('Download from reporting homepage', () => { + cy.intercept('GET', `${BASE_PATH}/api/reporting/generateReport/*`).as( + 'generateReport' + ); cy.visit(`${BASE_PATH}/app/reports-dashboards#/`, { waitForGetTenant: true, }); @@ -40,13 +43,7 @@ describe('Cypress', () => { cy.get('[id="landingPageOnDemandDownload"]') .contains('PDF') .click({ force: true }); - cy.get('body').then(($body) => { - if ($body.find('#downloadInProgressLoadingModal').length > 0) { - return; - } else { - assert(false); - } - }); + cy.wait('@generateReport').its('response.statusCode').should('eq', 200); }); it('Download pdf from in-context menu', () => { From c92774298f74e08781f707b66b8642eaa8986410 Mon Sep 17 00:00:00 2001 From: sumukhswamy Date: Thu, 20 Feb 2025 20:50:47 -0800 Subject: [PATCH 2/2] chamged workflow Signed-off-by: sumukhswamy --- .github/workflows/release-e2e-workflow-template.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-e2e-workflow-template.yml b/.github/workflows/release-e2e-workflow-template.yml index dd38ffdce..aa8557502 100644 --- a/.github/workflows/release-e2e-workflow-template.yml +++ b/.github/workflows/release-e2e-workflow-template.yml @@ -113,19 +113,19 @@ jobs: command: ${{ inputs.test-command }} wait-on: 'http://localhost:5601' # Screenshots are only captured on failure, will change this once we do visual regression tests - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: failure() with: name: cypress-screenshots path: cypress-test/cypress/screenshots # Test run video was always captured, so this action uses "always()" condition - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: always() with: name: cypress-videos path: cypress-test/cypress/videos # Test reports was always captured, so this action uses "always()" condition - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 if: always() with: name: cypress-results