refactoring

mariasergeenko · mariasergeenko · commit 300bba29eac9 · 2023-05-03T11:49:52.000+02:00
diff --git a/tests/e2e/helpers/database.ts b/tests/e2e/helpers/database.ts
@@ -5,15 +5,15 @@ import {
     MyRedisDatabasePage,
     BrowserPage,
     AutoDiscoverREDatabases,
-    UserAgreementPage
 } from '../pageObjects';
+import { UserAgreementDialog } from '../pageObjects/dialogs';
 import { addNewStandaloneDatabaseApi, discoverSentinelDatabaseApi, getDatabaseIdByName } from './api/api-database';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const discoverMasterGroupsPage = new DiscoverMasterGroupsPage();
 const autoDiscoverREDatabases = new AutoDiscoverREDatabases();
 const browserPage = new BrowserPage();
-const userAgreementPage = new UserAgreementPage();
+const userAgreementDialog = new UserAgreementDialog();
 
 /**
  * Add a new database manually using host and port
@@ -55,6 +55,7 @@ export async function addNewREClusterDatabase(databaseParameters: AddNewDatabase
     // Fill the add database form
     await myRedisDatabasePage.AddRedisDatabase.addAutodiscoverREClucterDatabase(databaseParameters);
     // Click on submit button
+    await t.debug();
     await t
         .click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
     // Wait for database to be exist in the list of Autodiscover databases and select it
@@ -214,7 +215,7 @@ export async function addRECloudDatabase(databaseParameters: AddNewDatabaseParam
 // Accept License terms
 export async function acceptLicenseTerms(): Promise<void> {
     await t.maximizeWindow();
-    await userAgreementPage.acceptLicenseTerms();
+    await userAgreementDialog.acceptLicenseTerms();
 }
 
 // Accept License terms and connect to the RedisStack database
diff --git a/tests/e2e/helpers/notifications.ts b/tests/e2e/helpers/notifications.ts
@@ -1,6 +1,6 @@
 import { join } from 'path';
 import * as os from 'os';
-import { NotificationParameters } from '../pageObjects/components/notification-panel';
+import { NotificationParameters } from '../pageObjects/components/navigation/notification-panel';
 
 const workingDirectory = process.env.APP_FOLDER_ABSOLUTE_PATH
     || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-v2'));
diff --git a/tests/e2e/pageObjects/auto-discover-redis-enterprise-databases.ts b/tests/e2e/pageObjects/auto-discover-redis-enterprise-databases.ts
@@ -1,6 +1,7 @@
 import { Selector } from 'testcafe';
+import { BasePage } from './base-page';
 
-export class AutoDiscoverREDatabases {
+export class AutoDiscoverREDatabases extends BasePage {
     //-------------------------------------------------------------------------------------------
     //DECLARATION OF SELECTORS
     //*Declare all elements/components of the relevant page.
diff --git a/tests/e2e/pageObjects/base-page.ts b/tests/e2e/pageObjects/base-page.ts
@@ -1,8 +1,10 @@
 import { t } from 'testcafe';
 import { NavigationPanel } from './components/navigation-panel';
+import { ShortcutsPanel } from './components/shortcuts-panel';
 
 export class BasePage {
     NavigationPanel = new NavigationPanel();
+    ShortcutsPanel = new ShortcutsPanel();
 
     /**
      * Reload page
diff --git a/tests/e2e/pageObjects/cluster-details-page.ts b/tests/e2e/pageObjects/cluster-details-page.ts
@@ -1,6 +1,7 @@
 import { Selector } from 'testcafe';
+import { InstancePage } from './instance-page';
 
-export class OverviewPage {
+export class ClusterDetailsPage extends InstancePage {
     //CSS Selectors
     cssTableRow = 'tr[class=euiTableRow]';
     //-------------------------------------------------------------------------------------------
@@ -17,10 +18,6 @@ export class OverviewPage {
     tableHeaderCell = Selector('[data-test-subj^=tableHeaderCell]');
     primaryNodesTable = Selector('[data-testid=primary-nodes-table]');
     tableRow = Selector('tr[class=euiTableRow]');
-    connectedClientsValue = Selector('[data-testid^=connectedClients-value]');
-    totalKeysValue = Selector('[data-testid^=totalKeys-value]');
-    networkInputValue = Selector('[data-testid^=networkInKbps-value]');
-    networkOutputValue = Selector('[data-testid^=networkOutKbps-value]');
 
     /**
      * Get Primary nodes count in table
diff --git a/tests/e2e/pageObjects/components/navigation-panel.ts b/tests/e2e/pageObjects/components/navigation-panel.ts
@@ -1,9 +1,11 @@
 import { Selector } from 'testcafe';
 
-import NotificationPanel from './notification-panel';
+import NotificationPanel from './navigation/notification-panel';
+import { HelpCenter } from './navigation/help-center';
 
 export class NavigationPanel {
     NotificationPanel = new NotificationPanel();
+    HelpCenter  = new HelpCenter();
 
     workbenchButton = Selector('[data-testid=workbench-page-btn]');
     analysisPageButton = Selector('[data-testid=analytics-page-btn]');
diff --git a/tests/e2e/pageObjects/components/navigation/help-center.ts b/tests/e2e/pageObjects/components/navigation/help-center.ts
@@ -1,6 +1,6 @@
 import { Selector } from 'testcafe';
 
-export class HelpCenterPage {
+export class HelpCenter {
     //-------------------------------------------------------------------------------------------
     //DECLARATION OF SELECTORS
     //*Declare all elements/components of the relevant page.
diff --git a/tests/e2e/pageObjects/components/navigation/notification-panel.ts b/tests/e2e/pageObjects/components/navigation/notification-panel.ts
diff --git a/tests/e2e/pageObjects/components/shortcuts-panel.ts b/tests/e2e/pageObjects/components/shortcuts-panel.ts
@@ -1,6 +1,6 @@
 import { Selector } from 'testcafe';
 
-export class ShortcutsPage {
+export class ShortcutsPanel {
     //-------------------------------------------------------------------------------------------
     //DECLARATION OF SELECTORS
     //*Declare all elements/components of the relevant page.
diff --git a/tests/e2e/pageObjects/dialogs/index.ts b/tests/e2e/pageObjects/dialogs/index.ts
@@ -0,0 +1,7 @@
+import { OnboardingCardsDialog } from './onboarding-cards-dialog';
+import { UserAgreementDialog } from './user-agreement-dialog';
+
+export {
+    OnboardingCardsDialog,
+    UserAgreementDialog
+};
diff --git a/tests/e2e/pageObjects/dialogs/user-agreement-dialog.ts b/tests/e2e/pageObjects/dialogs/user-agreement-dialog.ts
@@ -1,6 +1,6 @@
 import { t, Selector } from 'testcafe';
 
-export class UserAgreementPage {
+export class UserAgreementDialog {
     //-------------------------------------------------------------------------------------------
     //DECLARATION OF SELECTORS
     //*Declare all elements/components of the relevant page.
diff --git a/tests/e2e/pageObjects/index.ts b/tests/e2e/pageObjects/index.ts
@@ -2,12 +2,9 @@ import { AutoDiscoverREDatabases } from './auto-discover-redis-enterprise-databa
 import { BrowserPage } from './browser-page';
 import { MyRedisDatabasePage } from './my-redis-databases-page';
 import { SettingsPage } from './settings-page';
-import { UserAgreementPage } from './user-agreement-page';
 import { WorkbenchPage } from './workbench-page';
-import { HelpCenterPage } from './help-center-page';
-import { ShortcutsPage } from './shortcuts-page';
 import { MemoryEfficiencyPage } from './memory-efficiency-page';
-import { OverviewPage } from './overview-page';
+import { ClusterDetailsPage } from './cluster-details-page';
 import { PubSubPage } from './pub-sub-page';
 import { SlowLogPage } from './slow-log-page';
 import { BasePage } from './base-page';
@@ -18,12 +15,9 @@ export {
     BrowserPage,
     MyRedisDatabasePage,
     SettingsPage,
-    UserAgreementPage,
     WorkbenchPage,
-    HelpCenterPage,
-    ShortcutsPage,
     MemoryEfficiencyPage,
-    OverviewPage,
+    ClusterDetailsPage,
     PubSubPage,
     SlowLogPage,
     BasePage,
diff --git a/tests/e2e/tests/critical-path/a-first-start-form/user-agreements-form.e2e.ts b/tests/e2e/tests/critical-path/a-first-start-form/user-agreements-form.e2e.ts
@@ -1,9 +1,10 @@
 import { commonUrl } from '../../../helpers/conf';
-import { UserAgreementPage, SettingsPage, MyRedisDatabasePage } from '../../../pageObjects';
+import { SettingsPage, MyRedisDatabasePage } from '../../../pageObjects';
 import { Common } from '../../../helpers/common';
 import { env, rte } from '../../../helpers/constants';
+import { UserAgreementDialog } from '../../../pageObjects/dialogs';
 
-const userAgreementPage = new UserAgreementPage();
+const userAgreementDialog = new UserAgreementDialog();
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const settingsPage = new SettingsPage();
 
@@ -15,28 +16,28 @@ fixture `Agreements Verification`
         await t.maximizeWindow();
     });
 test('Verify that user should accept User Agreements to continue working with the application', async t => {
-    await t.expect(userAgreementPage.userAgreementsPopup.exists).ok('User Agreements Popup is shown');
+    await t.expect(userAgreementDialog.userAgreementsPopup.exists).ok('User Agreements Popup is shown');
     await t.click(myRedisDatabasePage.AddRedisDatabase.addDatabaseButton);
     // Verify that I still has agreements popup & cannot add a database
-    await t.expect(userAgreementPage.userAgreementsPopup.exists).ok('User Agreements Popup is shown');
+    await t.expect(userAgreementDialog.userAgreementsPopup.exists).ok('User Agreements Popup is shown');
     await t.expect(myRedisDatabasePage.AddRedisDatabase.addDatabaseManually.exists).notOk('User can\'t add a database');
 });
 test('Verify that the encryption enabled by default and specific message', async t => {
     const expectedPluginText = 'To avoid automatic execution of malicious code, when adding new Workbench plugins, use files from trusted authors only.';
     // Verify that section with plugin warning is displayed
-    await t.expect(userAgreementPage.pluginSectionWithText.exists).ok('Plugin text is not displayed');
+    await t.expect(userAgreementDialog.pluginSectionWithText.exists).ok('Plugin text is not displayed');
     // Verify that text that is displayed in window is 'While adding new visualization plugins, use files only from trusted authors to avoid automatic execution of malicious code.'
-    const pluginText = userAgreementPage.pluginSectionWithText.innerText;
+    const pluginText = userAgreementDialog.pluginSectionWithText.innerText;
     await t.expect(pluginText).eql(expectedPluginText, 'Plugin text is incorrect');
     // Verify that encryption enabled by default
-    await t.expect(userAgreementPage.switchOptionEncryption.withAttribute('aria-checked', 'true').exists).ok('Encryption enabled by default');
+    await t.expect(userAgreementDialog.switchOptionEncryption.withAttribute('aria-checked', 'true').exists).ok('Encryption enabled by default');
 });
 test('Verify that the Welcome page is opened after user agrees', async t => {
     // Accept agreements
     await t.click(settingsPage.switchEulaOption);
     await t.click(settingsPage.submitConsentsPopupButton);
     // Verify that I dont have an popup
-    await t.expect(userAgreementPage.userAgreementsPopup.exists).notOk('User Agreements Popup isn\'t shown after accept agreements');
+    await t.expect(userAgreementDialog.userAgreementsPopup.exists).notOk('User Agreements Popup isn\'t shown after accept agreements');
     // Verify that Welcome page is displayed after user agrees
     await t.expect(myRedisDatabasePage.AddRedisDatabase.welcomePageTitle.exists).ok('Welcome page is displayed');
     // Verify I can work with the application
@@ -48,27 +49,27 @@ test('Verify that when user checks "Use recommended settings" option on EULA scr
     await t.expect(await settingsPage.getAnalyticsSwitcherValue()).notOk('Enable Analytics switcher is checked');
     await t.expect(await settingsPage.getNotificationsSwitcherValue()).notOk('Enable Notifications switcher is checked');
     // Check Use recommended settings switcher
-    await t.click(userAgreementPage.recommendedSwitcher);
+    await t.click(userAgreementDialog.recommendedSwitcher);
     // Verify options checked after enabling Use recommended settings
     await t.expect(await settingsPage.getAnalyticsSwitcherValue()).ok('Enable Analytics switcher is unchecked');
     await t.expect(await settingsPage.getNotificationsSwitcherValue()).ok('Enable Notifications switcher is unchecked');
     await t.expect(await settingsPage.getEulaSwitcherValue()).notOk('EULA switcher is checked');
     // Uncheck Use recommended settings switcher
-    await t.click(userAgreementPage.recommendedSwitcher);
+    await t.click(userAgreementDialog.recommendedSwitcher);
     // Verify that when user unchecks "Use recommended settings" option on EULA screen, previous state of checkboxes for the options is applied
     await t.expect(await settingsPage.getAnalyticsSwitcherValue()).notOk('Enable Analytics switcher is checked');
     await t.expect(await settingsPage.getNotificationsSwitcherValue()).notOk('Enable Notifications switcher is checked');
     await t.expect(await settingsPage.getEulaSwitcherValue()).notOk('EULA switcher is checked');
 });
 test('Verify that if "Use recommended settings" is selected, and user unchecks any of the option, "Use recommended settings" is unchecked', async t => {
     // Check Use recommended settings switcher
-    await t.click(userAgreementPage.recommendedSwitcher);
+    await t.click(userAgreementDialog.recommendedSwitcher);
     // Verify Use recommended settings switcher unchecked after unchecking analytics switcher
     await t.click(settingsPage.switchAnalyticsOption);
-    await t.expect(await userAgreementPage.getRecommendedSwitcherValue()).eql('false', 'Use recommended settings switcher is still checked');
+    await t.expect(await userAgreementDialog.getRecommendedSwitcherValue()).eql('false', 'Use recommended settings switcher is still checked');
     // Check Use recommended settings switcher
-    await t.click(userAgreementPage.recommendedSwitcher);
+    await t.click(userAgreementDialog.recommendedSwitcher);
     // Verify Use recommended settings switcher unchecked after unchecking notifications switcher
     await t.click(settingsPage.switchNotificationsOption);
-    await t.expect(await userAgreementPage.getRecommendedSwitcherValue()).eql('false', 'Use recommended settings switcher is still checked');
+    await t.expect(await userAgreementDialog.getRecommendedSwitcherValue()).eql('false', 'Use recommended settings switcher is still checked');
 });
diff --git a/tests/e2e/tests/critical-path/cluster-details/cluster-details.e2e.ts b/tests/e2e/tests/critical-path/cluster-details/cluster-details.e2e.ts
@@ -1,12 +1,12 @@
 import { Selector } from 'testcafe';
-import { BrowserPage, MyRedisDatabasePage, OverviewPage, WorkbenchPage } from '../../../pageObjects';
+import { BrowserPage, MyRedisDatabasePage, ClusterDetailsPage, WorkbenchPage } from '../../../pageObjects';
 import { rte } from '../../../helpers/constants';
 import { acceptLicenseTermsAndAddOSSClusterDatabase } from '../../../helpers/database';
 import { commonUrl, ossClusterConfig } from '../../../helpers/conf';
 import { deleteOSSClusterDatabaseApi, getClusterNodesApi } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
 
-const overviewPage = new OverviewPage();
+const clusterDetailsPage = new ClusterDetailsPage();
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const browserPage = new BrowserPage();
 const workbenchPage = new WorkbenchPage();
@@ -36,14 +36,14 @@ test('Overview tab header for OSS Cluster', async t => {
     const uptime = /[1-9][0-9]\s|[0-9]\smin|[1-9][0-9]\smin|[0-9]\sh/;
 
     // Verify that user see "Overview" tab by default for OSS Cluster
-    await t.expect(overviewPage.overviewTab.withAttribute('aria-selected', 'true').exists).ok('The Overview tab not opened');
+    await t.expect(clusterDetailsPage.overviewTab.withAttribute('aria-selected', 'true').exists).ok('The Overview tab not opened');
     // Verify that user see "Overview" header with OSS Cluster info
     for (const key in headerColumns) {
         const columnSelector = Selector(`[data-testid=cluster-details-item-${key}]`);
         await t.expect(columnSelector.textContent).contains(`${headerColumns[key as HeaderColumn]}`, `Cluster detail ${key} is incorrect`);
     }
     // Verify that Uptime is displayed as time in seconds or minutes from start
-    await t.expect(overviewPage.clusterDetailsUptime.textContent).match(uptime, 'Uptime value is not correct');
+    await t.expect(clusterDetailsPage.clusterDetailsUptime.textContent).match(uptime, 'Uptime value is not correct');
 });
 test
     .after(async() => {
@@ -58,20 +58,20 @@ test
         const columns = ['Commands/s', 'Clients', 'Total Keys', 'Network Input', 'Network Output', 'Total Memory'];
 
         for (const column in columns) {
-            initialValues.push(await overviewPage.getTotalValueByColumnName(column));
+            initialValues.push(await clusterDetailsPage.getTotalValueByColumnName(column));
         }
-        const nodesNumberInHeader = parseInt((await overviewPage.tableHeaderCell.nth(0).textContent).match(/\d+/)![0]);
+        const nodesNumberInHeader = parseInt((await clusterDetailsPage.tableHeaderCell.nth(0).textContent).match(/\d+/)![0]);
 
         // Add key from CLI
         await t.click(browserPage.Cli.cliExpandButton);
         await t.typeText(browserPage.Cli.cliCommandInput, commandToAddKey);
         await t.pressKey('enter');
         await t.click(browserPage.Cli.cliCollapseButton);
         // Verify nodes in header column equal to rows
-        await t.expect(await overviewPage.getPrimaryNodesCount()).eql(nodesNumberInHeader, 'Primary nodes in table are not displayed');
+        await t.expect(await clusterDetailsPage.getPrimaryNodesCount()).eql(nodesNumberInHeader, 'Primary nodes in table are not displayed');
         // Verify that all nodes from BE response are displayed in table
         for (const node of nodes) {
-            await t.expect(overviewPage.tableRow.nth(nodes.indexOf(node)).textContent).contains(node, `Node ${node} is not displayed in table`);
+            await t.expect(clusterDetailsPage.tableRow.nth(nodes.indexOf(node)).textContent).contains(node, `Node ${node} is not displayed in table`);
         }
         // Go to Workbench page
         await t.click(myRedisDatabasePage.NavigationPanel.workbenchButton);
@@ -84,6 +84,6 @@ test
         await t.click(myRedisDatabasePage.NavigationPanel.analysisPageButton);
         // Verify that values in table are dynamic
         for (const column in columns) {
-            await t.expect(await overviewPage.getTotalValueByColumnName(column)).notEql(initialValues[columns.indexOf(column)], `${column} not dynamic`);
+            await t.expect(await clusterDetailsPage.getTotalValueByColumnName(column)).notEql(initialValues[columns.indexOf(column)], `${column} not dynamic`);
         }
     });
diff --git a/tests/e2e/tests/critical-path/notifications/notification-center.e2e.ts b/tests/e2e/tests/critical-path/notifications/notification-center.e2e.ts
@@ -3,7 +3,7 @@ import { deleteAllNotificationsFromDB } from '../../../helpers/notifications';
 import { commonUrl } from '../../../helpers/conf';
 import { rte } from '../../../helpers/constants';
 import { MyRedisDatabasePage, SettingsPage } from '../../../pageObjects';
-import { NotificationParameters } from '../../../pageObjects/components/notification-panel';
+import { NotificationParameters } from '../../../pageObjects/components/navigation/notification-panel';
 
 const description = require('./notifications.json');
 const jsonNotifications: NotificationParameters[] = description.notifications;
diff --git a/tests/e2e/tests/critical-path/slow-log/slow-log.e2e.ts b/tests/e2e/tests/critical-path/slow-log/slow-log.e2e.ts
@@ -1,4 +1,4 @@
-import { SlowLogPage, MyRedisDatabasePage, BrowserPage, OverviewPage } from '../../../pageObjects';
+import { SlowLogPage, MyRedisDatabasePage, BrowserPage, ClusterDetailsPage } from '../../../pageObjects';
 import { rte } from '../../../helpers/constants';
 import { acceptLicenseTermsAndAddDatabaseApi } from '../../../helpers/database';
 import { commonUrl, ossStandaloneBigConfig } from '../../../helpers/conf';
@@ -7,7 +7,7 @@ import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
 const slowLogPage = new SlowLogPage();
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const browserPage = new BrowserPage();
-const overviewPage = new OverviewPage();
+const overviewPage = new ClusterDetailsPage();
 const slowerThanParameter = 1;
 let maxCommandLength = 50;
 let command = `slowlog get ${maxCommandLength}`;
diff --git a/tests/e2e/tests/regression/browser/onboarding.e2e.ts b/tests/e2e/tests/regression/browser/onboarding.e2e.ts
diff --git a/tests/e2e/tests/regression/shortcuts/shortcuts.e2e.ts b/tests/e2e/tests/regression/shortcuts/shortcuts.e2e.ts
diff --git a/tests/e2e/tests/smoke/database/add-standalone-db.e2e.ts b/tests/e2e/tests/smoke/database/add-standalone-db.e2e.ts
diff --git a/tests/e2e/tests/smoke/database/edit-db.e2e.ts b/tests/e2e/tests/smoke/database/edit-db.e2e.ts
