From 4f361fd96511e191de420886d2735845d7d0414b Mon Sep 17 00:00:00 2001 From: TackAdam Date: Mon, 17 Jul 2023 16:31:57 -0700 Subject: [PATCH] Added sample data load, moved shared constm removed waits Signed-off-by: TackAdam --- .../10_horizontalBar_chart.spec.js | 10 +++++- .../11_timeSeries_chart.spec.js | 10 +++++- .../VisualizationCharts/12_pie_chart.spec.js | 20 +++++------ .../13_heatMap_chart.spec.js | 10 +++++- .../9_verticalBar_chart.spec.js | 10 +++++- .cypress/utils/event_analytics/constants.js | 36 +++++++++---------- 6 files changed, 61 insertions(+), 35 deletions(-) diff --git a/.cypress/integration/VisualizationCharts/10_horizontalBar_chart.spec.js b/.cypress/integration/VisualizationCharts/10_horizontalBar_chart.spec.js index 5befee601..9ee66f14a 100644 --- a/.cypress/integration/VisualizationCharts/10_horizontalBar_chart.spec.js +++ b/.cypress/integration/VisualizationCharts/10_horizontalBar_chart.spec.js @@ -31,6 +31,15 @@ const renderHorizontalBarChart = () => { cy.get('[data-test-subj="comboBoxOptionsList "] button span').contains('Horizontal bar').click({ force: true }); }; +describe('Adding sample data for visualizations', () => { + it('Adds sample flights data for visualizations to use', () => { + cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); + cy.get('div[data-test-subj="sampleDataSetCardlogs"]') + .contains(/(Add|View) data/) + .click(); + }); +}); + describe('Render horizontal bar chart and verify default behaviour ', () => { beforeEach(() => { renderHorizontalBarChart(); @@ -87,7 +96,6 @@ describe('Render horizontal bar chart for data configuration panel', () => { }); it('Render horizontal bar chart and verify data config panel no result found if metric is missing', () => { - cy.wait(delay); cy.get('[data-test-subj="viz-config-delete-btn"]').eq(3).click(); cy.get('[data-test-subj="viz-config-delete-btn"]').eq(2).click(); cy.get('.euiButton__text').contains('Update chart').click(); diff --git a/.cypress/integration/VisualizationCharts/11_timeSeries_chart.spec.js b/.cypress/integration/VisualizationCharts/11_timeSeries_chart.spec.js index 9be24bda2..bd76dde4b 100644 --- a/.cypress/integration/VisualizationCharts/11_timeSeries_chart.spec.js +++ b/.cypress/integration/VisualizationCharts/11_timeSeries_chart.spec.js @@ -28,6 +28,15 @@ const renderTimeSeriesChart = () => { cy.get('[data-test-subj="comboBoxOptionsList "] button span').contains('Time series').click({ force: true }); }; +describe('Adding sample data for visualizations', () => { + it('Adds sample flights data for visualizations to use', () => { + cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); + cy.get('div[data-test-subj="sampleDataSetCardlogs"]') + .contains(/(Add|View) data/) + .click(); + }); +}); + describe('Render Time series chart and verify default behaviour ', () => { beforeEach(() => { renderTimeSeriesChart(); @@ -83,7 +92,6 @@ describe('Render Time series chart for data configuration panel', () => { }); it('Render Time series chart and verify data config panel no result found if metric is missing', () => { - cy.wait(delay); cy.get('[data-test-subj="viz-config-delete-btn"]').eq(3).click(); cy.get('[data-test-subj="viz-config-delete-btn"]').eq(2).click(); cy.get('.euiButton__text').contains('Update chart').click(); diff --git a/.cypress/integration/VisualizationCharts/12_pie_chart.spec.js b/.cypress/integration/VisualizationCharts/12_pie_chart.spec.js index 490a46cf3..8fd96674a 100644 --- a/.cypress/integration/VisualizationCharts/12_pie_chart.spec.js +++ b/.cypress/integration/VisualizationCharts/12_pie_chart.spec.js @@ -10,6 +10,7 @@ import { landOnEventVisualizations, saveVisualizationAndVerify, deleteVisualization, + aggregationValues, } from '../../utils/event_analytics/constants'; const renderPieChart = () => { @@ -19,17 +20,14 @@ const renderPieChart = () => { cy.get('[data-test-subj="comboBoxOptionsList "] button span').contains('Pie').click({ force: true }); }; -const aggregationValues = [ - 'count', - 'sum', - 'avg', - 'max', - 'min', - 'var_samp', - 'var_pop', - 'stddev_samp', - 'stddev_pop', -]; +describe('Adding sample data and visualization', () => { + it('Adds sample flights data for visualizations to use', () => { + cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); + cy.get('div[data-test-subj="sampleDataSetCardflights"]') + .contains(/(Add|View) data/) + .click(); + }); +}); describe('Render Pie chart and verify default behavior', () => { beforeEach(() => { diff --git a/.cypress/integration/VisualizationCharts/13_heatMap_chart.spec.js b/.cypress/integration/VisualizationCharts/13_heatMap_chart.spec.js index 7077f232d..3f8fd160f 100644 --- a/.cypress/integration/VisualizationCharts/13_heatMap_chart.spec.js +++ b/.cypress/integration/VisualizationCharts/13_heatMap_chart.spec.js @@ -20,6 +20,15 @@ const renderHeatMapChart = () => { cy.get('[data-test-subj="comboBoxOptionsList "] button span').contains('Heatmap').click({ force: true }); }; +describe('Adding sample data for visualizations', () => { + it('Adds sample flights data for visualizations to use', () => { + cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); + cy.get('div[data-test-subj="sampleDataSetCardlogs"]') + .contains(/(Add|View) data/) + .click(); + }); +}); + describe('Render Heatmap chart and verify default behaviour ', () => { beforeEach(() => { renderHeatMapChart(); @@ -73,7 +82,6 @@ describe('Render Heatmap chart for data configuration panel', () => { }); it('Render Heatmap chart and verify data config panel no result found if metric is missing', () => { - cy.wait(delay); cy.get('[data-test-subj="viz-config-delete-btn"]').eq(3).click(); cy.get('[data-test-subj="viz-config-delete-btn"]').eq(2).click(); cy.get('.euiButton__text').contains('Update chart').click(); diff --git a/.cypress/integration/VisualizationCharts/9_verticalBar_chart.spec.js b/.cypress/integration/VisualizationCharts/9_verticalBar_chart.spec.js index 84df73994..3a9115cb5 100644 --- a/.cypress/integration/VisualizationCharts/9_verticalBar_chart.spec.js +++ b/.cypress/integration/VisualizationCharts/9_verticalBar_chart.spec.js @@ -31,6 +31,15 @@ const renderVerticalBarChart = () => { cy.get('[data-test-subj="comboBoxOptionsList "] button span').contains('Vertical bar').click({ force: true }); }; +describe('Adding sample data for visualizations', () => { + it('Adds sample flights data for visualizations to use', () => { + cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); + cy.get('div[data-test-subj="sampleDataSetCardlogs"]') + .contains(/(Add|View) data/) + .click(); + }); +}); + describe('Render vertical bar chart and verify default behaviour ', () => { beforeEach(() => { renderVerticalBarChart(); @@ -89,7 +98,6 @@ describe('Render vertical bar chart for data configuration panel', () => { }); it('Render vertical bar chart and verify data config panel no result found if metric is missing', () => { - cy.wait(delay); cy.get('[data-test-subj="viz-config-delete-btn"]').eq(3).click(); cy.get('[data-test-subj="viz-config-delete-btn"]').eq(2).click(); cy.get('.euiButton__text').contains('Update chart').click(); diff --git a/.cypress/utils/event_analytics/constants.js b/.cypress/utils/event_analytics/constants.js index 7d60fd186..83041d778 100644 --- a/.cypress/utils/event_analytics/constants.js +++ b/.cypress/utils/event_analytics/constants.js @@ -54,24 +54,24 @@ export const TEST_QUERIES = [ }, ]; +export const aggregationValues = [ + 'count', + 'sum', + 'avg', + 'max', + 'min', + 'var_samp', + 'var_pop', + 'stddev_samp', + 'stddev_pop', +]; + export const TESTING_PANEL = 'Mock Testing Panels'; export const SAVE_QUERY1 = 'Mock Flight Events Overview'; export const SAVE_QUERY2 = 'Mock Flight count by destination'; export const SAVE_QUERY3 = 'Mock Flight count by destination save to panel'; export const SAVE_QUERY4 = 'Mock Flight peek'; -export const aggregationValues = [ - 'COUNT', - 'SUM', - 'AVERAGE', - 'MAX', - 'MIN', - 'VAR_SAMP', - 'VAR_POP', - 'STDDEV_SAMP', - 'STDDEV_POP', -]; - export const querySearch = (query, rangeSelected) => { cy.get('[data-test-subj="searchAutocompleteTextArea"]', { timeout: COMMAND_TIMEOUT_LONG }) .clear() @@ -112,19 +112,15 @@ const vis_name_sub_string = Math.floor(Math.random() * 100); export const saveVisualizationAndVerify = () => { cy.get('[data-test-subj="eventExplorer__saveManagementPopover"]').click(); cy.get('[data-test-subj="eventExplorer__querySaveComboBox"]').click(); - cy.get('.euiComboBoxOptionsList__rowWrap .euiFilterSelectItem').eq(0).click(); - cy.get( - '.euiPopover__panel .euiFormControlLayoutIcons [data-test-subj="comboBoxToggleListButton"]' - ) + cy.get('.euiPopover__panel .euiFormControlLayoutIcons [data-test-subj="comboBoxToggleListButton"]') .eq(0) - .click(); - + .click({ force: true }); cy.get('.euiPopover__panel input') .eq(1) .type(`Test visualization` + vis_name_sub_string, { force: true }); - cy.get('[data-test-subj="eventExplorer__querySaveConfirm"]').click(); + cy.get('[data-test-subj="eventExplorer__querySaveConfirm"]').click({ force: true }); cy.wait(delay); - cy.get('.euiHeaderBreadcrumbs a').eq(1).click(); + cy.get('.euiHeaderBreadcrumbs a').eq(1).click({ force: true }); cy.get('.euiFlexGroup .euiFormControlLayout__childrenWrapper input') .eq(0) .type(`Test visualization` + vis_name_sub_string)