added line breaks after t.

Author: vlad-dargel

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

@@ -22,16 +22,17 @@ export async function addNewStandaloneDatabaseApi(databaseParameters: AddNewData
         })
         .set('Accept', 'application/json');
 
-    await t.expect(await response.status).eql(201, 'The creation of new standalone database request failed');
-    await t.expect(await response.body.name).eql(databaseParameters.databaseName, `Database Name is not equal to ${databaseParameters.databaseName} in response`);
+    await t
+        .expect(response.status).eql(201, 'The creation of new standalone database request failed')
+        .expect(await response.body.name).eql(databaseParameters.databaseName, `Database Name is not equal to ${databaseParameters.databaseName} in response`);
 }
 
 /**
  * Add a new Standalone databases through api using host and port
  * @param databasesParameters The databases parameters array
  */
 export async function addNewStandaloneDatabasesApi(databasesParameters: AddNewDatabaseParameters[]): Promise<void> {
-    if (await databasesParameters.length) {
+    if (databasesParameters.length) {
         await databasesParameters.forEach(async parameter => {
             await addNewStandaloneDatabaseApi(parameter);
         });
@@ -47,8 +48,8 @@ export async function addNewOSSClusterDatabaseApi(databaseParameters: OSSCluster
         .send({ 'name': databaseParameters.ossClusterDatabaseName, 'host': databaseParameters.ossClusterHost, 'port': databaseParameters.ossClusterPort })
         .set('Accept', 'application/json');
 
-    await t.expect(await response.status).eql(201, 'The creation of new oss cluster database request failed');
-    await t.expect(await response.body.name).eql(databaseParameters.ossClusterDatabaseName, `Database Name is not equal to ${databaseParameters.ossClusterDatabaseName} in response`);
+    await t.expect(await response.status).eql(201, 'The creation of new oss cluster database request failed')
+        .expect(await response.body.name).eql(databaseParameters.ossClusterDatabaseName, `Database Name is not equal to ${databaseParameters.ossClusterDatabaseName} in response`);
 }
 
 /**
@@ -206,7 +207,7 @@ export async function getClusterNodesApi(databaseParameters: OSSClusterParameter
         .get(`/instance/${databaseId}/cluster-details`)
         .set('Accept', 'application/json')
         .expect(200);
-    let nodes = await response.body.nodes;
-    let nodeNames = await nodes.map((node: ClusterNodes) => (node.host + ':' + node.port));
+    const nodes = await response.body.nodes;
+    const nodeNames = await nodes.map((node: ClusterNodes) => (`${node.host  }:${  node.port}`));
     return nodeNames;
 }

tests/e2e/helpers/database.ts

@@ -26,14 +26,15 @@ const common = new Common();
  * @param databaseParameters The database parameters
  */
 export async function addNewStandaloneDatabase(databaseParameters: AddNewDatabaseParameters): Promise<void> {
-    //Fill the add database form
+    // Fill the add database form
     await addRedisDatabasePage.addRedisDataBase(databaseParameters);
-    //Click for saving
-    await t.click(addRedisDatabasePage.addRedisDatabaseButton);
-    //Wait for database to be exist
-    await t.expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.databaseName ?? '').exists).ok('The existence of the database', { timeout: 10000 });
-    //Close message
-    await t.click(myRedisDatabasePage.toastCloseButton);
+    // Click for saving
+    await t
+        .click(addRedisDatabasePage.addRedisDatabaseButton)
+    // Wait for database to be exist
+        .expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.databaseName ?? '').exists).ok('The database not displayed', { timeout: 10000 })
+    // Close message
+        .click(myRedisDatabasePage.toastCloseButton);
 }
 
 /**
@@ -46,7 +47,7 @@ export async function discoverSentinelDatabase(databaseParameters: SentinelParam
     // Click for autodiscover
     await t
         .click(addRedisDatabasePage.discoverSentinelDatabaseButton)
-        .expect(discoverMasterGroupsPage.addPrimaryGroupButton.exists).ok('Verify that user is on the second step of Sentinel flow', { timeout: 10000 });
+        .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();
     await t.click(autoDiscoverREDatabases.viewDatabasesButton);
@@ -57,32 +58,34 @@ export async function discoverSentinelDatabase(databaseParameters: SentinelParam
  * @param databaseParameters The database parameters
  */
 export async function addNewREClusterDatabase(databaseParameters: AddNewDatabaseParameters): Promise<void> {
-    //Fill the add database form
+    // Fill the add database form
     await addRedisDatabasePage.addAutodiscoverREClucterDatabase(databaseParameters);
-    //Click on submit button
-    await t.click(addRedisDatabasePage.addRedisDatabaseButton);
-    //Wait for database to be exist in the list of Autodiscover databases and select it
-    await t.expect(autoDiscoverREDatabases.databaseNames.withExactText(databaseParameters.databaseName ?? '').exists).ok('The existence of the database', { timeout: 10000 });
-    await t.typeText(autoDiscoverREDatabases.search, databaseParameters.databaseName ?? '');
-    await t.click(autoDiscoverREDatabases.databaseCheckbox);
-    //Click Add selected databases button
-    await t.click(autoDiscoverREDatabases.addSelectedDatabases);
-    await t.click(autoDiscoverREDatabases.viewDatabasesButton);
+    // Click on submit button
+    await t
+        .click(addRedisDatabasePage.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 ?? '')
+        .click(autoDiscoverREDatabases.databaseCheckbox)
+    // Click Add selected databases button
+        .click(autoDiscoverREDatabases.addSelectedDatabases)
+        .click(autoDiscoverREDatabases.viewDatabasesButton);
 }
 
 /**
  * Add a new database from OSS Cluster via auto-discover flow
  * @param databaseParameters The database parameters
  */
 export async function addOSSClusterDatabase(databaseParameters: OSSClusterParameters): Promise<void> {
-    //Enter required parameters for OSS Cluster
+    // Enter required parameters for OSS Cluster
     await addRedisDatabasePage.addOssClusterDatabase(databaseParameters);
-    //Click for saving
-    await t.click(addRedisDatabasePage.addRedisDatabaseButton);
-    //Check for info message that DB was added
-    await t.expect(myRedisDatabasePage.databaseInfoMessage.exists).ok('Check that info message exists', { timeout: 10000 });
-    //Wait for database to be exist
-    await t.expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.ossClusterDatabaseName).exists).ok('The existence of the database', { timeout: 10000 });
+    // Click for saving
+    await t
+        .click(addRedisDatabasePage.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
+        .expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.ossClusterDatabaseName).exists).ok('The database not displayed', { timeout: 10000 });
 }
 
 /**
@@ -91,19 +94,21 @@ export async function addOSSClusterDatabase(databaseParameters: OSSClusterParame
  * @param cloudAPISecretKey The Cloud API Secret Key
  */
 export async function addNewRECloudDatabase(cloudAPIAccessKey: string, cloudAPISecretKey: string): Promise<string> {
-    //Fill the add database form and Submit
+    // Fill the add database form and Submit
     await addRedisDatabasePage.addAutodiscoverRECloudDatabase(cloudAPIAccessKey, cloudAPISecretKey);
-    await t.click(addRedisDatabasePage.addRedisDatabaseButton);
-    //Select subscriptions
-    await t.click(addRedisDatabasePage.selectAllCheckbox);
-    await t.click(addRedisDatabasePage.showDatabasesButton);
-    //Select databases for adding
+    await t
+        .click(addRedisDatabasePage.addRedisDatabaseButton)
+    // Select subscriptions
+        .click(addRedisDatabasePage.selectAllCheckbox)
+        .click(addRedisDatabasePage.showDatabasesButton);
+    // Select databases for adding
     const databaseName = await browserPage.getDatabasesName();
-    await t.click(addRedisDatabasePage.selectAllCheckbox);
-    await t.click(autoDiscoverREDatabases.addSelectedDatabases);
-    //Wait for database to be exist in the My redis databases list
-    await t.click(autoDiscoverREDatabases.viewDatabasesButton);
-    await t.expect(myRedisDatabasePage.dbNameList.withExactText(databaseName).exists).ok('The existence of the database', { timeout: 10000 });
+    await t
+        .click(addRedisDatabasePage.selectAllCheckbox)
+        .click(autoDiscoverREDatabases.addSelectedDatabases)
+    // Wait for database to be exist in the My redis databases list
+        .click(autoDiscoverREDatabases.viewDatabasesButton)
+        .expect(myRedisDatabasePage.dbNameList.withExactText(databaseName).exists).ok('The database not displayed', { timeout: 10000 });
     return databaseName;
 }
 
