fix: route error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
SuZhou-Joe · Sep 6, 2023 · f5ac4fc · f5ac4fc
1 parent fd67e67
commit f5ac4fc
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 22 deletions.
diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.js b/test/functional/apps/dashboard/create_and_add_embeddables.js
@@ -126,8 +126,7 @@ export default function ({ getService, getPageObjects }) {
         });
 
         after(async () => {
-          await PageObjects.header.clickStackManagement();
-          await PageObjects.settings.clickOpenSearchDashboardsSettings();
+          await PageObjects.settings.navigateTo();
           await PageObjects.settings.clearAdvancedSettings(VISUALIZE_ENABLE_LABS_SETTING);
           await PageObjects.header.clickDashboard();
         });

diff --git a/test/functional/apps/management/_handle_alias.js b/test/functional/apps/management/_handle_alias.js
@@ -60,7 +60,6 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('should be able to create index pattern without time field', async function () {
-      await PageObjects.settings.navigateTo();
       await PageObjects.settings.createIndexPattern('alias1*', null);
     });
 
@@ -73,7 +72,6 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('should be able to create index pattern with timefield', async function () {
-      await PageObjects.settings.navigateTo();
       await PageObjects.settings.createIndexPattern('alias2*', 'date');
     });
 

diff --git a/test/functional/apps/management/_handle_version_conflict.js b/test/functional/apps/management/_handle_version_conflict.js
@@ -55,7 +55,6 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('Should be able to surface version conflict notification while creating scripted field', async function () {
-      await PageObjects.settings.navigateTo();
       await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns();
       await PageObjects.settings.clickIndexPatternLogstash();
       await PageObjects.settings.clickScriptedFieldsTab();
@@ -84,7 +83,6 @@ export default function ({ getService, getPageObjects }) {
 
     it('Should be able to surface version conflict notification while changing field format', async function () {
       const fieldName = 'geo.srcdest';
-      await PageObjects.settings.navigateTo();
       await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns();
       await PageObjects.settings.clickIndexPatternLogstash();
       log.debug('Starting openControlsByName (' + fieldName + ')');

diff --git a/test/functional/apps/management/_index_pattern_filter.js b/test/functional/apps/management/_index_pattern_filter.js
@@ -39,7 +39,6 @@ export default function ({ getService, getPageObjects }) {
     before(async function () {
       // delete .kibana index and then wait for OpenSearch Dashboards to re-create it
       await opensearchDashboardsServer.uiSettings.replace({});
-      await PageObjects.settings.navigateTo();
       await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns();
     });
 
@@ -52,7 +51,6 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('should filter indexed fields', async function () {
-      await PageObjects.settings.navigateTo();
       await PageObjects.settings.clickOpenSearchDashboardsIndexPatterns();
       await PageObjects.settings.clickIndexPatternLogstash();
       await PageObjects.settings.getFieldTypes();

diff --git a/test/functional/apps/visualize/_custom_branding.ts b/test/functional/apps/visualize/_custom_branding.ts
@@ -46,7 +46,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('with customized logo for opensearch overview header in dark mode', async () => {
-        await PageObjects.common.navigateToApp('management/opensearch-dashboards/settings');
+        await PageObjects.settings.navigateTo();
         await PageObjects.settings.toggleAdvancedSettingCheckbox('theme:darkMode');
         await PageObjects.common.navigateToApp('opensearch_dashboards_overview');
         await testSubjects.existOrFail('osdOverviewPageHeaderLogo');
@@ -100,7 +100,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('with customized logo in dark mode', async () => {
-        await PageObjects.common.navigateToApp('management/opensearch-dashboards/settings');
+        await PageObjects.settings.navigateTo();
         await PageObjects.settings.toggleAdvancedSettingCheckbox('theme:darkMode');
         await PageObjects.common.navigateToApp('home');
         await testSubjects.existOrFail('welcomeCustomLogo');
@@ -185,7 +185,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         });
 
         after(async function () {
-          await PageObjects.common.navigateToApp('management/opensearch-dashboards/settings');
+          await PageObjects.settings.navigateTo();
           await PageObjects.settings.clearAdvancedSettings('theme:darkMode');
         });
 
@@ -206,7 +206,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         });
 
         it('with customized mark logo button that navigates to home page', async () => {
-          await PageObjects.common.navigateToApp('settings');
+          await PageObjects.settings.navigateTo();
           await globalNav.clickHomeButton();
           await PageObjects.header.waitUntilLoadingHasFinished();
           const url = await browser.getCurrentUrl();

diff --git a/test/functional/apps/visualize/_lab_mode.js b/test/functional/apps/visualize/_lab_mode.js
@@ -47,8 +47,7 @@ export default function ({ getService, getPageObjects }) {
       log.info('found saved search before toggling enableLabs mode');
 
       // Navigate to advanced setting and disable lab mode
-      await PageObjects.header.clickStackManagement();
-      await PageObjects.settings.clickOpenSearchDashboardsSettings();
+      await PageObjects.settings.navigateTo();
       await PageObjects.settings.toggleAdvancedSettingCheckbox(VISUALIZE_ENABLE_LABS_SETTING);
 
       // Expect the discover still to list that saved visualization in the open list
@@ -61,8 +60,7 @@ export default function ({ getService, getPageObjects }) {
 
     after(async () => {
       await PageObjects.discover.closeLoadSaveSearchPanel();
-      await PageObjects.header.clickStackManagement();
-      await PageObjects.settings.clickOpenSearchDashboardsSettings();
+      await PageObjects.settings.navigateTo();
       await PageObjects.settings.clearAdvancedSettings(VISUALIZE_ENABLE_LABS_SETTING);
     });
   });

diff --git a/test/functional/config.js b/test/functional/config.js
@@ -102,10 +102,6 @@ export default async function ({ readConfigFile }) {
       management: {
         pathname: '/app/management',
       },
-      /** @obsolete "management" should be instead of "settings" **/
-      settings: {
-        pathname: '/app/management',
-      },
       console: {
         pathname: '/app/dev_tools',
         hash: '/console',

diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
@@ -51,7 +51,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
       await find.clickByDisplayedLinkText(text);
     }
     async clickOpenSearchDashboardsSettings() {
-      await testSubjects.click('settings');
+      await PageObjects.common.navigateToApp('settings');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await testSubjects.existOrFail('managementSettingsTitle');
     }
@@ -63,7 +63,7 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
 
     async clickOpenSearchDashboardsIndexPatterns() {
       log.debug('clickOpenSearchDashboardsIndexPatterns link');
-      await testSubjects.click('indexPatterns');
+      await PageObjects.common.navigateToApp('indexPatterns');
 
       await PageObjects.header.waitUntilLoadingHasFinished();
     }