Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TEST] refactor all tests to be consistent across different source codes #9319

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[TEST] refactor all tests to be consistent across different source codes #9319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cypress.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ module.exports = defineConfig({
ML_COMMONS_DASHBOARDS_ENABLED: true,
WAIT_FOR_LOADER_BUFFER_MS: 0,
DISABLE_LOCAL_CLUSTER: false,
SOURCE_CODE: 'osd',
},
e2e: {
baseUrl: 'http://localhost:5601',
Expand Down
93 changes: 53 additions & 40 deletions .../core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/a_check.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,66 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { DATASOURCE_NAME } from '../../../../../utils/apps/constants';
import { SECONDARY_ENGINE } from '../../../../../utils/constants';
import {
DATASOURCE_NAME,
INDEX_WITH_TIME_1,
INDEX_WITH_TIME_2,
} from '../../../../../utils/apps/constants';
import { PATHS } from '../../../../../utils/constants';
import { getRandomizedWorkspaceName } from '../../../../../utils/apps/query_enhancements/shared';
import { prepareTestSuite } from '../../../../../utils/helpers';

const workspace = getRandomizedWorkspaceName();

describe('No Index Pattern Check Test', () => {
before(() => {
// Load test data
cy.setupTestData(
SECONDARY_ENGINE.url,
[
'cypress/fixtures/query_enhancements/data_logs_1/data_logs_small_time_1.mapping.json',
'cypress/fixtures/query_enhancements/data_logs_2/data_logs_small_time_2.mapping.json',
],
[
'cypress/fixtures/query_enhancements/data_logs_1/data_logs_small_time_1.data.ndjson',
'cypress/fixtures/query_enhancements/data_logs_2/data_logs_small_time_2.data.ndjson',
]
);
const noIndexPatternTestSuite = () => {
describe('No Index Pattern Check Test', () => {
beforeEach(() => {
// Load test data
cy.osd.setupTestData(
PATHS.SECONDARY_ENGINE,
[
`cypress/fixtures/query_enhancements/data_logs_1/${INDEX_WITH_TIME_1}.mapping.json`,
`cypress/fixtures/query_enhancements/data_logs_2/${INDEX_WITH_TIME_2}.mapping.json`,
],
[
`cypress/fixtures/query_enhancements/data_logs_1/${INDEX_WITH_TIME_1}.data.ndjson`,
`cypress/fixtures/query_enhancements/data_logs_2/${INDEX_WITH_TIME_2}.data.ndjson`,
]
);

// Add data source
cy.addDataSource({
name: `${DATASOURCE_NAME}`,
url: `${SECONDARY_ENGINE.url}`,
authType: 'no_auth',
// Add data source
cy.osd.addDataSource({
name: `${DATASOURCE_NAME}`,
url: `${PATHS.SECONDARY_ENGINE}`,
authType: 'no_auth',
});
// Create workspace
cy.deleteAllWorkspaces();
cy.visit('/app/home');
cy.osd.createInitialWorkspaceWithDataSource(DATASOURCE_NAME, workspace);
cy.wait(2000);
});
// Create workspace
cy.deleteWorkspaceByName(workspace);
cy.visit('/app/home');
cy.osd.createInitialWorkspaceWithDataSource(DATASOURCE_NAME, workspace);
cy.wait(2000);
});

after(() => {
cy.deleteWorkspaceByName(`${workspace}`);
cy.deleteDataSourceByName(`${DATASOURCE_NAME}`);
// TODO: Modify deleteIndex to handle an array of index and remove hard code
cy.deleteIndex('data_logs_small_time_1');
cy.deleteIndex('data_logs_small_time_2');
});
afterEach(() => {
cy.deleteWorkspaceByName(`${workspace}`);
cy.osd.deleteDataSourceByName(`${DATASOURCE_NAME}`);
cy.osd.deleteIndex(INDEX_WITH_TIME_1);
cy.osd.deleteIndex(INDEX_WITH_TIME_2);
});

describe('empty state', () => {
it('no index pattern', function () {
// Go to the Discover page
cy.waitForLoader(true);
cy.getElementByTestId('discoverNoIndexPatterns');
describe('empty state', () => {
it('no index pattern', function () {
// Go to the Discover page
cy.navigateToWorkSpaceSpecificPage({
workspaceName: workspace,
page: 'discover',
isEnhancement: true,
});
cy.waitForLoader(true);
cy.getElementByTestId('discoverNoIndexPatterns').should('be.visible');
});
});
});
});
};

prepareTestSuite('a_check', noIndexPatternTestSuite);
41 changes: 20 additions & 21 deletions ...nsearch_dashboards/opensearch_dashboards/apps/query_enhancements/dataset_selector.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
*/

import {
DATASOURCE_NAME,
INDEX_PATTERN_WITH_TIME,
INDEX_WITH_TIME_1,
INDEX_WITH_TIME_2,
SECONDARY_ENGINE,
PATHS,
} from '../../../../../utils/constants';

import {
generateAllTestConfigurations,
getRandomizedWorkspaceName,
getRandomizedDatasourceName,
setDatePickerDatesAndSearchIfRelevant,
getDefaultQuery,
} from '../../../../../utils/apps/query_enhancements/shared';
Expand All @@ -25,16 +25,16 @@ import {
verifyBaseState,
setUpBaseState,
} from '../../../../../utils/apps/query_enhancements/dataset_selector';
import { prepareTestSuite } from '../../../../../utils/helpers';

const workspaceName = getRandomizedWorkspaceName();
const dataSourceName = getRandomizedDatasourceName();

export const runDatasetSelectorTests = () => {
describe('dataset selector', { scrollBehavior: false }, () => {
beforeEach(() => {
// Load test data
cy.setupTestData(
SECONDARY_ENGINE.url,
cy.osd.setupTestData(
PATHS.SECONDARY_ENGINE,
[
`cypress/fixtures/query_enhancements/data_logs_1/${INDEX_WITH_TIME_1}.mapping.json`,
`cypress/fixtures/query_enhancements/data_logs_2/${INDEX_WITH_TIME_2}.mapping.json`,
Expand All @@ -45,31 +45,30 @@ export const runDatasetSelectorTests = () => {
]
);
// Add data source
cy.addDataSource({
name: dataSourceName,
url: SECONDARY_ENGINE.url,
cy.osd.addDataSource({
name: DATASOURCE_NAME,
url: PATHS.SECONDARY_ENGINE,
authType: 'no_auth',
});

// Create workspace
cy.deleteWorkspaceByName(workspaceName);
cy.deleteAllWorkspaces();
cy.visit('/app/home');
cy.osd.createInitialWorkspaceWithDataSource(dataSourceName, workspaceName);
cy.osd.createInitialWorkspaceWithDataSource(DATASOURCE_NAME, workspaceName);
cy.createWorkspaceIndexPatterns({
workspaceName: workspaceName,
indexPattern: INDEX_PATTERN_WITH_TIME.replace('*', ''),
timefieldName: 'timestamp',
dataSource: dataSourceName,
dataSource: DATASOURCE_NAME,
isEnhancement: true,
});
});

afterEach(() => {
cy.deleteWorkspaceByName(workspaceName);
// TODO: Modify deleteIndex to handle an array of index and remove hard code
cy.deleteDataSourceByName(dataSourceName);
cy.deleteIndex(INDEX_WITH_TIME_1);
cy.deleteIndex(INDEX_WITH_TIME_2);
cy.osd.deleteDataSourceByName(DATASOURCE_NAME);
cy.osd.deleteIndex(INDEX_WITH_TIME_1);
cy.osd.deleteIndex(INDEX_WITH_TIME_2);
});

generateAllTestConfigurations(generateDatasetSelectorTestConfiguration).forEach((config) => {
Expand All @@ -81,9 +80,9 @@ export const runDatasetSelectorTests = () => {
});

if (config.datasetType === 'INDEX_PATTERN') {
cy.setIndexPatternFromAdvancedSelector(config.dataset, dataSourceName, config.language);
cy.setIndexPatternFromAdvancedSelector(config.dataset, DATASOURCE_NAME, config.language);
} else {
cy.setIndexAsDataset(config.dataset, dataSourceName, config.language);
cy.setIndexAsDataset(config.dataset, DATASOURCE_NAME, config.language);
}
setDatePickerDatesAndSearchIfRelevant(config.language);

Expand All @@ -106,7 +105,7 @@ export const runDatasetSelectorTests = () => {
});

// Setup the base state
setUpBaseState(INDEX_PATTERN_WITH_TIME, dataSourceName);
setUpBaseState(INDEX_PATTERN_WITH_TIME, DATASOURCE_NAME);

// Verify if the base state is setup properly
verifyBaseState(INDEX_PATTERN_WITH_TIME);
Expand All @@ -115,14 +114,14 @@ export const runDatasetSelectorTests = () => {
if (config.datasetType === 'INDEX_PATTERN') {
cy.setIndexPatternFromAdvancedSelector(
config.dataset,
dataSourceName,
DATASOURCE_NAME,
config.language,
'cancel'
);
} else {
cy.setIndexAsDataset(
config.dataset,
dataSourceName,
DATASOURCE_NAME,
config.language,
'timestamp',
'cancel'
Expand All @@ -136,4 +135,4 @@ export const runDatasetSelectorTests = () => {
});
};

runDatasetSelectorTests();
prepareTestSuite('Dataset Selector', runDatasetSelectorTests);
Loading
Loading