fixes for tests

Author: vlad-dargel

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

@@ -88,11 +88,10 @@ export class AddRedisDatabasePage {
             await t.typeText(this.passwordInput, parameters.databasePassword, { replace: true, paste: true });
         }
         // Enter logical index
-        await t
-            .click(this.databaseIndexCheckbox)
-            .typeText(this.databaseIndexInput, index, { replace: true, paste: true})
+        await t.click(this.databaseIndexCheckbox);
+        await t.typeText(this.databaseIndexInput, index, { replace: true, paste: true});
         // Click for saving
-            .click(this.addRedisDatabaseButton);
+        await t.click(this.addRedisDatabaseButton);
     }
 
     /**
@@ -117,7 +116,7 @@ export class AddRedisDatabasePage {
 
     /**
      * Adding a new database from RE Cluster via auto-discover flow
-     * @param prameters the parameters of the database
+     * @param parameters the parameters of the database
      */
     async addAutodiscoverREClucterDatabase(parameters: AddNewDatabaseParameters): Promise<void> {
         await t

tests/e2e/pageObjects/browser-page.ts

@@ -510,10 +510,9 @@ export class BrowserPage {
         if (await this.toastCloseButton.exists) {
             await t.click(this.toastCloseButton);
         }
-        await t
-            .click(this.keyNameInTheList)
-            .click(this.deleteKeyButton)
-            .click(this.confirmDeleteKeyButton);
+        await t.click(this.keyNameInTheList);
+        await t.click(this.deleteKeyButton);
+        await t.click(this.confirmDeleteKeyButton);
     }
 
     /**
@@ -522,10 +521,9 @@ export class BrowserPage {
      */
     async deleteKeyByName(keyName: string): Promise<void> {
         await this.searchByKeyName(keyName);
-        await t
-            .click(this.keyNameInTheList)
-            .click(this.deleteKeyButton)
-            .click(this.confirmDeleteKeyButton);
+        await t.click(this.keyNameInTheList);
+        await t.click(this.deleteKeyButton);
+        await t.click(this.confirmDeleteKeyButton);
     }
 
     /**

tests/e2e/tests/regression/browser/database-overview-keys.e2e.ts

@@ -8,9 +8,10 @@ import {
     AddRedisDatabasePage
 } from '../../../pageObjects';
 import { rte } from '../../../helpers/constants';
-import { cloudDatabaseConfig, commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
+import { cloudDatabaseConfig, commonUrl, ossStandaloneRedisearch } from '../../../helpers/conf';
 import { Common } from '../../../helpers/common';
 import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
+import { deleteAllKeysFromDB } from '../../../helpers/keys';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const workbenchPage = new WorkbenchPage();
@@ -34,23 +35,23 @@ fixture `Database overview`
     .page(commonUrl)
     .beforeEach(async t => {
         // Create databases and keys
-        await acceptLicenseTermsAndAddDatabase(ossStandaloneConfig, ossStandaloneConfig.databaseName);
+        await acceptLicenseTermsAndAddDatabase(ossStandaloneRedisearch, ossStandaloneRedisearch.databaseName);
         await browserPage.addStringKey(keyName);
         await t.click(myRedisDatabasePage.myRedisDBButton);
-        await addRedisDatabasePage.addLogicalRedisDatabase(ossStandaloneConfig, index);
-        await myRedisDatabasePage.clickOnDBByName(`${ossStandaloneConfig.databaseName} [${index}]`);
+        await addRedisDatabasePage.addLogicalRedisDatabase(ossStandaloneRedisearch, index);
+        await myRedisDatabasePage.clickOnDBByName(`${ossStandaloneRedisearch.databaseName} [${index}]`);
         keys = await common.createArrayWithKeyValue(keysAmount);
         await cliPage.sendCommandInCli(`MSET ${keys.join(' ')}`);
     })
     .afterEach(async t => {
         // Clear and delete databases
         await t.click(myRedisDatabasePage.myRedisDBButton);
-        await myRedisDatabasePage.clickOnDBByName(`${ossStandaloneConfig.databaseName} [${index}]`);
+        await myRedisDatabasePage.clickOnDBByName(`${ossStandaloneRedisearch.databaseName} [${index}]`);
         await cliPage.sendCommandInCli(`DEL ${keys.join(' ')}`);
-        await deleteDatabase(`${ossStandaloneConfig.databaseName} [${index}]`);
-        await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
+        await deleteDatabase(`${ossStandaloneRedisearch.databaseName} [${index}]`);
+        await myRedisDatabasePage.clickOnDBByName(ossStandaloneRedisearch.databaseName);
         await browserPage.deleteKeyByName(keyName);
-        await deleteStandaloneDatabaseApi(ossStandaloneConfig);
+        await deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
     });
 test
     .meta({ rte: rte.standalone })('Verify that user can see total and current logical database number of keys (if there are any keys in other logical DBs)', async t => {
@@ -64,7 +65,7 @@ test
 
         // Open Database
         await t.click(myRedisDatabasePage.myRedisDBButton);
-        await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
+        await myRedisDatabasePage.clickOnDBByName(ossStandaloneRedisearch.databaseName);
         await t.hover(workbenchPage.overviewTotalKeys);
         // Verify that user can see total number of keys and not it current logical database (if there are no any keys in other logical DBs)
         await t.expect(browserPage.tooltip.visible).ok('Total keys tooltip not displayed');

tests/e2e/tests/regression/browser/ttl-format.e2e.ts

@@ -69,7 +69,7 @@ test
         // Check that TTL reduces every page refresh
         while (await browserPage.isKeyIsDisplayedInTheList(keyName)) {
             const actualTTL = Number((await ttlValueElement.innerText).slice(0, -2));
-            await t.expect(actualTTL).lte(ttlToCompare);
+            await t.expect(actualTTL).lte(ttlToCompare, 'Wrong TTL displayed');
             await t.click(browserPage.refreshKeysButton);
             ttlToCompare = actualTTL;
         }