From f42e313e05031c7e98252ea25abf6c6daeb85151 Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Wed, 24 Apr 2024 22:44:30 -0700 Subject: [PATCH 1/2] Update repoting tenant Signed-off-by: Rupal Mahajan --- .../reports-dashboards/04-download.spec.js | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/cypress/integration/plugins/reports-dashboards/04-download.spec.js b/cypress/integration/plugins/reports-dashboards/04-download.spec.js index 3ab6bd1a3..03e781793 100644 --- a/cypress/integration/plugins/reports-dashboards/04-download.spec.js +++ b/cypress/integration/plugins/reports-dashboards/04-download.spec.js @@ -10,17 +10,23 @@ import { WAIT_TIME, BASE_PATH, TIMEOUT } from '../../../utils/constants'; describe('Cypress', () => { // remove sample data after(() => { - cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`); + cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`, { + waitForGetTenant: true, + }); cy.get('div[data-test-subj="sampleDataSetCardflights"]') .contains('Remove') .click(); cy.wait(3000); - cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`); + cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`, { + waitForGetTenant: true, + }); cy.get('div[data-test-subj="sampleDataSetCardecommerce"]') .contains('Remove') .click(); cy.wait(3000); - cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`); + cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`, { + waitForGetTenant: true, + }); cy.get('div[data-test-subj="sampleDataSetCardlogs"]') .contains('Remove') .click(); @@ -28,7 +34,9 @@ describe('Cypress', () => { }); it('Download pdf from in-context menu', () => { - cy.visit(`${BASE_PATH}/app/dashboards#`); + cy.visit(`${BASE_PATH}/app/dashboards#`, { + waitForGetTenant: true, + }); cy.wait(5000); // click first entry in dashboards page @@ -50,7 +58,9 @@ describe('Cypress', () => { }); it('Download png from in-context menu', () => { - cy.visit(`${BASE_PATH}/app/dashboards#`); + cy.visit(`${BASE_PATH}/app/dashboards#`, { + waitForGetTenant: true, + }); cy.wait(5000); // click first entry in dashboards page @@ -69,7 +79,9 @@ describe('Cypress', () => { }); it('Download csv from saved search in-context menu', () => { - cy.visit(`${BASE_PATH}/app/discover#`); + cy.visit(`${BASE_PATH}/app/discover#`, { + waitForGetTenant: true, + }); cy.wait(5000); // open saved search list From 8882852d10e56a6cb8b598aa71a6152af989e9a2 Mon Sep 17 00:00:00 2001 From: Rupal Mahajan Date: Wed, 24 Apr 2024 23:17:58 -0700 Subject: [PATCH 2/2] Get tenant while adding sample data Signed-off-by: Rupal Mahajan --- .../plugins/reports-dashboards/01-create.spec.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cypress/integration/plugins/reports-dashboards/01-create.spec.js b/cypress/integration/plugins/reports-dashboards/01-create.spec.js index 6dada06fd..5016dbd87 100644 --- a/cypress/integration/plugins/reports-dashboards/01-create.spec.js +++ b/cypress/integration/plugins/reports-dashboards/01-create.spec.js @@ -13,17 +13,23 @@ import { describe('Cypress', () => { // add sample data before(() => { - cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`); + cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`, { + waitForGetTenant: true, + }); cy.get('div[data-test-subj="sampleDataSetCardflights"]') .contains(/(Add|View) data/) .click(); cy.wait(WAIT_TIME); - cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`); + cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`, { + waitForGetTenant: true, + }); cy.get('div[data-test-subj="sampleDataSetCardecommerce"]') .contains(/(Add|View) data/) .click(); cy.wait(WAIT_TIME); - cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`); + cy.visit(`${BASE_PATH}/app/home#/tutorial_directory/sampleData`, { + waitForGetTenant: true, + }); cy.get('div[data-test-subj="sampleDataSetCardlogs"]') .contains(/(Add|View) data/) .click();