From 22bf70a427159fd11bd5f705487adcdd71a65dde Mon Sep 17 00:00:00 2001 From: vlad-dargel Date: Thu, 26 Jan 2023 18:37:41 +0100 Subject: [PATCH 1/2] update for test --- tests/e2e/tests/regression/monitor/monitor.e2e.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/e2e/tests/regression/monitor/monitor.e2e.ts b/tests/e2e/tests/regression/monitor/monitor.e2e.ts index ee82af7b63..383b0dc1f1 100644 --- a/tests/e2e/tests/regression/monitor/monitor.e2e.ts +++ b/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(); @@ -123,17 +123,18 @@ test 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); From c1eae708049c6c0054dcaa1466018c17984cf379 Mon Sep 17 00:00:00 2001 From: vlad-dargel Date: Thu, 26 Jan 2023 19:11:51 +0100 Subject: [PATCH 2/2] fix --- tests/e2e/tests/critical-path/browser/bulk-delete.e2e.ts | 2 +- tests/e2e/tests/regression/monitor/monitor.e2e.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/e2e/tests/critical-path/browser/bulk-delete.e2e.ts b/tests/e2e/tests/critical-path/browser/bulk-delete.e2e.ts index 4559d1526b..59ad57e6f1 100644 --- a/tests/e2e/tests/critical-path/browser/bulk-delete.e2e.ts +++ b/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'; diff --git a/tests/e2e/tests/regression/monitor/monitor.e2e.ts b/tests/e2e/tests/regression/monitor/monitor.e2e.ts index 383b0dc1f1..d447af81df 100644 --- a/tests/e2e/tests/regression/monitor/monitor.e2e.ts +++ b/tests/e2e/tests/regression/monitor/monitor.e2e.ts @@ -115,7 +115,8 @@ 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');