From 2dafa6bddf0da0c2bdb145c8528120ecdab6c607 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 23 Apr 2024 16:36:15 -0700 Subject: [PATCH 1/3] update gantt chart tenant Signed-off-by: Shenoy Pratik --- .../gantt-chart-dashboards/gantt_ui.spec.js | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js b/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js index 5c304c1f5..fc76451d8 100644 --- a/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js +++ b/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js @@ -8,8 +8,8 @@ import customParseFormat from 'dayjs/plugin/customParseFormat'; import dayjs from 'dayjs'; import { BASE_PATH } from '../../../utils/constants'; -import { CURRENT_TENANT } from '../../../utils/commands'; import { devToolsRequest } from '../../../utils/helpers'; +import { CURRENT_TENANT } from '../../../utils/commands'; dayjs.extend(customParseFormat); @@ -20,16 +20,10 @@ const X_LABEL = 'A unique label for X-axis'; const DEFAULT_SIZE = 10; describe('Dump test data', () => { + before(() => { + CURRENT_TENANT.newTenant = 'global'; + }); it('Indexes test data for gantt chart', () => { - if (Cypress.env('SECURITY_ENABLED')) { - // Set default tenant to private to avoid tenant popup - cy.changeDefaultTenant({ - multitenancy_enabled: true, - private_tenant_enabled: true, - default_tenant: 'private', - }); - } - CURRENT_TENANT.newTenant = 'private'; const dumpDataSet = (ndjson, index) => cy.request({ method: 'POST', @@ -67,6 +61,7 @@ describe('Dump test data', () => { describe('Save a gantt chart', { defaultCommandTimeout: 20000 }, () => { beforeEach(() => { + CURRENT_TENANT.newTenant = 'global'; cy.visit(`${BASE_PATH}/app/visualize#`); }); @@ -91,10 +86,11 @@ describe( { defaultCommandTimeout: 20000 }, () => { beforeEach(() => { - CURRENT_TENANT.newTenant = 'private'; + CURRENT_TENANT.newTenant = 'global'; cy.visit(`${BASE_PATH}/app/visualize#`); cy.intercept('**').as('searchRequest'); - cy.get('.euiFieldSearch').focus().type(GANTT_VIS_NAME); + cy.get('.euiFieldSearch').focus(); + cy.get('.euiFieldSearch').type(GANTT_VIS_NAME); cy.wait('@searchRequest'); cy.wait(5000); cy.get('[data-test-subj="itemsInMemTable"]') @@ -138,9 +134,11 @@ describe( describe('Configure panel settings', { defaultCommandTimeout: 20000 }, () => { beforeEach(() => { + CURRENT_TENANT.newTenant = 'global'; cy.visit(`${BASE_PATH}/app/visualize#`); cy.intercept('**').as('searchRequest'); - cy.get('.euiFieldSearch').focus().type(GANTT_VIS_NAME); + cy.get('.euiFieldSearch').focus(); + cy.get('.euiFieldSearch').type(GANTT_VIS_NAME); cy.wait('@searchRequest'); cy.wait(5000); cy.contains(GANTT_VIS_NAME).should('exist').click(); @@ -148,10 +146,8 @@ describe('Configure panel settings', { defaultCommandTimeout: 20000 }, () => { }); it('Changes y-axis label', () => { - cy.get('input.euiFieldText[placeholder="Label"]') - .eq(0) - .focus() - .type(Y_LABEL); + cy.get('input.euiFieldText[placeholder="Label"]').eq(0).focus(); + cy.get('input.euiFieldText[placeholder="Label"]').eq(0).type(Y_LABEL); cy.get('.euiButton__text').contains('Update').click({ force: true }); cy.get('text.ytitle').contains(Y_LABEL).should('exist'); @@ -165,10 +161,8 @@ describe('Configure panel settings', { defaultCommandTimeout: 20000 }, () => { }); it('Changes x-axis label', () => { - cy.get('input.euiFieldText[placeholder="Label"]') - .eq(1) - .focus() - .type(X_LABEL); + cy.get('input.euiFieldText[placeholder="Label"]').eq(1).focus(); + cy.get('input.euiFieldText[placeholder="Label"]').eq(1).type(X_LABEL); cy.get('.euiButton__text').contains('Update').click({ force: true }); cy.get('text.xtitle').contains(X_LABEL).should('exist'); @@ -264,11 +258,13 @@ describe( { defaultCommandTimeout: 20000 }, () => { it('Adds gantt chart to dashboard', () => { + CURRENT_TENANT.newTenant = 'global'; cy.visit(`${BASE_PATH}/app/dashboards#/create`); cy.contains('Add an existing').click({ force: true }); - cy.get('input[data-test-subj="savedObjectFinderSearchInput"]') - .focus() - .type(GANTT_VIS_NAME); + cy.get('input[data-test-subj="savedObjectFinderSearchInput"]').focus(); + cy.get('input[data-test-subj="savedObjectFinderSearchInput"]').type( + GANTT_VIS_NAME + ); cy.get(`.euiListGroupItem__label[title="${GANTT_VIS_NAME}"]`).click({ force: true, }); From d70b707fe334f4589aea9c996c902457588534a6 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 23 Apr 2024 16:54:57 -0700 Subject: [PATCH 2/3] fix add index pattern request Signed-off-by: Shenoy Pratik --- .../integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js b/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js index fc76451d8..302a24dec 100644 --- a/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js +++ b/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js @@ -47,7 +47,7 @@ describe('Dump test data', () => { cy.request({ method: 'POST', - failOnStatusCode: false, + form: false, url: 'api/saved_objects/index-pattern/jaeger', headers: { 'content-type': 'application/json', From 0e395a0a1b56582c54e2a67535f3fc19095149ca Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Tue, 23 Apr 2024 22:01:59 -0700 Subject: [PATCH 3/3] make default tenant global Signed-off-by: Shenoy Pratik --- .../gantt-chart-dashboards/gantt_ui.spec.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js b/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js index 302a24dec..08db32b3e 100644 --- a/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js +++ b/cypress/integration/plugins/gantt-chart-dashboards/gantt_ui.spec.js @@ -20,9 +20,21 @@ const X_LABEL = 'A unique label for X-axis'; const DEFAULT_SIZE = 10; describe('Dump test data', () => { - before(() => { + beforeEach(() => { CURRENT_TENANT.newTenant = 'global'; + if (Cypress.env('SECURITY_ENABLED')) { + /** + * Security plugin is using private tenant as default. + * So here we'd need to set global tenant as default manually. + */ + cy.changeDefaultTenant({ + multitenancy_enabled: true, + private_tenant_enabled: true, + default_tenant: 'global', + }); + } }); + it('Indexes test data for gantt chart', () => { const dumpDataSet = (ndjson, index) => cy.request({ @@ -47,7 +59,7 @@ describe('Dump test data', () => { cy.request({ method: 'POST', - form: false, + failOnStatusCode: false, url: 'api/saved_objects/index-pattern/jaeger', headers: { 'content-type': 'application/json', @@ -66,6 +78,7 @@ describe('Save a gantt chart', { defaultCommandTimeout: 20000 }, () => { }); it('Creates and saves a gantt chart', () => { + CURRENT_TENANT.newTenant = 'global'; cy.get('.euiButton__text').contains('Create ').click({ force: true }); cy.get('[data-test-subj="visTypeTitle"]') .contains('Gantt Chart')