[TEST] add more osd namespacing (#9358)

* add more osd namespacing Signed-off-by: Justin Kim <jungkm@amazon.com> * fix imports Signed-off-by: Justin Kim <jungkm@amazon.com> * fix some flakiness in neo Signed-off-by: Justin Kim <jungkm@amazon.com> * add back in workspace_plugin commands Signed-off-by: Justin Kim <jungkm@amazon.com> * couple more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * couple more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * fix some namespace issue when rebasing to include caching.spec.js Signed-off-by: Justin Kim <jungkm@amazon.com> * adding more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * adding more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more change Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes and try adding retries Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * more changes Signed-off-by: Justin Kim <jungkm@amazon.com> * fix broken tests Signed-off-by: Justin Kim <jungkm@amazon.com> --------- Signed-off-by: Justin Kim <jungkm@amazon.com> Co-authored-by: Anan Zhuang <ananzh@amazon.com>
opensearch-project · Feb 24, 2025 · eba051a · eba051a
1 parent 242bd7b
commit eba051a
Show file tree

Hide file tree

Showing 53 changed files with 601 additions and 618 deletions.
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -8,9 +8,14 @@ import webpackPreprocessor from '@cypress/webpack-preprocessor';
 // TODO: import { paste } from 'copy-paste';
 
 module.exports = defineConfig({
-  defaultCommandTimeout: 60000,
+  experimentalMemoryManagement: true,
+  defaultCommandTimeout: 15000,
   requestTimeout: 60000,
   responseTimeout: 60000,
+  retries: {
+    runMode: 2,
+    openMode: 0,
+  },
   viewportWidth: 2000,
   viewportHeight: 1320,
   env: {

diff --git a/...s/apps/query_enhancements/a_check.spec.js → ...pps/query_enhancements/01/a_check.spec.js b/...s/apps/query_enhancements/a_check.spec.js → ...pps/query_enhancements/01/a_check.spec.js
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { DATASOURCE_NAME, PATHS, INDEX_WITH_TIME_1 } from '../../../../../utils/constants';
-import { getRandomizedWorkspaceName } from '../../../../../utils/apps/query_enhancements/shared';
-import { prepareTestSuite } from '../../../../../utils/helpers';
+import { DATASOURCE_NAME, PATHS, INDEX_WITH_TIME_1 } from '../../../../../../utils/constants';
+import { getRandomizedWorkspaceName } from '../../../../../../utils/apps/query_enhancements/shared';
+import { prepareTestSuite } from '../../../../../../utils/helpers';
 
 const workspaceName = getRandomizedWorkspaceName();
 
@@ -25,7 +25,8 @@ const noIndexPatternTestSuite = () => {
         authType: 'no_auth',
       });
       // Create workspace
-      cy.deleteAllWorkspaces();
+      cy.deleteWorkspaceByName(workspaceName);
+      cy.osd.deleteAllOldWorkspaces();
       cy.visit('/app/home');
       cy.osd.createInitialWorkspaceWithDataSource(DATASOURCE_NAME, workspaceName);
       cy.wait(2000);
@@ -40,12 +41,12 @@ const noIndexPatternTestSuite = () => {
     describe('empty state', () => {
       it('no index pattern', function () {
         // Go to the Discover page
-        cy.navigateToWorkSpaceSpecificPage({
+        cy.osd.navigateToWorkSpaceSpecificPage({
           workspaceName: workspaceName,
           page: 'discover',
           isEnhancement: true,
         });
-        cy.waitForLoader(true);
+        cy.osd.waitForLoader(true);
         cy.getElementByTestId('discoverNoIndexPatterns').should('be.visible');
       });
     });

diff --git a/...s/apps/query_enhancements/queries.spec.js → ...pps/query_enhancements/01/queries.spec.js b/...s/apps/query_enhancements/queries.spec.js → ...pps/query_enhancements/01/queries.spec.js
@@ -8,10 +8,10 @@ import {
   DATASOURCE_NAME,
   START_TIME,
   END_TIME,
-} from '../../../../../utils/apps/constants';
-import { PATHS } from '../../../../../utils/constants';
-import { getRandomizedWorkspaceName } from '../../../../../utils/apps/query_enhancements/shared';
-import { prepareTestSuite } from '../../../../../utils/helpers';
+} 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();
 
@@ -31,7 +31,8 @@ const queriesTestSuite = () => {
         authType: 'no_auth',
       });
       // Create workspace and set up index pattern
-      cy.deleteAllWorkspaces();
+      cy.deleteWorkspaceByName(workspace);
+      cy.osd.deleteAllOldWorkspaces();
       cy.visit('/app/home');
       cy.osd.createInitialWorkspaceWithDataSource(DATASOURCE_NAME, workspace);
       // Create and select index pattern for ${INDEX_WITH_TIME_1}*
@@ -44,7 +45,7 @@ const queriesTestSuite = () => {
         isEnhancement: true,
       });
       // Go to discover page
-      cy.navigateToWorkSpaceSpecificPage({
+      cy.osd.navigateToWorkSpaceSpecificPage({
         workspaceName: workspace,
         page: 'discover',
         isEnhancement: true,
@@ -64,7 +65,7 @@ const queriesTestSuite = () => {
 
         const query = `_id:N9srQ8opwBxGdIoQU3TW`;
         cy.setQueryEditor(query);
-        cy.waitForLoader(true);
+        cy.osd.waitForLoader(true);
         cy.waitForSearch();
         cy.verifyHitCount(1);
 
@@ -79,7 +80,7 @@ const queriesTestSuite = () => {
 
         const query = `_id:N9srQ8opwBxGdIoQU3TW`;
         cy.setQueryEditor(query);
-        cy.waitForLoader(true);
+        cy.osd.waitForLoader(true);
         cy.waitForSearch();
         cy.verifyHitCount(1);
 
@@ -92,7 +93,7 @@ const queriesTestSuite = () => {
         cy.setQueryLanguage('OpenSearch SQL');
 
         // Default SQL query should be set
-        cy.waitForLoader(true);
+        cy.osd.waitForLoader(true);
         cy.getElementByTestId(`osdQueryEditor__multiLine`).contains(
           `SELECT * FROM ${INDEX_WITH_TIME_1}* LIMIT 10`
         );
@@ -123,7 +124,7 @@ const queriesTestSuite = () => {
         cy.setTopNavDate(START_TIME, END_TIME);
 
         // Default PPL query should be set
-        cy.waitForLoader(true);
+        cy.osd.waitForLoader(true);
         cy.getElementByTestId(`osdQueryEditor__multiLine`).contains(
           `source = ${INDEX_WITH_TIME_1}*`
         );

diff --git a/...s/query_enhancements/saved_search.spec.js → ...uery_enhancements/01/saved_search.spec.js b/...s/query_enhancements/saved_search.spec.js → ...uery_enhancements/01/saved_search.spec.js
@@ -10,21 +10,21 @@ import {
   QueryLanguages,
   PATHS,
   DATASOURCE_NAME,
-} from '../../../../../utils/constants';
+} from '../../../../../../utils/constants';
 import {
   generateAllTestConfigurations,
   getRandomizedWorkspaceName,
   setDatePickerDatesAndSearchIfRelevant,
-} from '../../../../../utils/apps/query_enhancements/shared';
+} from '../../../../../../utils/apps/query_enhancements/shared';
 import {
   setSearchConfigurations,
   verifyDiscoverPageState,
   verifySavedSearchInAssetsPage,
   postRequestSaveSearch,
   updateSavedSearchAndSaveAndVerify,
   generateSavedTestConfiguration,
-} from '../../../../../utils/apps/query_enhancements/saved';
-import { prepareTestSuite } from '../../../../../utils/helpers';
+} from '../../../../../../utils/apps/query_enhancements/saved';
+import { prepareTestSuite } from '../../../../../../utils/helpers';
 
 const workspaceName = getRandomizedWorkspaceName();
 
@@ -50,7 +50,8 @@ const runSavedSearchTests = () => {
         authType: 'no_auth',
       });
       // Create workspace
-      cy.deleteAllWorkspaces();
+      cy.deleteWorkspaceByName(workspaceName);
+      cy.osd.deleteAllOldWorkspaces();
       cy.visit('/app/home');
       cy.osd.createInitialWorkspaceWithDataSource(DATASOURCE_NAME, workspaceName);
       cy.createWorkspaceIndexPatterns({
@@ -60,6 +61,7 @@ const runSavedSearchTests = () => {
         dataSource: DATASOURCE_NAME,
         isEnhancement: true,
       });
+      cy.osd.grabDataSourceId(workspaceName, DATASOURCE_NAME);
     });
 
     afterEach(() => {
@@ -71,7 +73,7 @@ const runSavedSearchTests = () => {
 
     generateAllTestConfigurations(generateSavedTestConfiguration).forEach((config) => {
       it(`should successfully create a saved search for ${config.testName}`, () => {
-        cy.navigateToWorkSpaceSpecificPage({
+        cy.osd.navigateToWorkSpaceSpecificPage({
           workspaceName,
           page: 'discover',
           isEnhancement: true,
@@ -106,7 +108,7 @@ const runSavedSearchTests = () => {
             // using a POST request to create a saved search to load
             postRequestSaveSearch(config);
 
-            cy.navigateToWorkSpaceSpecificPage({
+            cy.osd.navigateToWorkSpaceSpecificPage({
               workspaceName,
               page: 'discover',
               isEnhancement: true,

diff --git a/...ancements/simple_dataset_selector.spec.js → ...ements/01/simple_dataset_selector.spec.js b/...ancements/simple_dataset_selector.spec.js → ...ements/01/simple_dataset_selector.spec.js
@@ -10,18 +10,18 @@ import {
   INDEX_WITHOUT_TIME_1,
   PATHS,
   DATASOURCE_NAME,
-} from '../../../../../utils/constants';
+} from '../../../../../../utils/constants';
 import {
   getRandomizedWorkspaceName,
   getDefaultQuery,
   setDatePickerDatesAndSearchIfRelevant,
-} from '../../../../../utils/apps/query_enhancements/shared';
-import { verifyDiscoverPageState } from '../../../../../utils/apps/query_enhancements/saved';
+} from '../../../../../../utils/apps/query_enhancements/shared';
+import { verifyDiscoverPageState } from '../../../../../../utils/apps/query_enhancements/saved';
 import {
   generateSimpleDatasetSelectorTestConfigurations,
   validateItemsInSimpleDatasetSelectorDropDown,
-} from '../../../../../utils/apps/query_enhancements/simple_dataset_selector';
-import { prepareTestSuite } from '../../../../../utils/helpers';
+} from '../../../../../../utils/apps/query_enhancements/simple_dataset_selector';
+import { prepareTestSuite } from '../../../../../../utils/helpers';
 
 const workspaceName = getRandomizedWorkspaceName();
 const noIndexPatterns = 5; // Determines the no of index patterns that should be in the dropdown for filtering test case
@@ -48,7 +48,8 @@ export const runSimpleDatasetSelectorTests = () => {
         authType: 'no_auth',
       });
       // Create workspace
-      cy.deleteAllWorkspaces();
+      cy.deleteWorkspaceByName(workspaceName);
+      cy.osd.deleteAllOldWorkspaces();
       cy.visit('/app/home');
       cy.osd.createInitialWorkspaceWithDataSource(DATASOURCE_NAME, workspaceName);
       cy.createWorkspaceIndexPatterns({
@@ -90,7 +91,7 @@ export const runSimpleDatasetSelectorTests = () => {
       } Indexpattern when original language was ${
         config.language
       } from the simple dataset selector`, () => {
-        cy.navigateToWorkSpaceSpecificPage({
+        cy.osd.navigateToWorkSpaceSpecificPage({
           workspaceName,
           page: 'discover',
           isEnhancement: true,
@@ -169,7 +170,7 @@ export const runSimpleDatasetSelectorTests = () => {
     });
 
     it('validate filtering index pattern in simple dataset selector', () => {
-      cy.navigateToWorkSpaceSpecificPage({
+      cy.osd.navigateToWorkSpaceSpecificPage({
         workspaceName,
         page: 'discover',
         isEnhancement: true,

diff --git a/...ery_enhancements/dataset_selector.spec.js → ..._enhancements/02/dataset_selector.spec.js b/...ery_enhancements/dataset_selector.spec.js → ..._enhancements/02/dataset_selector.spec.js
@@ -10,23 +10,23 @@ import {
   INDEX_WITH_TIME_2,
   PATHS,
   DatasetTypes,
-} from '../../../../../utils/constants';
+} from '../../../../../../utils/constants';
 
 import {
   generateAllTestConfigurations,
   getRandomizedWorkspaceName,
   setDatePickerDatesAndSearchIfRelevant,
   getDefaultQuery,
-} from '../../../../../utils/apps/query_enhancements/shared';
+} from '../../../../../../utils/apps/query_enhancements/shared';
 
-import { verifyDiscoverPageState } from '../../../../../utils/apps/query_enhancements/saved';
+import { verifyDiscoverPageState } from '../../../../../../utils/apps/query_enhancements/saved';
 
 import {
   generateDatasetSelectorTestConfiguration,
   verifyBaseState,
   setUpBaseState,
-} from '../../../../../utils/apps/query_enhancements/dataset_selector';
-import { prepareTestSuite } from '../../../../../utils/helpers';
+} from '../../../../../../utils/apps/query_enhancements/dataset_selector';
+import { prepareTestSuite } from '../../../../../../utils/helpers';
 
 const workspaceName = getRandomizedWorkspaceName();
 
@@ -52,7 +52,8 @@ export const runDatasetSelectorTests = () => {
         authType: 'no_auth',
       });
       // Create workspace
-      cy.deleteAllWorkspaces();
+      cy.deleteWorkspaceByName(workspaceName);
+      cy.osd.deleteAllOldWorkspaces();
       cy.visit('/app/home');
       cy.osd.createInitialWorkspaceWithDataSource(DATASOURCE_NAME, workspaceName);
       cy.createWorkspaceIndexPatterns({
@@ -73,7 +74,7 @@ export const runDatasetSelectorTests = () => {
 
     generateAllTestConfigurations(generateDatasetSelectorTestConfiguration).forEach((config) => {
       it(`should be able to select and load ${config.testName} dataset-language combination using advanced dataset selector`, () => {
-        cy.navigateToWorkSpaceSpecificPage({
+        cy.osd.navigateToWorkSpaceSpecificPage({
           workspaceName,
           page: 'discover',
           isEnhancement: true,
@@ -98,7 +99,7 @@ export const runDatasetSelectorTests = () => {
       });
 
       it(`select the ${config.testName} dataset-language combination and cancelling the workflow restores the original state`, () => {
-        cy.navigateToWorkSpaceSpecificPage({
+        cy.osd.navigateToWorkSpaceSpecificPage({
           workspaceName,
           page: 'discover',
           isEnhancement: true,

diff --git a/...cements/language_specific_display.spec.js → ...ents/02/language_specific_display.spec.js b/...cements/language_specific_display.spec.js → ...ents/02/language_specific_display.spec.js
@@ -9,18 +9,18 @@ import {
   INDEX_WITH_TIME_1,
   INDEX_WITH_TIME_2,
   QueryLanguages,
-  SECONDARY_ENGINE,
-} from '../../../../../utils/constants';
+  PATHS,
+} from '../../../../../../utils/constants';
 import {
   generateAllTestConfigurations,
   getRandomizedWorkspaceName,
   setDatePickerDatesAndSearchIfRelevant,
-} from '../../../../../utils/apps/query_enhancements/shared';
+} from '../../../../../../utils/apps/query_enhancements/shared';
 import {
   generateDisplayTestConfiguration,
   getLanguageReferenceTestText,
-} from '../../../../../utils/apps/query_enhancements/language_specific_display';
-import { prepareTestSuite } from '../../../../../utils/helpers';
+} from '../../../../../../utils/apps/query_enhancements/language_specific_display';
+import { prepareTestSuite } from '../../../../../../utils/helpers';
 
 const workspaceName = getRandomizedWorkspaceName();
 
@@ -29,7 +29,7 @@ export const runDisplayTests = () => {
     beforeEach(() => {
       // Load test data
       cy.osd.setupTestData(
-        SECONDARY_ENGINE.url,
+        PATHS.SECONDARY_ENGINE,
         [
           `cypress/fixtures/query_enhancements/data_logs_1/${INDEX_WITH_TIME_1}.mapping.json`,
           `cypress/fixtures/query_enhancements/data_logs_1/${INDEX_WITH_TIME_2}.mapping.json`,
@@ -42,12 +42,13 @@ export const runDisplayTests = () => {
       // Add data source
       cy.osd.addDataSource({
         name: DATASOURCE_NAME,
-        url: SECONDARY_ENGINE.url,
+        url: PATHS.SECONDARY_ENGINE,
         authType: 'no_auth',
       });
 
       // Create workspace
-      cy.deleteAllWorkspaces();
+      cy.deleteWorkspaceByName(workspaceName);
+      cy.osd.deleteAllOldWorkspaces();
       cy.visit('/app/home');
       cy.osd.createInitialWorkspaceWithDataSource(DATASOURCE_NAME, workspaceName);
       cy.createWorkspaceIndexPatterns({
@@ -68,7 +69,7 @@ export const runDisplayTests = () => {
 
     generateAllTestConfigurations(generateDisplayTestConfiguration).forEach((config) => {
       it(`should correctly display all UI components for ${config.testName}`, () => {
-        cy.navigateToWorkSpaceSpecificPage({
+        cy.osd.navigateToWorkSpaceSpecificPage({
           workspaceName,
           page: 'discover',
           isEnhancement: true,
@@ -77,6 +78,7 @@ export const runDisplayTests = () => {
         cy.setDataset(config.dataset, DATASOURCE_NAME, config.datasetType);
 
         cy.setQueryLanguage(config.language);
+
         setDatePickerDatesAndSearchIfRelevant(config.language);
 
         // testing the query editor