redis · vlad-dargel · Nov 28, 2023 · Nov 27, 2023 · Nov 27, 2023 · Nov 27, 2023
diff --git a/tests/e2e/common-actions/workbench-actions.ts b/tests/e2e/common-actions/workbench-actions.ts
@@ -1,4 +1,4 @@
-import {t, Selector} from 'testcafe';
+import { t, Selector } from 'testcafe';
 import { WorkbenchPage } from '../pageObjects';
 
 const workbenchPage = new WorkbenchPage();

diff --git a/tests/e2e/desktop.runner.ts b/tests/e2e/desktop.runner.ts
@@ -6,16 +6,16 @@ import testcafe from 'testcafe';
             return t
                 .createRunner()
                 .compilerOptions({
-                    "typescript": {
+                    'typescript': {
                         configPath: 'tsconfig.testcafe.json',
                         experimentalDecorators: true
-                     }})
+                    } })
                 .src((process.env.TEST_FILES || 'tests/electron/**/*.e2e.ts').split('\n'))
                 .browsers(['electron'])
                 .screenshots({
                     path: './report/screenshots/',
                     takeOnFails: true,
-                    pathPattern: '${USERAGENT}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png',
+                    pathPattern: '${USERAGENT}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png'
                 })
                 .reporter([
                     'spec',
@@ -46,7 +46,7 @@ import testcafe from 'testcafe';
             process.exit(failedCount);
         })
         .catch((e) => {
-            console.error(e)
+            console.error(e);
             process.exit(1);
         });
 })();
