Merge pull request #2835 from RedisInsight/e2e/bugfix/fix-failed-e2e

fixes for failed after hooks

Author: vlad-dargel

tests/e2e/pageObjects/browser-page.ts

@@ -931,7 +931,7 @@ export class BrowserPage extends InstancePage {
             const rememberedScanResults = Number((await this.keysNumberOfResults.textContent).replace(/\s/g, ''));
             await t.expect(this.progressKeyList.exists).notOk('Progress Bar is still displayed', { timeout: 30000 });
             const scannedValueText = this.scannedValue.textContent;
-            const regExp = new RegExp(`${i} 00` + '.');
+            const regExp = new RegExp(`${i} ` + '...');
             await t
                 .expect(scannedValueText).match(regExp, `The database is not automatically scanned by ${i} 000 keys`)
                 .click(this.scanMoreButton);

tests/e2e/tests/web/critical-path/browser/scan-keys.e2e.ts

@@ -36,6 +36,8 @@ fixture `Browser - Specify Keys to Scan`
         await t.click(myRedisDatabasePage.NavigationPanel.settingsButton);
         await t.click(settingsPage.accordionAdvancedSettings);
         await settingsPage.changeKeysToScanValue('10000');
+        // Open Browser page
+        await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
         //Clear and delete database
         await browserPage.Cli.sendCommandInCli(`DEL ${keys.join(' ')}`);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);

tests/e2e/tests/web/critical-path/settings/settings.e2e.ts

@@ -21,22 +21,22 @@ fixture `Settings`
     .clientScripts({ content: `(${explicitErrorHandler.toString()})()` })
     .beforeEach(async() => {
         await databaseHelper.acceptLicenseTerms();
-    })
-    .afterEach(async() => {
-        await settingsPage.changeKeysToScanValue('10000');
     });
-test('Verify that user can customize a number of keys to scan in filters per key name or key type', async t => {
+test
+    .after(async() => {
+        await settingsPage.changeKeysToScanValue('10000');
+    })('Verify that user can customize a number of keys to scan in filters per key name or key type', async t => {
     // Go to Settings page
-    await t.click(myRedisDatabasePage.NavigationPanel.settingsButton);
-    // Change keys to Scan
-    await t.click(settingsPage.accordionAdvancedSettings);
-    await settingsPage.changeKeysToScanValue('1500');
-    // Reload Page
-    await myRedisDatabasePage.reloadPage();
-    // Check that value was set
-    await t.click(settingsPage.accordionAdvancedSettings);
-    await t.expect(settingsPage.keysToScanValue.textContent).eql('1500', 'Keys to Scan has proper value');
-});
+        await t.click(myRedisDatabasePage.NavigationPanel.settingsButton);
+        // Change keys to Scan
+        await t.click(settingsPage.accordionAdvancedSettings);
+        await settingsPage.changeKeysToScanValue('1500');
+        // Reload Page
+        await myRedisDatabasePage.reloadPage();
+        // Check that value was set
+        await t.click(settingsPage.accordionAdvancedSettings);
+        await t.expect(settingsPage.keysToScanValue.textContent).eql('1500', 'Keys to Scan has proper value');
+    });
 test('Verify that user can turn on/off Analytics in Settings in the application', async t => {
     // Go to Settings page
     await t.click(myRedisDatabasePage.NavigationPanel.settingsButton);