Merge pull request #2045 from RedisInsight/e2e/feature/refactoring

refactoring for notification

Author: mariasergeenko

tests/e2e/common-actions/onboard-actions.ts

@@ -2,7 +2,7 @@ import { t } from 'testcafe';
 import { Chance } from 'chance';
 import * as request from 'supertest';
 import { asyncFilter, doAsyncStuff } from '../async-helper';
-import { AddNewDatabaseParameters, OSSClusterParameters, databaseParameters, SentinelParameters, ClusterNodes } from '../../pageObjects/add-redis-database-page';
+import { AddNewDatabaseParameters, OSSClusterParameters, databaseParameters, SentinelParameters, ClusterNodes } from '../../pageObjects/components/myRedisDatabase/add-redis-database';
 import { Common } from '../common';
 
 const chance = new Chance();

tests/e2e/helpers/api/api-database.ts

@@ -1,17 +1,15 @@
 import { Selector, t } from 'testcafe';
-import { AddNewDatabaseParameters, SentinelParameters, OSSClusterParameters } from '../pageObjects/add-redis-database-page';
+import { AddNewDatabaseParameters, SentinelParameters, OSSClusterParameters } from '../pageObjects/components/myRedisDatabase/add-redis-database';
 import { DiscoverMasterGroupsPage } from '../pageObjects/sentinel/discovered-sentinel-master-groups-page';
 import {
     MyRedisDatabasePage,
     BrowserPage,
     AutoDiscoverREDatabases,
-    AddRedisDatabasePage,
-    UserAgreementPage,
+    UserAgreementPage
 } from '../pageObjects';
 import { addNewStandaloneDatabaseApi, discoverSentinelDatabaseApi, getDatabaseIdByName } from './api/api-database';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
-const addRedisDatabasePage = new AddRedisDatabasePage();
 const discoverMasterGroupsPage = new DiscoverMasterGroupsPage();
 const autoDiscoverREDatabases = new AutoDiscoverREDatabases();
 const browserPage = new BrowserPage();
@@ -23,10 +21,10 @@ const userAgreementPage = new UserAgreementPage();
  */
 export async function addNewStandaloneDatabase(databaseParameters: AddNewDatabaseParameters): Promise<void> {
     // Fill the add database form
-    await addRedisDatabasePage.addRedisDataBase(databaseParameters);
+    await myRedisDatabasePage.AddRedisDatabase.addRedisDataBase(databaseParameters);
     // Click for saving
     await t
-        .click(addRedisDatabasePage.addRedisDatabaseButton)
+        .click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
     // Wait for database to be exist
         .expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.databaseName ?? '').exists).ok('The database not displayed', { timeout: 10000 })
     // Close message
