Skip to content

Commit a876a80

Browse files
yujin-emmazhongnansu
yujin-emma
authored and
zhongnansu
committed
Update mds_tsvb.spec.js
Signed-off-by: yujin-emma <[email protected]>
1 parent 09f87be commit a876a80

File tree

4 files changed

+89
-55
lines changed

4 files changed

+89
-55
lines changed

‎cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_type_tsvb/mds_tsvb.spec.js

Lines changed: 31 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
TSVB_VIS_TYPE,
1717
} from '../../../../../utils/dashboards/vis_type_tsvb/constants';
1818

19-
describe('TSVB Visualization', () => {
19+
if (Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')) {
2020
before(() => {
2121
CURRENT_TENANT.newTenant = 'global';
2222
cy.fleshTenantSettings();
@@ -25,13 +25,20 @@ describe('TSVB Visualization', () => {
2525

2626
// Dashboards requires an index pattern to continue to the Create Visualization stage
2727
cy.deleteIndexPattern(TSVB_INDEX_PATTERN);
28+
29+
cy.wait(1000);
30+
cy.deleteSavedObjectByType(TSVB_VIS_TYPE, TSVB_INDEX_ID);
31+
2832
cy.createIndexPattern(TSVB_INDEX_PATTERN, {
29-
title: TSVB_INDEX_ID,
33+
title: TSVB_INDEX_PATTERN,
3034
timeFieldName: 'timestamp',
3135
});
3236

33-
cy.deleteSavedObjectByType(TSVB_VIS_TYPE, TSVB_INDEX_ID);
37+
cy.deleteDataSourceIndexNoAuth(TSVB_INDEX_ID);
38+
cy.deleteAllDataSources();
3439

40+
cy.createDataSourceNoAuth();
41+
cy.bulkUploadDocsToDataSourceNoAuth(TSVB_PATH_INDEX_DATA);
3542
// Visit the page
3643
cy.log('create a new tsvb visualization: ', TSVB_CREATE_URL);
3744
cy.visit(TSVB_CREATE_URL);
@@ -42,58 +49,31 @@ describe('TSVB Visualization', () => {
4249
cy.waitForLoader();
4350
});
4451

45-
if (Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')) {
46-
before(() => {
47-
cy.deleteDataSourceIndexNoAuth(TSVB_INDEX_ID);
48-
cy.createDataSourceNoAuth();
49-
cy.bulkUploadDocsToDataSourceNoAuth(TSVB_PATH_INDEX_DATA);
50-
});
51-
52-
describe('When MDS is enabled', () => {
53-
[
54-
{
55-
dataSourceName: DS_NO_AUTH_LABEL,
56-
canvasExists: 'exist',
57-
},
58-
].forEach(({ dataSourceName, canvasExists }) => {
59-
it(`should query data from ${dataSourceName} and resulting visualization should ${canvasExists}`, () => {
60-
cy.contains('button', 'Panel options').click();
61-
cy.contains('label', 'Data source');
62-
// Click on the dropdown to open it
63-
cy.get('[data-test-subj="dataSourceSelectorComboBox"]').click();
52+
after(() => {
53+
cy.deleteIndex(TSVB_INDEX_ID);
54+
cy.deleteIndexPattern(TSVB_INDEX_PATTERN);
6455

65-
// Find the option you want to select by its text and click on it
66-
cy.contains('[role="option"]', dataSourceName).click();
67-
cy.get('input[data-test-subj="metricsIndexPatternInput"]').type(
68-
TSVB_INDEX_ID
69-
);
70-
cy.tsvbSaveVisualization();
56+
cy.deleteDataSourceIndexNoAuth(TSVB_INDEX_ID);
57+
cy.deleteAllDataSources();
58+
});
7159

72-
cy.get('canvas').should(canvasExists);
73-
});
74-
});
75-
});
76-
} else {
77-
describe('When MDS is disabled', () => {
78-
it('should query from local cluster', () => {
60+
describe('TSVB Visualization (MDS is enabled)', () => {
61+
[
62+
{
63+
dataSourceName: DS_NO_AUTH_LABEL,
64+
canvasExists: 'exist',
65+
},
66+
].forEach(({ dataSourceName, canvasExists }) => {
67+
it(`should query data from ${dataSourceName} and resulting visualization should ${canvasExists}`, () => {
7968
cy.contains('button', 'Panel options').click();
80-
cy.get('input[data-test-subj="metricsIndexPatternInput"]').type(
81-
TSVB_INDEX_ID
82-
);
69+
cy.contains('label', 'Data source');
70+
// Click on the dropdown to open it
71+
cy.get('[data-test-subj="dataSourceSelectorComboBox"]').click();
72+
cy.contains('[role="option"]', dataSourceName).click();
73+
// use the default index for query data
8374
cy.tsvbSaveVisualization();
84-
// Visualization should be drawn; correct visualizations do not have warning messages
85-
cy.get('canvas').should('exist');
75+
cy.get('canvas').should(canvasExists);
8676
});
8777
});
88-
}
89-
90-
after(() => {
91-
cy.deleteIndex(TSVB_INDEX_ID);
92-
cy.deleteIndexPattern(TSVB_INDEX_PATTERN);
93-
94-
if (Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')) {
95-
cy.deleteDataSourceIndexNoAuth(TSVB_INDEX_ID);
96-
cy.deleteAllDataSources();
97-
}
9878
});
99-
});
79+
}

‎cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_type_tsvb/tsvb.spec.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
import { CURRENT_TENANT } from '../../../../../utils/commands';
7+
import {
8+
TSVB_INDEX_ID,
9+
TSVB_PATH_INDEX_DATA,
10+
TSVB_CREATE_URL,
11+
VIS_APP_PATH,
12+
TSVB_INDEX_START_TIME,
13+
TSVB_INDEX_END_TIME,
14+
TSVB_INDEX_PATTERN,
15+
TSVB_VIS_TYPE,
16+
} from '../../../../../utils/dashboards/vis_type_tsvb/constants';
17+
18+
if (!Cypress.env('DATASOURCE_MANAGEMENT_ENABLED')) {
19+
before(() => {
20+
CURRENT_TENANT.newTenant = 'global';
21+
cy.fleshTenantSettings();
22+
cy.deleteIndex(TSVB_INDEX_ID);
23+
cy.bulkUploadDocs(TSVB_PATH_INDEX_DATA);
24+
25+
// Dashboards requires an index pattern to continue to the Create Visualization stage
26+
cy.deleteIndexPattern(TSVB_INDEX_PATTERN);
27+
28+
cy.wait(1000);
29+
cy.deleteSavedObjectByType(TSVB_VIS_TYPE, TSVB_INDEX_ID);
30+
31+
cy.createIndexPattern(TSVB_INDEX_PATTERN, {
32+
title: TSVB_INDEX_PATTERN,
33+
timeFieldName: 'timestamp',
34+
});
35+
// Visit the page
36+
cy.log('create a new tsvb visualization: ', TSVB_CREATE_URL);
37+
cy.visit(TSVB_CREATE_URL);
38+
cy.url().should('contain', VIS_APP_PATH);
39+
cy.setTopNavDate(TSVB_INDEX_START_TIME, TSVB_INDEX_END_TIME);
40+
41+
// Wait for page to load
42+
cy.waitForLoader();
43+
});
44+
45+
after(() => {
46+
cy.deleteIndex(TSVB_INDEX_ID);
47+
cy.deleteIndexPattern(TSVB_INDEX_PATTERN);
48+
});
49+
50+
describe('TSVB Visualization (MDS is disabled)', () => {
51+
it(`should create new tsvb visulization`, () => {
52+
cy.contains('button', 'Panel options').click();
53+
cy.tsvbSaveVisualization();
54+
cy.get('canvas').should('exist');
55+
});
56+
});
57+
}

‎cypress/utils/dashboards/constants.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,5 @@ export * from './vis_type_table/constants';
2323
export * from './vis_type_timeline/constants';
2424
export * from './vis-augmenter/constants';
2525
export * from './data_explorer/constants';
26-
<<<<<<< HEAD
2726
export * from './vis_type_vega/constants';
28-
=======
2927
export * from './vis_type_tsvb/constants';
30-
>>>>>>> Add FT for TSVB support with MDS

‎cypress/utils/dashboards/vis_type_tsvb/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const TSVB_PATH_INDEX_DATA = TSVB_PATH_FIXTURE + TSVB_INDEX_DATA;
1313
// Update the constants
1414
export const TSVB_INDEX_START_TIME = 'May 16, 2010 @ 00:00:00.000';
1515
export const TSVB_INDEX_END_TIME = 'May 16, 2024 @ 00:00:00.000';
16-
export const TSVB_INDEX_ID = 'metrics';
16+
export const TSVB_INDEX_ID = 'vis-metrics';
1717
export const TSVB_INDEX_PATTERN = 'index-pattern-vis-metrics';
1818

1919
export const TSVB_VIS_TYPE = 'visualization';

0 commit comments

Comments
 (0)