Skip to content

Commit 6fea3e6

Browse files
fix for updated tests
1 parent e806b9c commit 6fea3e6

File tree

4 files changed

+13
-31
lines changed

4 files changed

+13
-31
lines changed

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -192,27 +192,3 @@ export async function deleteKeyByNameApi(
192192
.eql(200, 'The deletion of the key request failed');
193193
}
194194
}
195-
196-
/**
197-
* Delete Keys by names
198-
* @param keyNames The names of keys
199-
* @param databaseParameters The database parameters
200-
*/
201-
export async function deleteKeysApi(
202-
keyNames: string[],
203-
databaseName: string
204-
): Promise<void> {
205-
const databaseId = await databaseAPIRequests.getDatabaseIdByName(
206-
databaseName
207-
);
208-
const bufferKeyNames = keyNames.forEach((key) => Buffer.from(key, 'utf-8'));
209-
const requestBody = { keyNames: bufferKeyNames };
210-
const response = await sendPostRequest(
211-
bufferPathMask.replace('databaseId', databaseId),
212-
requestBody
213-
);
214-
215-
await t
216-
.expect(response.status)
217-
.eql(200, 'The deletion of the keys request failed');
218-
}

tests/e2e/tests/critical-path/memory-efficiency/memory-efficiency.e2e.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { Chance } from 'chance';
22
import { MyRedisDatabasePage, MemoryEfficiencyPage, BrowserPage, WorkbenchPage } from '../../../pageObjects';
33
import { rte } from '../../../helpers/constants';
44
import { DatabaseHelper } from '../../../helpers/database';
5-
import { commonUrl, ossStandaloneConfig, ossStandaloneRedisGears } from '../../../helpers/conf';
5+
import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
66
import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
77
import { verifySearchFilterValue } from '../../../helpers/keys';
8-
import { deleteKeyByNameApi, deleteKeysApi } from '../../../helpers/api/api-keys';
8+
import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
99

1010
const memoryEfficiencyPage = new MemoryEfficiencyPage();
1111
const myRedisDatabasePage = new MyRedisDatabasePage();
@@ -72,7 +72,9 @@ test
7272
await browserPage.Cli.deleteKeysFromCliWithDelimiter(15);
7373
await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
7474
await t.click(browserPage.browserViewButton);
75-
await deleteKeysApi([streamKeyName, hashKeyName, streamKeyNameDelimiter], ossStandaloneConfig.databaseName);
75+
await deleteKeyByNameApi(hashKeyName, ossStandaloneConfig.databaseName);
76+
await deleteKeyByNameApi(streamKeyName, ossStandaloneConfig.databaseName);
77+
await deleteKeyByNameApi(streamKeyNameDelimiter, ossStandaloneConfig.databaseName);
7678
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
7779
})('Keyspaces displaying in Summary per keyspaces table', async t => {
7880
const noNamespacesMessage = 'No namespaces to displayConfigure the delimiter in Tree View to customize the namespaces displayed.';
@@ -211,7 +213,9 @@ test
211213
})
212214
.after(async t => {
213215
await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
214-
await deleteKeysApi([hashKeyName, streamKeyName, streamKeyNameDelimiter], ossStandaloneConfig.databaseName);
216+
await deleteKeyByNameApi(hashKeyName, ossStandaloneConfig.databaseName);
217+
await deleteKeyByNameApi(streamKeyName, ossStandaloneConfig.databaseName);
218+
await deleteKeyByNameApi(streamKeyNameDelimiter, ossStandaloneConfig.databaseName);
215219
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
216220
})('Summary per expiration time', async t => {
217221
const yAxis = 218;

tests/e2e/tests/critical-path/memory-efficiency/recommendations.e2e.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ test
115115
// Clear and delete database
116116
await deleteKeyByNameApi(keyName, `${ossStandaloneConfig.databaseName} [${index}]`);
117117
await databaseHelper.deleteCustomDatabase(`${ossStandaloneConfig.databaseName} [${index}]`);
118+
await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
118119
await deleteKeyByNameApi(stringKeyName, ossStandaloneConfig.databaseName);
119120
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
120121
})('Avoid using logical databases recommendation', async t => {

tests/e2e/tests/regression/browser/filtering.e2e.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { Selector } from 'testcafe';
22
import { KeyTypesTexts, rte } from '../../../helpers/constants';
33
import { DatabaseHelper } from '../../../helpers/database';
44
import { BrowserPage } from '../../../pageObjects';
5-
import { commonUrl, ossStandaloneConfig, ossStandaloneBigConfig, ossStandaloneRedisGears } from '../../../helpers/conf';
5+
import { commonUrl, ossStandaloneConfig, ossStandaloneBigConfig } from '../../../helpers/conf';
66
import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
77
import { keyTypes } from '../../../helpers/keys';
88
import { Common } from '../../../helpers/common';
9-
import { deleteKeyByNameApi, deleteKeysApi } from '../../../helpers/api/api-keys';
9+
import { deleteKeyByNameApi } from '../../../helpers/api/api-keys';
1010

1111
const browserPage = new BrowserPage();
1212
const databaseHelper = new DatabaseHelper();
@@ -62,7 +62,8 @@ test('Verify that user can filter per pattern with ? (matches keys with any char
6262
test
6363
.after(async() => {
6464
// Clear and delete database
65-
await deleteKeysApi([keyName, keyName2], ossStandaloneConfig.databaseName);
65+
await deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
66+
await deleteKeyByNameApi(keyName2, ossStandaloneConfig.databaseName);
6667
await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
6768
})('Verify that user can filter per pattern with [xy] (matches one symbol: either x or y))', async t => {
6869
keyName = `KeyForSearch${Common.generateWord(10)}`;

0 commit comments

Comments
 (0)