@@ -39,10 +37,10 @@ export async function addNewStandaloneDatabase(databaseParameters: AddNewDatabas
  */
 export async function discoverSentinelDatabase(databaseParameters: SentinelParameters): Promise<void> {
     // Fill sentinel parameters to auto-discover Master Groups
-    await addRedisDatabasePage.discoverSentinelDatabases(databaseParameters);
+    await myRedisDatabasePage.AddRedisDatabase.discoverSentinelDatabases(databaseParameters);
     // Click for autodiscover
     await t
-        .click(addRedisDatabasePage.discoverSentinelDatabaseButton)
+        .click(myRedisDatabasePage.AddRedisDatabase.discoverSentinelDatabaseButton)
         .expect(discoverMasterGroupsPage.addPrimaryGroupButton.exists).ok('User is not on the second step of Sentinel flow', { timeout: 10000 });
     // Select Master Groups and Add to RedisInsight
     await discoverMasterGroupsPage.addMasterGroups();
@@ -55,10 +53,10 @@ export async function discoverSentinelDatabase(databaseParameters: SentinelParam
  */
 export async function addNewREClusterDatabase(databaseParameters: AddNewDatabaseParameters): Promise<void> {
     // Fill the add database form
-    await addRedisDatabasePage.addAutodiscoverREClucterDatabase(databaseParameters);
+    await myRedisDatabasePage.AddRedisDatabase.addAutodiscoverREClucterDatabase(databaseParameters);
     // Click on submit button
     await t
-        .click(addRedisDatabasePage.addRedisDatabaseButton)
+        .click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
     // Wait for database to be exist in the list of Autodiscover databases and select it
         .expect(autoDiscoverREDatabases.databaseNames.withExactText(databaseParameters.databaseName ?? '').exists).ok('The database not displayed', { timeout: 10000 })
         .typeText(autoDiscoverREDatabases.search, databaseParameters.databaseName ?? '')
@@ -74,10 +72,10 @@ export async function addNewREClusterDatabase(databaseParameters: AddNewDatabase
  */
 export async function addOSSClusterDatabase(databaseParameters: OSSClusterParameters): Promise<void> {
     // Enter required parameters for OSS Cluster
-    await addRedisDatabasePage.addOssClusterDatabase(databaseParameters);
+    await myRedisDatabasePage.AddRedisDatabase.addOssClusterDatabase(databaseParameters);
     // Click for saving
     await t
-        .click(addRedisDatabasePage.addRedisDatabaseButton)
+        .click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton)
     // Check for info message that DB was added
         .expect(myRedisDatabasePage.databaseInfoMessage.exists).ok('Info message not exists', { timeout: 10000 })
     // Wait for database to be exist
@@ -91,14 +89,14 @@ export async function addOSSClusterDatabase(databaseParameters: OSSClusterParame
  */
 export async function addNewRECloudDatabase(cloudAPIAccessKey: string, cloudAPISecretKey: string): Promise<string> {
     // Fill the add database form and Submit
-    await addRedisDatabasePage.addAutodiscoverRECloudDatabase(cloudAPIAccessKey, cloudAPISecretKey);
-    await t.click(addRedisDatabasePage.addRedisDatabaseButton);
+    await myRedisDatabasePage.AddRedisDatabase.addAutodiscoverRECloudDatabase(cloudAPIAccessKey, cloudAPISecretKey);
+    await t.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton);
     // Select subscriptions
-    await t.click(addRedisDatabasePage.selectAllCheckbox);
-    await t.click(addRedisDatabasePage.showDatabasesButton);
+    await t.click(myRedisDatabasePage.AddRedisDatabase.selectAllCheckbox);
+    await t.click(myRedisDatabasePage.AddRedisDatabase.showDatabasesButton);
     // Select databases for adding
     const databaseName = await browserPage.getDatabasesName();
-    await t.click(addRedisDatabasePage.selectAllCheckbox);
+    await t.click(myRedisDatabasePage.AddRedisDatabase.selectAllCheckbox);
     await t.click(autoDiscoverREDatabases.addSelectedDatabases);
     // Wait for database to be exist in the My redis databases list
     await t.click(autoDiscoverREDatabases.viewDatabasesButton);
@@ -178,9 +176,9 @@ export async function acceptLicenseTermsAndAddRECloudDatabase(databaseParameters
     const startTime = Date.now();
 
     await acceptLicenseTerms();
-    await addRedisDatabasePage.addRedisDataBase(databaseParameters);
+    await myRedisDatabasePage.AddRedisDatabase.addRedisDataBase(databaseParameters);
     // Click for saving
-    await t.click(addRedisDatabasePage.addRedisDatabaseButton);
+    await t.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton);
     await t.wait(3000);
     // Reload page until db appears
     do {
@@ -201,9 +199,9 @@ export async function addRECloudDatabase(databaseParameters: AddNewDatabaseParam
     const dbSelector = myRedisDatabasePage.dbNameList.withExactText(databaseParameters.databaseName ?? '');
     const startTime = Date.now();
 
-    await addRedisDatabasePage.addRedisDataBase(databaseParameters);
+    await myRedisDatabasePage.AddRedisDatabase.addRedisDataBase(databaseParameters);
     // Click for saving
-    await t.click(addRedisDatabasePage.addRedisDatabaseButton);
+    await t.click(myRedisDatabasePage.AddRedisDatabase.addRedisDatabaseButton);
     await t.wait(3000);
     // Reload page until db appears
     do {
@@ -225,7 +223,7 @@ export async function acceptLicenseAndConnectToRedisStack(): Promise<void> {
     //Connect to DB
     await t
         .click(myRedisDatabasePage.NavigationPanel.myRedisDBButton)
-        .click(addRedisDatabasePage.connectToRedisStackButton);
+        .click(myRedisDatabasePage.AddRedisDatabase.connectToRedisStackButton);
 }
 
 /**
@@ -234,7 +232,7 @@ export async function acceptLicenseAndConnectToRedisStack(): Promise<void> {
 */
 export async function deleteDatabase(databaseName: string): Promise<void> {
     await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
-    if (await addRedisDatabasePage.addDatabaseButton.exists) {
+    if (await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.exists) {
         await deleteDatabaseByNameApi(databaseName);
     }
 }
@@ -245,7 +243,7 @@ export async function deleteDatabase(databaseName: string): Promise<void> {
 */
 export async function deleteCustomDatabase(databaseName: string): Promise<void> {
     await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
-    if (await addRedisDatabasePage.addDatabaseButton.exists) {
+    if (await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.exists) {
         await myRedisDatabasePage.deleteDatabaseByName(databaseName);
     }
 }
@@ -256,7 +254,7 @@ export async function deleteCustomDatabase(databaseName: string): Promise<void>
  * @param databaseName The database name
 */
 export async function acceptTermsAddDatabaseOrConnectToRedisStack(databaseParameters: AddNewDatabaseParameters, databaseName: string): Promise<void> {
-    if (await addRedisDatabasePage.addDatabaseButton.exists) {
+    if (await myRedisDatabasePage.AddRedisDatabase.addDatabaseButton.exists) {
         await acceptLicenseTermsAndAddDatabase(databaseParameters, databaseName);
     }
     else {

tests/e2e/helpers/database.ts

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import * as os from 'os';
-import { NotificationParameters } from '../pageObjects/notification-page';
+import { NotificationParameters } from '../pageObjects/components/notification-panel';
 
 const workingDirectory = process.env.APP_FOLDER_ABSOLUTE_PATH
     || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-v2'));

tests/e2e/helpers/notifications.ts

@@ -1,8 +1,11 @@
 import { t, Selector } from 'testcafe';
 import { Common } from '../helpers/common';
 import { InstancePage } from './instance-page';
+import { BulkActions } from './components/browser';
 
 export class BrowserPage extends InstancePage {
+    BulkActions = new BulkActions();
+
     //CSS Selectors
     cssSelectorGrid = '[aria-label="grid"]';
     cssSelectorRows = '[aria-label="row"]';

tests/e2e/pageObjects/browser-page.ts

@@ -1,9 +1,6 @@
 import { Selector, t } from 'testcafe';
-import { BrowserPage } from './browser-page';
 
-const browserPage = new BrowserPage();
-
-export class BulkActionsPage {
+export class BulkActions {
     //-------------------------------------------------------------------------------------------
     //DECLARATION OF SELECTORS
     //*Declare all elements/components of the relevant page.
@@ -41,12 +38,10 @@ export class BulkActionsPage {
     bulkUploadInput = Selector('[data-testid=bulk-upload-file-input]');
 
     /**
-   * Open Bulk Actions and confirm deletion
-   */
+     * Open Bulk Actions and confirm deletion
+     */
     async startBulkDelete(): Promise<void> {
-        // TODO remove dep from browser page
         await t
-            .click(browserPage.bulkActionsButton)
             .click(this.actionButton)
             .click(this.bulkApplyButton);
     }

tests/e2e/pageObjects/bulk-actions-page.ts renamed to tests/e2e/pageObjects/components/browser/bulk-actions.ts

@@ -0,0 +1,5 @@
+import { BulkActions } from './bulk-actions';
+
+export {
+    BulkActions
+};

tests/e2e/pageObjects/components/browser/index.ts

@@ -1,6 +1,6 @@
 import { t, Selector } from 'testcafe';
 
-export class AddRedisDatabasePage {
+export class AddRedisDatabase {
     //-------------------------------------------------------------------------------------------
     //DECLARATION OF SELECTORS
     //*Declare all elements/components of the relevant page.

tests/e2e/pageObjects/add-redis-database-page.ts renamed to tests/e2e/pageObjects/components/myRedisDatabase/add-redis-database.ts

@@ -1,6 +1,10 @@
 import { Selector } from 'testcafe';
 
+import NotificationPanel from './notification-panel';
+
 export class NavigationPanel {
+    NotificationPanel = new NotificationPanel();
+
     workbenchButton = Selector('[data-testid=workbench-page-btn]');
     analysisPageButton = Selector('[data-testid=analytics-page-btn]');
     browserButton = Selector('[data-testid=browser-page-btn]');

tests/e2e/pageObjects/components/navigation-panel.ts

@@ -1,11 +1,6 @@
-import { Selector, t } from 'testcafe';
-import { SettingsPage } from './settings-page';
-import { MyRedisDatabasePage } from './my-redis-databases-page';
+import { Selector } from 'testcafe';
 
-const settingsPage = new SettingsPage();
-const myRedisDatabasePage = new MyRedisDatabasePage();
-
-export class NotificationPage {
+class NotificationPanel {
     //-------------------------------------------------------------------------------------------
     //DECLARATION OF SELECTORS
     //*Declare all elements/components of the relevant page.
@@ -49,25 +44,6 @@ export class NotificationPage {
         const converted = epochTimeConversion.split(' ');
         return [converted[2], converted[1], converted[3]].join(' ');
     }
-
-    /**
-     * Turn on notifications in Settings
-     */
-    async changeNotificationsSwitcher(toValue: boolean): Promise<void> {
-        await t
-            .click(myRedisDatabasePage.NavigationPanel.settingsButton)
-            .click(settingsPage.accordionAppearance);
-        if (toValue === true) {
-            if (await settingsPage.getNotificationsSwitcherValue() === 'false') {
-                await t.click(settingsPage.switchNotificationsOption);
-            }
-        }
-        if (toValue === false) {
-            if (await settingsPage.getNotificationsSwitcherValue() === 'true') {
-                await t.click(settingsPage.switchNotificationsOption);
-            }
-        }
-    }
 }
 /**
  * Notification parameters
@@ -87,3 +63,5 @@ export type NotificationParameters = {
     colorCategory?: string,
     rbgColor?: string
 };
+
+export default NotificationPanel;