Merge pull request #1079 from RedisInsight/e2e/feature/big-db-test-fix

E2E big db test fix

Author: vlad-dargel

tests/e2e/pageObjects/browser-page.ts

@@ -175,7 +175,6 @@ export class BrowserPage {
     noResultsFound = Selector('[data-test-subj=no-result-found]');
     searchAdvices = Selector('[data-test-subj=search-advices]');
     keysNumberOfResults = Selector('[data-testid=keys-number-of-results]');
-    keysNumberOfScanned = Selector('[data-testid=keys-number-of-scanned]');
     keysTotalNumber = Selector('[data-testid=keys-total]');
     overviewTotalKeys = Selector('[data-test-subj=overview-total-keys]');
     overviewTotalMemory = Selector('[data-test-subj=overview-total-memory]');
@@ -858,6 +857,24 @@ export class BrowserPage {
         await t.click(this.formatSwitcher);
         await t.click(option);
     }
+
+    /**
+     * Verify that keys can be scanned more and results increased
+     */
+    async verifyScannningMore(): Promise<void> {
+        for (let i = 10; i < 100; i += 10) {
+            // Remember results value
+            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 = await this.scannedValue.textContent;
+            const regExp = new RegExp(`${i} 00` + '.');
+            await t.expect(scannedValueText).match(regExp, `The database is not automatically scanned by ${i} 000 keys`);
+            await t.doubleClick(this.scanMoreButton);
+            await t.expect(this.progressKeyList.exists).ok('Progress Bar is not displayed', { timeout: 30000 });
+            const scannedResults = Number((await this.keysNumberOfResults.textContent).replace(/\s/g, ''));
+            await t.expect(scannedResults).gt(rememberedScanResults, { timeout: 3000 });
+        }
+    }
 }
 
 /**

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

@@ -63,12 +63,12 @@ test
         await t.click(cliPage.cliCollapseButton);
         //Search keys
         await browserPage.searchByKeyName(searchPattern);
-        const keysNumberOfScanned = await browserPage.keysNumberOfScanned.textContent;
+        const keysNumberOfScanned = await browserPage.scannedValue.textContent;
         //Verify that number of scanned is 1000
         await t.expect(keysNumberOfScanned).contains('1 000', 'Number of scanned is 1000');
         //Scan more
         await t.click(browserPage.scanMoreButton);
-        const keysNumberOfScannedScanMore = await browserPage.keysNumberOfScanned.textContent;
+        const keysNumberOfScannedScanMore = await browserPage.scannedValue.textContent;
         //Verify that number of results is 2000
         await t.expect(keysNumberOfScannedScanMore).contains('2 000', 'Number of scanned is 2000');
     });

tests/e2e/tests/critical-path/tree-view/tree-view.e2e.ts

@@ -40,15 +40,7 @@ test
     .meta({ rte: rte.standalone })('Verify that user can scan DB by 10K in tree view', async t => {
         await t.click(browserPage.treeViewButton);
         //Verify that user can use the "Scan More" button to search per another 10000 keys
-        for (let i = 10; i < 100; i += 10) {
-            // scannedValue = scannedValue + 10;
-            await t.expect(browserPage.progressKeyList.exists).notOk('Progress Bar is not displayed', { timeout: 30000 });
-            const scannedValueText = await browserPage.scannedValue.textContent;
-            const regExp = new RegExp(`${i} 00` + '.');
-            await t.expect(scannedValueText).match(regExp, `The database is automatically scanned by ${i} 000 keys`);
-            await t.doubleClick(browserPage.scanMoreButton);
-            await t.expect(browserPage.progressKeyList.exists).ok('Progress Bar is displayed', { timeout: 30000 });
-        }
+        await browserPage.verifyScannningMore();
     });
 test
     .after(async() => {

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

@@ -206,33 +206,33 @@ test
     })
     .after(async() => {
         // Delete database
-        await browserPage.deleteKeyByName(keyName);
         await deleteStandaloneDatabaseApi(ossStandaloneBigConfig);
     })('Verify that user can filter per key name using patterns in DB with 10-50 millions of keys', async t => {
-        // Create new key
-        keyName = `KeyForSearch-${chance.word({ length: 10 })}`;
-        await browserPage.addSetKey(keyName);
-        // Search by key name
+        keyName = 'device*';
         await browserPage.selectFilterGroupType(KeyTypesTexts.Set);
-        // Verify that required key is displayed
-        await browserPage.searchByKeyNameWithScanMore('KeyForSearch*', keyName);
-        // Verify that required key is displayed in tree view
+        await browserPage.searchByKeyName(keyName);
+        for (let i = 0; i < 10; i++) {
+            // Verify that keys are filtered
+            await t.expect(browserPage.keyNameInTheList.nth(i).textContent).contains('device', 'Keys filtered incorrectly by key name')
+                .expect(browserPage.keyNameInTheList.nth(i).textContent).contains('set', 'Keys filtered incorrectly by key type');
+        }
         await t.click(browserPage.treeViewButton);
-        await browserPage.searchByKeyNameWithScanMore('KeyForSearch*', keyName);
+        //Verify that user can use the "Scan More" button to search per another 10000 keys
+        await browserPage.verifyScannningMore();
     });
 test
-    .before(async () => {
+    .before(async() => {
         // Add Big standalone DB
         await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneBigConfig, ossStandaloneBigConfig.databaseName);
     })
-    .after(async () => {
+    .after(async() => {
         // Delete database
         await deleteStandaloneDatabaseApi(ossStandaloneBigConfig);
     })('Verify that user can filter per key type in DB with 10-50 millions of keys', async t => {
         for (let i = 0; i < keyTypes.length - 2; i++) {
             await browserPage.selectFilterGroupType(keyTypes[i].textType);
             const filteredTypeKeys = keyTypes[i].keyName === 'json'
-                ? Selector(`[data-testid^=badge-ReJSON]`)
+                ? Selector('[data-testid^=badge-ReJSON]')
                 : Selector(`[data-testid^=badge-${keyTypes[i].keyName}]`);
             // Verify that all results have the same type as in filter
             await t.expect(await browserPage.filteringLabel.count).eql(await filteredTypeKeys.count, `The keys of type ${keyTypes[i].textType} not filtered correctly`);

tests/e2e/tests/regression/browser/handle-dbsize-permissions.e2e.ts

@@ -51,7 +51,7 @@ test('Verify that user without dbsize permissions can connect to DB', async t =>
     await cliPage.sendCommandInCli(createKeyCommand);
     await browserPage.searchByKeyName(keyName);
     await t.expect(browserPage.keysNumberOfResults.textContent).eql('1', 'Found keys number');
-    await t.expect(browserPage.keysNumberOfScanned.textContent).contains('18 000', 'Number of scanned');
+    await t.expect(browserPage.scannedValue.textContent).contains('18 000', 'Number of scanned');
     await t.expect(browserPage.keysTotalNumber.textContent).contains('18 000', 'Number of total keys');
     // Check bulk delete
     await cliPage.sendCommandInCli(createKeyCommand);

tests/e2e/tests/regression/tree-view/tree-view.e2e.ts

@@ -5,7 +5,7 @@ import {
     ossStandaloneBigConfig,
     ossStandaloneConfig
 } from '../../../helpers/conf';
-import { rte } from '../../../helpers/constants';
+import { KeyTypesTexts, rte } from '../../../helpers/constants';
 import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
 
 const browserPage = new BrowserPage();
@@ -33,9 +33,9 @@ test
         await t.click(browserPage.treeViewButton);
         await t.expect(browserPage.keyListTable.textContent).contains('No keys to display.', 'The message is displayed');
     });
-//skipped due the issue
-test.skip
+test
     .meta({ rte: rte.standalone })('Verify that user can see the total number of keys, the number of keys scanned, the “Scan more” control displayed at the top of Tree view and Browser view', async t => {
+        await browserPage.selectFilterGroupType(KeyTypesTexts.Hash);
         //Verify the controls on the Browser view
         await t.expect(browserPage.totalKeysNumber.visible).ok('The total number of keys is displayed on the Browser view');
         await t.expect(browserPage.scannedValue.visible).ok('The number of keys scanned is displayed on the Browser view');