From fe7687b4cb0a529c3b8bcf9b237e838097de846d Mon Sep 17 00:00:00 2001 From: David Cui Date: Fri, 9 Jul 2021 19:10:20 -0700 Subject: [PATCH 1/6] fix create test Signed-off-by: David Cui --- .../.cypress/integration/01-create.spec.ts | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dashboards-reports/.cypress/integration/01-create.spec.ts b/dashboards-reports/.cypress/integration/01-create.spec.ts index cdeee520..4a355f27 100644 --- a/dashboards-reports/.cypress/integration/01-create.spec.ts +++ b/dashboards-reports/.cypress/integration/01-create.spec.ts @@ -59,10 +59,18 @@ describe('Cypress', () => { cy.get('#reportSettingsDescription').type('Description for cypress test'); // select a report source - cy.get('.euiComboBox').click({ force: true }); + cy.get('[data-test-subj="comboBoxInput"]').eq(0).click({ force: true }); + + // select drop-down option in report source list + cy.contains('[Logs] Web Traffic').click(); // create an on-demand report definition cy.get('#createNewReportDefinition').click({ force: true }); + + cy.wait(12500); + + // check that re-direct to + cy.get('#reportDefinitionDetailsLink').should('exist'); }); it('Create a new scheduled report definition', () => { @@ -80,6 +88,12 @@ describe('Cypress', () => { // enter a report description cy.get('#reportSettingsDescription').type('Description for cypress test'); + // select a report source + cy.get('[data-test-subj="comboBoxInput"]').eq(0).click({ force: true }); + + // select drop-down option in report source list + cy.contains('[Logs] Web Traffic').click(); + // set report trigger to Schedule option cy.get('[type="radio"]').check({ force: true }); @@ -88,5 +102,10 @@ describe('Cypress', () => { // create scheduled report definition cy.get('#createNewReportDefinition').click({ force: true }); + + cy.wait(12500); + + // check that re-direct to + cy.get('#reportDefinitionDetailsLink').should('exist'); }); }); From 15ba774d6c83633498121953248fb51288e4d42c Mon Sep 17 00:00:00 2001 From: David Cui Date: Fri, 9 Jul 2021 19:22:40 -0700 Subject: [PATCH 2/6] more changes --- dashboards-reports/.cypress/integration/01-create.spec.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dashboards-reports/.cypress/integration/01-create.spec.ts b/dashboards-reports/.cypress/integration/01-create.spec.ts index 4a355f27..006ae64c 100644 --- a/dashboards-reports/.cypress/integration/01-create.spec.ts +++ b/dashboards-reports/.cypress/integration/01-create.spec.ts @@ -64,6 +64,8 @@ describe('Cypress', () => { // select drop-down option in report source list cy.contains('[Logs] Web Traffic').click(); + cy.wait(500); + // create an on-demand report definition cy.get('#createNewReportDefinition').click({ force: true }); @@ -94,6 +96,8 @@ describe('Cypress', () => { // select drop-down option in report source list cy.contains('[Logs] Web Traffic').click(); + cy.wait(500); + // set report trigger to Schedule option cy.get('[type="radio"]').check({ force: true }); From c81f7b744233e663162c95fcc0004ef1ef1c4a76 Mon Sep 17 00:00:00 2001 From: David Cui Date: Fri, 9 Jul 2021 19:31:16 -0700 Subject: [PATCH 3/6] add sample data --- .../.cypress/integration/01-create.spec.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dashboards-reports/.cypress/integration/01-create.spec.ts b/dashboards-reports/.cypress/integration/01-create.spec.ts index 006ae64c..65d6ac21 100644 --- a/dashboards-reports/.cypress/integration/01-create.spec.ts +++ b/dashboards-reports/.cypress/integration/01-create.spec.ts @@ -24,6 +24,18 @@ * permissions and limitations under the License. */ +describe('Adding sample data', () => { + it('Adds sample data', () => { + cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); + cy.get('div[data-test-subj="sampleDataSetCardflights"]').contains(/(Add|View) data/).click(); + cy.wait(3000); + cy.get('div[data-test-subj="sampleDataSetCardecommerce"]').contains(/(Add|View) data/).click(); + cy.wait(3000); + cy.get('div[data-test-subj="sampleDataSetCardlogs"]').contains(/(Add|View) data/).click(); + cy.wait(3000); + }); +}); + describe('Cypress', () => { it('Visits Reporting homepage', () => { cy.visit(`${Cypress.env('opensearchDashboards')}/app/reports-dashboards#/`); From 54a17b0ee0f62a75e7a0e5bc9a25ea096f9790a7 Mon Sep 17 00:00:00 2001 From: David Cui Date: Fri, 9 Jul 2021 19:49:26 -0700 Subject: [PATCH 4/6] add default timeout --- dashboards-reports/.cypress/integration/01-create.spec.ts | 3 --- dashboards-reports/cypress.json | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dashboards-reports/.cypress/integration/01-create.spec.ts b/dashboards-reports/.cypress/integration/01-create.spec.ts index 65d6ac21..1d0dcf0c 100644 --- a/dashboards-reports/.cypress/integration/01-create.spec.ts +++ b/dashboards-reports/.cypress/integration/01-create.spec.ts @@ -28,11 +28,8 @@ describe('Adding sample data', () => { it('Adds sample data', () => { cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); cy.get('div[data-test-subj="sampleDataSetCardflights"]').contains(/(Add|View) data/).click(); - cy.wait(3000); cy.get('div[data-test-subj="sampleDataSetCardecommerce"]').contains(/(Add|View) data/).click(); - cy.wait(3000); cy.get('div[data-test-subj="sampleDataSetCardlogs"]').contains(/(Add|View) data/).click(); - cy.wait(3000); }); }); diff --git a/dashboards-reports/cypress.json b/dashboards-reports/cypress.json index 7d041020..95f5f76e 100644 --- a/dashboards-reports/cypress.json +++ b/dashboards-reports/cypress.json @@ -6,6 +6,9 @@ "screenshotsFolder": ".cypress/screenshots", "supportFile": ".cypress/support/index.js", "videosFolder": ".cypress/videos", + "requestTimeout": 60000, + "responseTimeout": 60000, + "defaultCommandTimeout": 60000, "env": { "opensearch": "localhost:9200", "opensearchDashboards": "localhost:5601", From 742f89f790b55a7a1d273da44da58d061d181ee0 Mon Sep 17 00:00:00 2001 From: David Cui Date: Fri, 9 Jul 2021 19:53:49 -0700 Subject: [PATCH 5/6] add delay in between clicks --- dashboards-reports/.cypress/integration/01-create.spec.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dashboards-reports/.cypress/integration/01-create.spec.ts b/dashboards-reports/.cypress/integration/01-create.spec.ts index 1d0dcf0c..dd570971 100644 --- a/dashboards-reports/.cypress/integration/01-create.spec.ts +++ b/dashboards-reports/.cypress/integration/01-create.spec.ts @@ -27,9 +27,13 @@ describe('Adding sample data', () => { it('Adds sample data', () => { cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); + cy.wait(5000) cy.get('div[data-test-subj="sampleDataSetCardflights"]').contains(/(Add|View) data/).click(); + cy.wait(3000); cy.get('div[data-test-subj="sampleDataSetCardecommerce"]').contains(/(Add|View) data/).click(); + cy.wait(3000); cy.get('div[data-test-subj="sampleDataSetCardlogs"]').contains(/(Add|View) data/).click(); + cy.wait(3000); }); }); From 59356044611b9ca138eedfa2616cd8b3c87beb62 Mon Sep 17 00:00:00 2001 From: David Cui Date: Fri, 9 Jul 2021 20:01:50 -0700 Subject: [PATCH 6/6] reroute to sample data page after each addition --- dashboards-reports/.cypress/integration/01-create.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dashboards-reports/.cypress/integration/01-create.spec.ts b/dashboards-reports/.cypress/integration/01-create.spec.ts index dd570971..0fdf9ae6 100644 --- a/dashboards-reports/.cypress/integration/01-create.spec.ts +++ b/dashboards-reports/.cypress/integration/01-create.spec.ts @@ -27,11 +27,12 @@ describe('Adding sample data', () => { it('Adds sample data', () => { cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); - cy.wait(5000) cy.get('div[data-test-subj="sampleDataSetCardflights"]').contains(/(Add|View) data/).click(); cy.wait(3000); + cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); cy.get('div[data-test-subj="sampleDataSetCardecommerce"]').contains(/(Add|View) data/).click(); cy.wait(3000); + cy.visit(`${Cypress.env('opensearchDashboards')}/app/home#/tutorial_directory/sampleData`); cy.get('div[data-test-subj="sampleDataSetCardlogs"]').contains(/(Add|View) data/).click(); cy.wait(3000); });