Merge pull request #1644 from RedisInsight/e2e/bugfix/redis-package-fixes

E2e/bugfix/redis package fixes

Author: vlad-dargel

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);