diff --git a/tests/e2e/desktop.runner.win.ts b/tests/e2e/desktop.runner.win.ts
@@ -6,16 +6,16 @@ import testcafe from 'testcafe';
             return t
                 .createRunner()
                 .compilerOptions({
-                    "typescript": {
+                    'typescript': {
                         configPath: 'tsconfig.testcafe.json',
                         experimentalDecorators: true
-                     }})
+                    } })
                 .src((process.env.TEST_FILES || 'tests/electron/**/*.e2e.ts').split('\n'))
                 .browsers(['electron'])
                 .screenshots({
                     path: 'report/screenshots/',
                     takeOnFails: true,
-                    pathPattern: '${USERAGENT}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png',
+                    pathPattern: '${USERAGENT}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png'
                 })
                 .reporter([
                     'spec',

diff --git a/tests/e2e/helpers/api/api-database.ts b/tests/e2e/helpers/api/api-database.ts
@@ -27,28 +27,28 @@ export class DatabaseAPIRequests {
     ): Promise<void> {
         const uniqueId = chance.string({ length: 10 });
         const requestBody: {
-            name?: string;
-            host: string;
-            port: number;
-            username?: string;
-            password?: string;
-            tls?: boolean;
-            verifyServerCert?: boolean;
+            name?: string,
+            host: string,
+            port: number,
+            username?: string,
+            password?: string,
+            tls?: boolean,
+            verifyServerCert?: boolean,
             caCert?: {
-                name: string;
-                certificate?: string;
-            };
+                name: string,
+                certificate?: string
+            },
             clientCert?: {
-                name: string;
-                certificate?: string;
-                key?: string;
-            };
+                name: string,
+                certificate?: string,
+                key?: string
+            }
         } = {
             name: databaseParameters.databaseName,
             host: databaseParameters.host,
             port: Number(databaseParameters.port),
             username: databaseParameters.databaseUsername,
-            password: databaseParameters.databasePassword,
+            password: databaseParameters.databasePassword
         };
 
         if (databaseParameters.caCert) {

diff --git a/tests/e2e/helpers/api/api-info.ts b/tests/e2e/helpers/api/api-info.ts
@@ -1,6 +1,6 @@
 import { t } from 'testcafe';
-import { sendPostRequest } from './api-common';
 import { ResourcePath } from '../constants';
+import { sendPostRequest } from './api-common';
 
 /**
  * Synchronize features

diff --git a/tests/e2e/helpers/common.ts b/tests/e2e/helpers/common.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
-import * as archiver from 'archiver';
 import * as fs from 'fs';
+import * as archiver from 'archiver';
 import { ClientFunction, RequestMock, t } from 'testcafe';
 import { Chance } from 'chance';
 import { apiUrl, commonUrl } from './conf';
@@ -13,7 +13,6 @@ declare global {
     }
   }
 
-
 const settingsApiUrl = `${commonUrl}/api/settings`;
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // lgtm[js/disabling-certificate-validation]
 const mockedSettingsResponse = {

diff --git a/tests/e2e/helpers/database-scripts.ts b/tests/e2e/helpers/database-scripts.ts
@@ -1,5 +1,5 @@
-import { workingDirectory } from '../helpers/conf';
 import * as sqlite3 from 'sqlite3';
+import { workingDirectory } from '../helpers/conf';
 
 const dbPath = `${workingDirectory}/redisinsight.db`;
 
@@ -17,7 +17,8 @@ export async function updateColumnValueInDBTable(tableName: string, columnName:
         db.run(query, (err: { message: string }) => {
             if (err) {
                 reject(new Error(`Error during changing ${columnName} column value: ${err.message}`));
-            } else {
+            }
+            else {
                 db.close();
                 resolve();
             }
@@ -38,7 +39,8 @@ export async function getColumnValueFromTableInDB(tableName: string, columnName:
         db.get(query, (err: { message: string }, row: any) => {
             if (err) {
                 reject(new Error(`Error during getting ${columnName} column value: ${err.message}`));
-            } else {
+            }
+            else {
                 const columnValue = row[columnName];
                 db.close();
                 resolve(columnValue);
@@ -57,11 +59,11 @@ export async function deleteRowsFromTableInDB(tableName: string): Promise<void>
 
     return new Promise<void>((resolve, reject) => {
 
-
         db.run(query, (err: { message: string }) => {
             if (err) {
                 reject(new Error(`Error during ${tableName} table rows deletion: ${err.message}`));
-            } else {
+            }
+            else {
                 db.close();
                 resolve();
             }

diff --git a/tests/e2e/helpers/insights.ts b/tests/e2e/helpers/insights.ts
@@ -1,5 +1,5 @@
-import * as fs from 'fs-extra';
 import * as path from 'path';
+import * as fs from 'fs-extra';
 import { BasePage } from '../pageObjects';
 import { deleteRowsFromTableInDB, updateColumnValueInDBTable } from './database-scripts';
 import { syncFeaturesApi } from './api/api-info';

diff --git a/tests/e2e/helpers/notifications.ts b/tests/e2e/helpers/notifications.ts
@@ -1,4 +1,4 @@
-import { workingDirectory} from '../helpers/conf';
+import { workingDirectory } from '../helpers/conf';
 import { NotificationParameters } from '../pageObjects/components/navigation/notification-panel';
 
 const dbPath = `${workingDirectory}/redisinsight.db`;

diff --git a/tests/e2e/pageObjects/browser-page.ts b/tests/e2e/pageObjects/browser-page.ts
@@ -39,7 +39,7 @@ export class BrowserPage extends InstancePage {
     refreshKeysButton = Selector('[data-testid=refresh-keys-btn]');
     refreshKeyButton = Selector('[data-testid=refresh-key-btn]');
     editKeyNameButton = Selector('[data-testid=edit-key-btn]');
-    editKeyValueButton = Selector('[data-testid=edit-key-value-btn]');
+    editKeyValueButton = Selector('[data-testid=edit-key-value-btn]', { timeout: 500 });
     closeKeyButton = Selector('[data-testid=close-key-btn]');
     plusAddKeyButton = Selector('[data-testid=btn-add-key]');
     addKeyValueItemsButton = Selector('[data-testid=add-key-value-items-btn]');

diff --git a/tests/e2e/pageObjects/components/browser/index.ts b/tests/e2e/pageObjects/components/browser/index.ts
@@ -3,5 +3,5 @@ import { TreeView } from './tree-view';
 
 export {
     BulkActions,
-    TreeView,
+    TreeView
 };
diff --git a/tests/e2e/pageObjects/components/myRedisDatabase/add-redis-database.ts b/tests/e2e/pageObjects/components/myRedisDatabase/add-redis-database.ts
@@ -266,9 +266,8 @@ export class AddRedisDatabase {
     /**
      * set copressor value in dropdown
      * @param compressor - compressor value
-     * @param value - checkbox value
      */
-    async setCompressorValue(compressor: string){
+    async setCompressorValue(compressor: string): Promise<void> {
 
         if(!await this.selectCompressor.exists) {
             await t.click(this.dataCompressorLabel);

diff --git a/tests/e2e/pageObjects/index.ts b/tests/e2e/pageObjects/index.ts
@@ -27,5 +27,5 @@ export {
     InstancePage,
     TriggersAndFunctionsLibrariesPage,
     TriggersAndFunctionsFunctionsPage,
-    WelcomePage,
+    WelcomePage
 };
diff --git a/tests/e2e/pageObjects/workbench-page.ts b/tests/e2e/pageObjects/workbench-page.ts
@@ -290,6 +290,6 @@ export class WorkbenchPage extends InstancePage {
         do {
             imageHeight = await selector.getStyleProperty('height');
         }
-        while ((imageHeight == '0px') && Date.now() - startTime < searchTimeout);
+        while ((imageHeight === '0px') && Date.now() - startTime < searchTimeout);
     }
 }
diff --git a/tests/e2e/tests/web/critical-path/browser/formatters.e2e.ts b/tests/e2e/tests/web/critical-path/browser/formatters.e2e.ts
@@ -57,11 +57,11 @@ formattersHighlightedSet.forEach(formatter => {
                 // Verify that value is formatted and highlighted
                 await t.expect(valueSelector.find(browserPage.cssJsonValue).exists).ok(`${key.textType} Value is not formatted to ${formatter.format}`);
                 // Verify that Hash field is formatted and highlighted for JSON and PHP serialized
-                if (key.keyName === 'hash') {
+                if (key.textType === 'Hash') {
                     await t.expect(browserPage.hashField.find(browserPage.cssJsonValue).exists).ok(`Hash field is not formatted to ${formatter.format}`);
                 }
                 // Verify that Stream field is formatted and highlighted for JSON and PHP serialized
-                if (key.keyName === 'stream') {
+                if (key.textType === 'Stream') {
                     await t.expect(Selector(browserPage.cssJsonValue).count).eql(2, `Hash field is not formatted to ${formatter.format}`);
                 }
             }
@@ -193,10 +193,10 @@ notEditableFormattersSet.forEach(formatter => {
         // Verify for Protobuf, Java serialized, Pickle
         // Verify for Hash, List, ZSet, String keys
         for (const key of keysData) {
-            if (key.keyName === 'hash' || key.keyName === 'list' || key.keyName === 'zset' || key.keyName === 'string') {
-                const editBtn = (key.keyName === 'string')
+            if (key.textType === 'Hash' || key.textType === 'List' || key.textType === 'Sorted Set' || key.textType === 'String') {
+                const editBtn = (key.textType === 'String')
                     ? browserPage.editKeyValueButton
-                    : Selector(`[data-testid^=edit-][data-testid*=${key.keyName.split('-')[0]}]`);
+                    : Selector(`[data-testid*=edit-][data-testid*=${key.keyName.split('-')[0]}]`, { timeout: 500 });
                 await browserPage.openKeyDetailsByKeyName(key.keyName);
                 await browserPage.selectFormatter(formatter.format);
                 // Verify that edit button disabled

diff --git a/tests/e2e/tests/web/critical-path/database-overview/database-index.e2e.ts b/tests/e2e/tests/web/critical-path/database-overview/database-index.e2e.ts
@@ -48,7 +48,7 @@ fixture `Allow to change database index`
     });
 test('Switching between indexed databases', async t => {
     const command = `HSET ${logicalDbKey} "name" "Gillford School" "description" "Gillford School is a centre" "class" "private" "type" "democratic; waldorf" "address_city" "Goudhurst" "address_street" "Goudhurst" "students" 721 "location" "51.112685, 0.451076"`;
-    const rememberedConnectedClients = await browserPage.overviewConnectedClients.textContent;
+    // const rememberedConnectedClients = await browserPage.overviewConnectedClients.textContent;
 
     // Change index to logical db
     // Verify that database index switcher displayed for Standalone db

diff --git a/tests/e2e/tests/web/critical-path/database-overview/database-overview.e2e.ts b/tests/e2e/tests/web/critical-path/database-overview/database-overview.e2e.ts
@@ -16,7 +16,6 @@ import {
 } from '../../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 
-
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const browserPage = new BrowserPage();
 const chance = new Chance();
@@ -47,8 +46,8 @@ test
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
     })('Verify that user can see the list of Modules updated each time when he connects to the database', async t => {
-        let firstDatabaseModules: string[] = [];
-        let secondDatabaseModules: string[] = [];
+        const firstDatabaseModules: string[] = [];
+        const secondDatabaseModules: string[] = [];
         //Remember modules
         await t.click(browserPage.OverviewPanel.overviewMoreInfo);
         const moduleIcons = Selector('div').find('[data-testid^=Redi]');

diff --git a/tests/e2e/tests/web/critical-path/database/import-databases.e2e.ts b/tests/e2e/tests/web/critical-path/database/import-databases.e2e.ts
@@ -233,7 +233,7 @@ test('Certificates import with/without path', async t => {
 });
 test('Import SSH parameters', async t => {
     const sshAgentsResult = 'SSH Agents are not supported';
-    const sshPrivateKey = '-----BEGIN OPENSSH PRIVATE KEY-----';
+    // const sshPrivateKey = '-----BEGIN OPENSSH PRIVATE KEY-----';
 
     await databasesActions.importDatabase(racompSSHData);
     // Fully imported table with SSH

diff --git a/tests/e2e/tests/web/critical-path/memory-efficiency/recommendations.e2e.ts b/tests/e2e/tests/web/critical-path/memory-efficiency/recommendations.e2e.ts
@@ -39,7 +39,7 @@ fixture `Memory Efficiency Recommendations`
         // Go to Analysis Tools page
         await t.click(myRedisDatabasePage.NavigationPanel.analysisPageButton);
     })
-    .afterEach(async t => {
+    .afterEach(async() => {
         // Clear and delete database
         await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
@@ -174,7 +174,7 @@ test.skip
         // Go to Recommendations tab
         await t.click(memoryEfficiencyPage.recommendationsTab);
     })
-    .after(async t => {
+    .after(async() => {
         // Clear and delete database
         await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);

diff --git a/tests/e2e/tests/web/critical-path/memory-efficiency/top-keys-table.e2e.ts b/tests/e2e/tests/web/critical-path/memory-efficiency/top-keys-table.e2e.ts
@@ -3,7 +3,7 @@ import { Selector } from 'testcafe';
 import { MyRedisDatabasePage, MemoryEfficiencyPage, BrowserPage } from '../../../../pageObjects';
 import { rte } from '../../../../helpers/constants';
 import { DatabaseHelper } from '../../../../helpers/database';
-import { commonUrl, ossStandaloneConfig, ossStandaloneRedisearch } from '../../../../helpers/conf';
+import { commonUrl, ossStandaloneRedisearch } from '../../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 import { deleteAllKeysFromDB, populateDBWithHashes, populateHashWithFields } from '../../../../helpers/keys';
 import { Common } from '../../../../helpers/common';
@@ -80,7 +80,7 @@ test
         // Go to Analysis Tools page
         await t.click(myRedisDatabasePage.NavigationPanel.analysisPageButton);
     })
-    .after(async t => {
+    .after(async() => {
         await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneRedisearch.databaseName);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
     })('Big highlighted key tooltip', async t => {

diff --git a/tests/e2e/tests/web/critical-path/workbench/cypher.e2e.ts b/tests/e2e/tests/web/critical-path/workbench/cypher.e2e.ts
@@ -10,7 +10,7 @@ const databaseHelper = new DatabaseHelper();
 const databaseAPIRequests = new DatabaseAPIRequests();
 
 fixture `Cypher syntax at Workbench`
-    .meta({type: 'critical_path', rte: rte.standalone})
+    .meta({ type: 'critical_path', rte: rte.standalone })
     .page(commonUrl)
     .beforeEach(async t => {
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);

diff --git a/tests/e2e/tests/web/critical-path/workbench/default-scripts-area.e2e.ts b/tests/e2e/tests/web/critical-path/workbench/default-scripts-area.e2e.ts
@@ -24,7 +24,7 @@ const expectedProperties = [
 ];
 
 fixture `Default scripts area at Workbench`
-    .meta({type: 'critical_path', rte: rte.standalone})
+    .meta({ type: 'critical_path', rte: rte.standalone })
     .page(commonUrl)
     .beforeEach(async t => {
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneRedisearch);

diff --git a/tests/e2e/tests/web/regression/browser/add-keys.e2e.ts b/tests/e2e/tests/web/regression/browser/add-keys.e2e.ts
@@ -5,7 +5,6 @@ import { commonUrl, ossStandaloneBigConfig, ossStandaloneConfig } from '../../..
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 import { Common } from '../../../../helpers/common';
 import { BrowserActions } from '../../../../common-actions/browser-actions';
-import { verifyKeysDisplayingInTheList } from '../../../../helpers/keys';
 
 const browserPage = new BrowserPage();
 const browserActions = new BrowserActions();

diff --git a/tests/e2e/tests/web/regression/browser/resize-columns.e2e.ts b/tests/e2e/tests/web/regression/browser/resize-columns.e2e.ts
@@ -7,7 +7,6 @@ import { rte } from '../../../../helpers/constants';
 import { commonUrl, ossStandaloneConfig } from '../../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 import { Common } from '../../../../helpers/common';
-import { t } from 'testcafe';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const browserPage = new BrowserPage();

diff --git a/tests/e2e/tests/web/regression/browser/scan-keys.e2e.ts b/tests/e2e/tests/web/regression/browser/scan-keys.e2e.ts
@@ -16,7 +16,7 @@ const explicitErrorHandler = (): void => {
 };
 
 fixture `Browser - Specify Keys to Scan`
-    .meta({type: 'regression', rte: rte.none})
+    .meta({ type: 'regression', rte: rte.none })
     .page(commonUrl)
     .clientScripts({ content: `(${explicitErrorHandler.toString()})()` })
     .beforeEach(async() => {

diff --git a/tests/e2e/tests/web/regression/workbench/autocomplete.e2e.ts b/tests/e2e/tests/web/regression/workbench/autocomplete.e2e.ts
@@ -10,7 +10,7 @@ const databaseHelper = new DatabaseHelper();
 const databaseAPIRequests = new DatabaseAPIRequests();
 
 fixture `Autocomplete for entered commands`
-    .meta({type: 'regression', rte: rte.standalone})
+    .meta({ type: 'regression', rte: rte.standalone })
     .page(commonUrl)
     .beforeEach(async t => {
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);

diff --git a/tests/e2e/tests/web/regression/workbench/context.e2e.ts b/tests/e2e/tests/web/regression/workbench/context.e2e.ts
@@ -50,7 +50,7 @@ test('Verify that user can see saved CLI size when navigates away to any other p
 test('Verify that user can see all the information removed when reloads the page', async t => {
     const command = 'FT._LIST';
     // Create context modificaions and navigate to Browser
-    await t.typeText(workbenchPage.queryInput, command, { replace: true, speed: speed});
+    await t.typeText(workbenchPage.queryInput, command, { replace: true, speed: speed });
     await t.click(workbenchPage.Cli.cliExpandButton);
     await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
     // Open Workbench page and verify context

diff --git a/tests/e2e/tests/web/regression/workbench/cypher.e2e.ts b/tests/e2e/tests/web/regression/workbench/cypher.e2e.ts
@@ -12,7 +12,7 @@ const databaseAPIRequests = new DatabaseAPIRequests();
 const command = 'GRAPH.QUERY graph';
 
 fixture `Cypher syntax at Workbench`
-    .meta({type: 'regression', rte: rte.standalone})
+    .meta({ type: 'regression', rte: rte.standalone })
     .page(commonUrl)
     .beforeEach(async t => {
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);