@@ -115,7 +120,7 @@ export async function addNewRECloudDatabase(cloudAPIAccessKey: string, cloudAPIS
 export async function acceptLicenseTermsAndAddDatabase(databaseParameters: AddNewDatabaseParameters, databaseName: string): Promise<void> {
     await acceptLicenseTerms();
     await addNewStandaloneDatabase(databaseParameters);
-    //Connect to DB
+    // Connect to DB
     await myRedisDatabasePage.clickOnDBByName(databaseName);
 }
 
@@ -129,7 +134,7 @@ export async function acceptLicenseTermsAndAddDatabaseApi(databaseParameters: Ad
     await addNewStandaloneDatabaseApi(databaseParameters);
     // Reload Page to see the new added database through api
     await common.reloadPage();
-    //Connect to DB
+    // Connect to DB
     await myRedisDatabasePage.clickOnDBByName(databaseName);
 }
 
@@ -141,7 +146,7 @@ export async function acceptLicenseTermsAndAddDatabaseApi(databaseParameters: Ad
 export async function acceptLicenseTermsAndAddOSSClusterDatabase(databaseParameters: OSSClusterParameters, databaseName: string): Promise<void> {
     await acceptLicenseTerms();
     await addOSSClusterDatabase(databaseParameters);
-    //Connect to DB
+    // Connect to DB
     await myRedisDatabasePage.clickOnDBByName(databaseName);
 }
 
@@ -154,7 +159,7 @@ export async function acceptLicenseTermsAndAddSentinelDatabaseApi(databaseParame
     await discoverSentinelDatabaseApi(databaseParameters);
     // Reload Page to see the database added through api
     await common.reloadPage();
-    //Connect to DB
+    // Connect to DB
     await myRedisDatabasePage.clickOnDBByName(databaseParameters.name[1] ?? '');
 }
 
@@ -165,7 +170,7 @@ export async function acceptLicenseTermsAndAddSentinelDatabaseApi(databaseParame
 export async function acceptLicenseTermsAndAddREClusterDatabase(databaseParameters: AddNewDatabaseParameters): Promise<void> {
     await acceptLicenseTerms();
     await addNewREClusterDatabase(databaseParameters);
-    //Connect to DB
+    // Connect to DB
     await myRedisDatabasePage.clickOnDBByName(databaseParameters.databaseName ?? '');
 }
 
@@ -180,38 +185,40 @@ export async function acceptLicenseTermsAndAddRECloudDatabase(databaseParameters
 
     await acceptLicenseTerms();
     await addRedisDatabasePage.addRedisDataBase(databaseParameters);
-    //Click for saving
+    // Click for saving
     await t.click(addRedisDatabasePage.addRedisDatabaseButton);
     // Reload page until db appears
     do {
         await common.reloadPage();
     }
     while (!(await dbSelector.exists) && Date.now() - startTime < searchTimeout);
-    await t.expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.databaseName ?? '').exists).ok('The existence of the database', { timeout: 5000 });
+    await t.expect(myRedisDatabasePage.dbNameList.withExactText(databaseParameters.databaseName ?? '').exists).ok('The database not displayed', { timeout: 5000 });
     await myRedisDatabasePage.clickOnDBByName(databaseParameters.databaseName ?? '');
 }
 
-//Accept License terms
+// Accept License terms
 export async function acceptLicenseTerms(): Promise<void> {
     await t.maximizeWindow();
     await userAgreementPage.acceptLicenseTerms();
 }
 
-//Accept License terms and connect to the RedisStack database
+// Accept License terms and connect to the RedisStack database
 export async function acceptLicenseAndConnectToRedisStack(): Promise<void> {
     await acceptLicenseTerms();
     //Connect to DB
-    await t.click(myRedisDatabasePage.myRedisDBButton);
-    await t.click(addRedisDatabasePage.connectToRedisStackButton);
+    await t
+        .click(myRedisDatabasePage.myRedisDBButton)
+        .click(addRedisDatabasePage.connectToRedisStackButton);
 }
 
-//Clear database data
+// Clear database data
 export async function clearDatabaseInCli(): Promise<void> {
     if (await cliPage.cliCollapseButton.exists === false) {
         await t.click(cliPage.cliExpandButton);
     }
-    await t.typeText(cliPage.cliCommandInput, 'FLUSHDB');
-    await t.pressKey('enter');
+    await t
+        .typeText(cliPage.cliCommandInput, 'FLUSHDB')
+        .pressKey('enter');
 }
 
 /**

tests/e2e/helpers/helpers.ts

@@ -30,4 +30,4 @@ export type Arguments = {
   ossClusterPort?: string,
   ossClusterDatabaseName?: string,
   [key: string]: any
-}
+};

tests/e2e/helpers/keys.ts

@@ -57,8 +57,9 @@ export async function addKeysViaCli(keyData: KeyData, keyValue?: string, keyFiel
             await t.pressKey('enter');
         }
     }
-    await t.click(cliPage.cliCollapseButton);
-    await t.click(browserPage.refreshKeysButton);
+    await t
+        .click(cliPage.cliCollapseButton)
+        .click(browserPage.refreshKeysButton);
 }
 
 /**

tests/e2e/helpers/notifications.ts

@@ -31,15 +31,13 @@ export function insertNotificationInDB(notifications: NotificationParameters[]):
     for (let i = 0; i < notifications.length; i++) {
         const messageWithQuotes = `${notifications[i].type}, ${notifications[i].timestamp},
         ${notifications[i].title}, ${notifications[i].body}, ${notifications[i].isRead}`;
-        console.log(`messageWithQuotes: ${messageWithQuotes}`);
         if (i === notifications.length - 1) {
             query = `${query} (${messageWithQuotes})`;
         }
         else {
             query = `${query} (${messageWithQuotes}),`;
         }
     }
-    console.log(`query: ${query}`);
     db.run(query, function(err: { message: string }) {
         if (err) {
             return console.log(`error during notification creation: ${err.message}`);

tests/e2e/pageObjects/add-redis-database-page.ts

@@ -87,11 +87,12 @@ export class AddRedisDatabasePage {
         if (!!parameters.databasePassword) {
             await t.typeText(this.passwordInput, parameters.databasePassword, { replace: true, paste: true });
         }
-        //Enter logical index
-        await t.click(this.databaseIndexCheckbox);
-        await t.typeText(this.databaseIndexInput, index, { replace: true, paste: true});
-        //Click for saving
-        await t.click(this.addRedisDatabaseButton);
+        // Enter logical index
+        await t
+            .click(this.databaseIndexCheckbox)
+            .typeText(this.databaseIndexInput, index, { replace: true, paste: true})
+        // Click for saving
+            .click(this.addRedisDatabaseButton);
     }
 
     /**
@@ -230,7 +231,7 @@ export type databaseParameters = {
  * @param host The host of the node
  * @param port The port of the node
  */
- export type ClusterNodes = {
+export type ClusterNodes = {
     host: string,
     port: string
 };