Merge pull request #1660 from RedisInsight/release/2.18.0

Release/2.18.0 into main

Author: vlad-dargel

redisinsight/package.json

@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.16.0",
+  "version": "2.18.0",
   "description": "RedisInsight",
   "main": "./main.prod.js",
   "author": {

tests/e2e/helpers/keys.ts

@@ -82,7 +82,7 @@ export async function deleteKeysViaCli(keyData: KeyData): Promise<void> {
  * @param keyArguments The arguments of key
  */
 export async function populateDBWithHashes(host: string, port: string, keyArguments: AddKeyArguments): Promise<void> {
-    const dbConf = { host, port: Number(port) };
+    const dbConf = { port: Number.parseInt(port), host, username: 'default' };
     const client = createClient(dbConf);
 
     await client.on('error', async function (error: string) {
@@ -110,7 +110,7 @@ export async function populateDBWithHashes(host: string, port: string, keyArgume
  * @param keyArguments The arguments of key and its fields
  */
 export async function populateHashWithFields(host: string, port: string, keyArguments: AddKeyArguments): Promise<void> {
-    const dbConf = { host, port: Number(port) };
+    const dbConf = { port: Number.parseInt(port), host, username: 'default' };
     const client = createClient(dbConf);
     const fields: string[] = [];
 
@@ -141,7 +141,7 @@ export async function populateHashWithFields(host: string, port: string, keyArgu
  * @param keyArguments The arguments of key and its members
  */
 export async function populateListWithElements(host: string, port: string, keyArguments: AddKeyArguments): Promise<void> {
-    const dbConf = { host, port: Number(port) };
+    const dbConf = { port: Number.parseInt(port), host, username: 'default' };
     const client = createClient(dbConf);
     const elements: string[] = [];
 
@@ -171,7 +171,7 @@ export async function populateListWithElements(host: string, port: string, keyAr
  * @param keyArguments The arguments of key and its members
  */
 export async function populateSetWithMembers(host: string, port: string, keyArguments: AddKeyArguments): Promise<void> {
-    const dbConf = { host, port: Number(port) };
+    const dbConf = { port: Number.parseInt(port), host, username: 'default' };
     const client = createClient(dbConf);
     const members: string[] = [];
 
@@ -201,7 +201,7 @@ export async function populateSetWithMembers(host: string, port: string, keyArgu
  * @param keyArguments The arguments of key and its members
  */
  export async function populateZSetWithMembers(host: string, port: string, keyArguments: AddKeyArguments): Promise<void> {
-    const dbConf = { host, port: Number(port) };
+    const dbConf = { port: Number.parseInt(port), host, username: 'default' };
     let minScoreValue: -10;
     let maxScoreValue: 10;
     const client = createClient(dbConf);
@@ -233,7 +233,7 @@ export async function populateSetWithMembers(host: string, port: string, keyArgu
  * @param port The port of database
  */
 export async function deleteAllKeysFromDB(host: string, port: string): Promise<void> {
-    const dbConf = { host, port: Number(port) };
+    const dbConf = { port: Number.parseInt(port), host, username: 'default' };
     const client = createClient(dbConf);
 
     await client.on('error', async function (error: string) {

tests/e2e/package.json

@@ -38,7 +38,7 @@
     "eslint": "7.32.0",
     "eslint-plugin-import": "2.24.2",
     "sqlite3": "5.0.10",
-    "redis": "^3.0.2",
+    "redis": "3.0.2",
     "supertest": "^4.0.2",
     "testcafe": "1.14.2",
     "testcafe-browser-provider-electron": "0.0.18",

tests/e2e/tests/critical-path/browser/bulk-delete.e2e.ts

@@ -56,7 +56,7 @@ test('Verify that user can access the bulk actions screen in the Browser', async
 });
 test('Verify that user can see summary of scanned level', async t => {
     const expectedAmount = new RegExp('Expected amount: ~(9|10) \\d{3} keys');
-    const scannedKeys = new RegExp('Scanned (5|10)% \\((500|1000)/10 \\d{3}\\) and found \\d{3,5} keys');
+    const scannedKeys = new RegExp('Scanned (5|10)% \\((500|1 000)/10 \\d{3}\\) and found \\d{3,5} keys');
     const messageTitle = 'No pattern or key type set';
     const messageText = 'To perform a bulk action, set the pattern or select the key type';
 

tests/e2e/tests/regression/monitor/monitor.e2e.ts

@@ -14,7 +14,7 @@ import {
     ossStandaloneNoPermissionsConfig
 } from '../../../helpers/conf';
 import { rte } from '../../../helpers/constants';
-import { addNewStandaloneDatabaseApi, deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
+import { addNewStandaloneDatabaseApi, deleteStandaloneDatabaseApi, deleteStandaloneDatabasesApi } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
@@ -115,25 +115,27 @@ test
             await t.expect(previousTimestamp).notEql(nextTimestamp, 'Monitor results not correct');
         }
     });
-test
+    // Skipped due to redis issue https://redislabs.atlassian.net/browse/RI-4111
+test.skip
     .before(async t => {
         await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig, ossStandaloneConfig.databaseName);
         await cliPage.sendCommandInCli('acl setuser noperm nopass on +@all ~* -monitor');
         // Check command result in CLI
         await t.click(cliPage.cliExpandButton);
         await t.expect(cliPage.cliOutputResponseSuccess.textContent).eql('"OK"', 'Command from autocomplete was not found & executed');
         await t.click(cliPage.cliCollapseButton);
-        await deleteStandaloneDatabaseApi(ossStandaloneConfig);
         await t.click(myRedisDatabasePage.myRedisDBButton);
         await addNewStandaloneDatabaseApi(ossStandaloneNoPermissionsConfig);
         await common.reloadPage();
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneNoPermissionsConfig.databaseName);
     })
-    .after(async() => {
+    .after(async t => {
         // Delete created user
+        await t.click(myRedisDatabasePage.myRedisDBButton);
+        await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
         await cliPage.sendCommandInCli('acl DELUSER noperm');
         // Delete database
-        await deleteStandaloneDatabaseApi(ossStandaloneNoPermissionsConfig);
+        await deleteStandaloneDatabasesApi([ossStandaloneConfig, ossStandaloneNoPermissionsConfig]);
     })('Verify that if user doesn\'t have permissions to run monitor, user can see error message', async t => {
         // Expand the Profiler
         await t.click(monitorPage.expandMonitor);