Merge pull request #2432 from RedisInsight/e2e/bugfix/updateDeleteMethods

E2e/bugfix/update delete methods

Author: mariasergeenko

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

@@ -6,13 +6,13 @@ import {
     OSSClusterParameters,
     databaseParameters,
     SentinelParameters,
-    ClusterNodes,
+    ClusterNodes
 } from '../../pageObjects/components/myRedisDatabase/add-redis-database';
 import { ResourcePath } from '../constants';
 import {
     sendGetRequest,
     sendPostRequest,
-    sendDeleteRequest,
+    sendDeleteRequest
 } from './api-common';
 
 const chance = new Chance();

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

@@ -5,13 +5,15 @@ import {
     ListKeyParameters,
     SetKeyParameters,
     SortedSetKeyParameters,
-    StreamKeyParameters,
+    StreamKeyParameters
 } from '../../pageObjects/browser-page';
-import { sendGetRequest, sendPostRequest } from './api-common';
+import { sendDeleteRequest, sendPostRequest } from './api-common';
 import { DatabaseAPIRequests } from './api-database';
 
 const databaseAPIRequests = new DatabaseAPIRequests();
 
+const bufferPathMask = '/databases/databaseId/keys?encoding=buffer';
+
 /**
  * Add Hash key
  * @param keyParameters The key parameters
@@ -26,7 +28,7 @@ export async function addHashKeyApi(
     );
     const requestBody = {
         keyName: keyParameters.keyName,
-        fields: keyParameters.fields,
+        fields: keyParameters.fields
     };
     const response = await sendPostRequest(
         `/databases/${databaseId}/hash?encoding=buffer`,
@@ -52,7 +54,7 @@ export async function addStreamKeyApi(
     );
     const requestBody = {
         keyName: keyParameters.keyName,
-        entries: keyParameters.entries,
+        entries: keyParameters.entries
     };
     const response = await sendPostRequest(
         `/databases/${databaseId}/streams?encoding=buffer`,
@@ -78,7 +80,7 @@ export async function addSetKeyApi(
     );
     const requestBody = {
         keyName: keyParameters.keyName,
-        members: keyParameters.members,
+        members: keyParameters.members
     };
     const response = await sendPostRequest(
         `/databases/${databaseId}/set?encoding=buffer`,
@@ -104,7 +106,7 @@ export async function addSortedSetKeyApi(
     );
     const requestBody = {
         keyName: keyParameters.keyName,
-        members: keyParameters.members,
+        members: keyParameters.members
     };
     const response = await sendPostRequest(
         `/databases/${databaseId}/zSet?encoding=buffer`,
@@ -130,7 +132,7 @@ export async function addListKeyApi(
     );
     const requestBody = {
         keyName: keyParameters.keyName,
-        element: keyParameters.element,
+        element: keyParameters.element
     };
     const response = await sendPostRequest(
         `/databases/${databaseId}/list?encoding=buffer`,
@@ -151,13 +153,17 @@ export async function searchKeyByNameApi(
     keyName: string,
     databaseParameters: AddNewDatabaseParameters
 ): Promise<string[]> {
+    const requestBody = {
+        cursor: '0',
+        match: keyName
+    };
     const databaseId = await databaseAPIRequests.getDatabaseIdByName(
         databaseParameters.databaseName
     );
-    const response = await sendGetRequest(
-        `/databases/${databaseId}/keys?cursor=0&count=5000&match=${keyName}`
+    const response = await sendPostRequest(
+        bufferPathMask.replace('databaseId', databaseId),
+        requestBody
     );
-
     await t.expect(response.status).eql(200, 'Getting key request failed');
     return await response.body[0].keys;
 }
@@ -176,12 +182,11 @@ export async function deleteKeyByNameApi(
     );
     const isKeyExist = await searchKeyByNameApi(keyName, databaseParameters);
     if (isKeyExist.length > 0) {
-        const requestBody = { keyNames: [keyName] };
-        const response = await sendPostRequest(
-            `/databases/${databaseId}/keys`,
+        const requestBody = { keyNames: [Buffer.from(keyName, 'utf-8')] };
+        const response = await sendDeleteRequest(
+            bufferPathMask.replace('databaseId', databaseId),
             requestBody
         );
-
         await t
             .expect(response.status)
             .eql(200, 'The deletion of the key request failed');
@@ -200,9 +205,10 @@ export async function deleteKeysApi(
     const databaseId = await databaseAPIRequests.getDatabaseIdByName(
         databaseParameters.databaseName
     );
-    const requestBody = { keyNames: keyNames };
+    const bufferKeyNames = keyNames.forEach((key) => Buffer.from(key, 'utf-8'));
+    const requestBody = { keyNames: bufferKeyNames };
     const response = await sendPostRequest(
-        `/databases/${databaseId}/keys`,
+        bufferPathMask.replace('databaseId', databaseId),
         requestBody
     );
 

tests/e2e/tests/critical-path/triggers-and-functions/libraries.e2e.ts

@@ -11,6 +11,7 @@ import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 import { TriggersAndFunctionLibrary } from '../../../interfaces/triggers-and-functions';
 import { CommonElementsActions } from '../../../common-actions/common-elements-actions';
 import { Common } from '../../../helpers/common';
+import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
 
 const browserPage = new BrowserPage();
 const databaseHelper = new DatabaseHelper();
@@ -177,7 +178,7 @@ test('Verify that function can be invoked', async t => {
 });
 
 test.after(async() => {
-    await browserPage.deleteKeyByNameFromList(streamKeyName);
+    await deleteKeyByNameApi(streamKeyName, ossStandaloneRedisGears);
     await browserPage.Cli.sendCommandInCli(`TFUNCTION DELETE ${libraryName}`);
     await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneRedisGears);
 })('Verify that user can open a Stream key from function', async t => {