Merge pull request #1169 from RedisInsight/e2e/bugfix/3532-fix-unstable-e2e

E2e/bugfix/3532 fix unstable e2e

Author: vlad-dargel

redisinsight/ui/src/constants/texts.tsx

@@ -5,13 +5,13 @@ import { getRouterLinkProps } from 'uiSrc/services'
 
 export const NoResultsFoundText = (<EuiText size="m">No results found.</EuiText>)
 export const NoKeysToDisplayText = (path: string, onClick: ()=> void) => (
-  <EuiText size="m">
+  <EuiText size="m" data-testid="no-result-found-msg">
     No keys to display.
     <br />
     <EuiLink
       {...getRouterLinkProps(path, onClick)}
       color="text"
-      data-test-subj="pubsub-page-btn"
+      data-test-subj="workbench-page-btn"
     >
       Use Workbench Guides and Tutorials
     </EuiLink>

tests/e2e/pageObjects/browser-page.ts

@@ -90,6 +90,7 @@ export class BrowserPage {
     editHashButton = Selector('[data-testid^=edit-hash-button-]');
     editZsetButton = Selector('[data-testid^=zset-edit-button-]');
     editListButton = Selector('[data-testid^=edit-list-button-]');
+    workbenchLinkButton = Selector('[data-test-subj=workbench-page-btn]');
     //CONTAINERS
     streamGroupsContainer = Selector('[data-testid=stream-groups-container]');
     streamConsumersContainer = Selector('[data-testid=stream-consumers-container]');
@@ -208,6 +209,7 @@ export class BrowserPage {
     multiSearchArea = Selector(this.cssFilteringLabel);
     keyDetailsHeader = Selector('[data-testid=key-details-header]');
     keyListTable = Selector('[data-testid=keyList-table]');
+    keyListMessage = Selector('[data-testid=no-result-found-msg]');
     keyDetailsTable = Selector('[data-testid=key-details]');
     keyNameFormDetails = Selector('[data-testid=key-name-text]');
     keyDetailsTTL = Selector('[data-testid=key-ttl-text]');

tests/e2e/pageObjects/monitor-page.ts

@@ -24,7 +24,7 @@ export class MonitorPage {
     monitorArea = Selector('[data-testid=monitor]');
     monitorWarningMessage = Selector('[data-testid=monitor-warning-message]');
     monitorCommandLinePart = Selector('[data-testid=monitor] span');
-    monitorCommandLineTimestamp = Selector('[data-testid=monitor] span').withText(/[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{3}/);
+    monitorCommandLineTimestamp = Selector('[data-testid=monitor] span').withText(/[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}/);
     monitorNoPermissionsMessage = Selector('[data-testid=monitor-error-message]');
     saveLogToolTip = Selector('[data-testid=save-log-tooltip]');
     monitorNotStartedElement = Selector('[data-testid=monitor-not-started]');

tests/e2e/tests/critical-path/browser/filtering.e2e.ts

@@ -86,16 +86,22 @@ test
         await t.expect(browserPage.multiSearchArea.find(browserPage.cssFilteringLabel).visible).notOk('The label of filtering type is removed');
         await t.expect(browserPage.keysSummary.textContent).contains('Total', 'The filter is removed');
     });
-test('Verify that user can see filtering per key name starts when he press Enter or clicks the control to filter per key name', async t => { //Check filtering labes
+test
+.after(async() => {
+    //Clear and delete database
+    await browserPage.deleteKeyByName(keyName);
+    await deleteStandaloneDatabaseApi(ossStandaloneConfig);
+})('Verify that user can see filtering per key name starts when he press Enter or clicks the control to filter per key name', async t => { //Check filtering labes
     keyName = chance.word({ length: 10 });
-    await t.expect(browserPage.keyListTable.textContent).contains('No keys to display.', 'The filtering is not set');
+    //Add new key
+    await browserPage.addStringKey(keyName);
     //Check the filtering starts by press Enter
-    await t.typeText(browserPage.filterByPatterSearchInput, keyName);
+    await t.typeText(browserPage.filterByPatterSearchInput, 'InvalidText');
     await t.pressKey('enter');
     await t.expect(browserPage.searchAdvices.visible).ok('The filtering is set');
     //Check the filtering starts by clicks the control
     await common.reloadPage();
-    await t.typeText(browserPage.filterByPatterSearchInput, keyName);
+    await t.typeText(browserPage.filterByPatterSearchInput, 'InvalidText');
     await t.click(browserPage.searchButton);
     await t.expect(browserPage.searchAdvices.visible).ok('The filtering is set');
 });

tests/e2e/tests/regression/browser/database-overview-keys.e2e.ts

@@ -1,6 +1,6 @@
 import { Chance } from 'chance';
 import { t } from 'testcafe';
-import { acceptLicenseTerms, acceptLicenseTermsAndAddDatabase, deleteDatabase } from '../../../helpers/database';
+import { acceptLicenseTermsAndAddDatabase, acceptLicenseTermsAndAddRECloudDatabase, deleteDatabase } from '../../../helpers/database';
 import {
     MyRedisDatabasePage,
     CliPage,
@@ -32,7 +32,7 @@ const verifyTooltipContainsText = async(text: string, contains: boolean): Promis
 };
 
 fixture `Database overview`
-    .meta({ rte: rte.standalone, type: 'regression' })
+    .meta({ type: 'regression' })
     .page(commonUrl)
     .beforeEach(async t => {
         //Create databases and keys
@@ -54,33 +54,31 @@ fixture `Database overview`
         await browserPage.deleteKeyByName(keyName);
         await deleteStandaloneDatabaseApi(ossStandaloneConfig);
     });
-test('Verify that user can see total and current logical database number of keys (if there are any keys in other logical DBs)', async t => {
-    //Wait for Total Keys number refreshed
-    await t.expect(browserPage.overviewTotalKeys.withText(`${keysAmount + 1}`).exists).ok('Total keys are not changed', { timeout: 10000 });
-    await t.hover(workbenchPage.overviewTotalKeys);
-    //Verify that user can see total number of keys and number of keys in current logical database
-    await t.expect(browserPage.tooltip.visible).ok('Total keys tooltip not displayed');
-    await verifyTooltipContainsText(`${keysAmount + 1}Total Keys`, true);
-    await verifyTooltipContainsText(`db1:${keysAmount}Keys`, true);
-});
-test('Verify that user can see total number of keys and not it current logical database (if there are no any keys in other logical DBs)', async t => {
-    //Open Database
-    await t.click(myRedisDatabasePage.myRedisDBButton);
-    await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
-    await t.hover(workbenchPage.overviewTotalKeys);
-    //Verify that user can see only total number of keys
-    await t.expect(browserPage.tooltip.visible).ok('Total keys tooltip not displayed');
-    await verifyTooltipContainsText(`${keysAmount + 1}Total Keys`, true);
-    await verifyTooltipContainsText('db1', false);
-});
 test
-    .before(async t => {
-        await acceptLicenseTerms();
-        await addRedisDatabasePage.addRedisDataBase(cloudDatabaseConfig);
-        //Click for saving
-        await t.click(addRedisDatabasePage.addRedisDatabaseButton);
-        await t.expect(myRedisDatabasePage.dbNameList.withExactText(cloudDatabaseConfig.databaseName).exists).ok('The existence of the database', { timeout: 5000 });
-        await myRedisDatabasePage.clickOnDBByName(cloudDatabaseConfig.databaseName);
+    .meta({ rte: rte.standalone })('Verify that user can see total and current logical database number of keys (if there are any keys in other logical DBs)', async t => {
+        //Wait for Total Keys number refreshed
+        await t.expect(browserPage.overviewTotalKeys.withText(`${keysAmount + 1}`).exists).ok('Total keys are not changed', { timeout: 10000 });
+        await t.hover(workbenchPage.overviewTotalKeys);
+        //Verify that user can see total number of keys and number of keys in current logical database
+        await t.expect(browserPage.tooltip.visible).ok('Total keys tooltip not displayed');
+        await verifyTooltipContainsText(`${keysAmount + 1}Total Keys`, true);
+        await verifyTooltipContainsText(`db1:${keysAmount}Keys`, true);
+    });
+test
+    .meta({ rte: rte.standalone })('Verify that user can see total number of keys and not it current logical database (if there are no any keys in other logical DBs)', async t => {
+        //Open Database
+        await t.click(myRedisDatabasePage.myRedisDBButton);
+        await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
+        await t.hover(workbenchPage.overviewTotalKeys);
+        //Verify that user can see only total number of keys
+        await t.expect(browserPage.tooltip.visible).ok('Total keys tooltip not displayed');
+        await verifyTooltipContainsText(`${keysAmount + 1}Total Keys`, true);
+        await verifyTooltipContainsText('db1', false);
+    });
+test
+    .meta({ rte: rte.reCloud })
+    .before(async() => {
+        await acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig);
     })
     .after(async() => {
         //Delete database

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

@@ -147,14 +147,13 @@ test
         await t.expect(browserPage.filterByPatterSearchInput.getAttribute('value')).eql('', 'All characters from filter input are removed');
         await t.expect(browserPage.clearFilterButton.visible).notOk('The clear control is disappeared');
     });
-test
-    .after(async() => {
-        //Delete database
-        await deleteStandaloneDatabaseApi(ossStandaloneConfig);
-    })('Verify that when user clicks on “clear” control and filter per key name is applied filter is reset and rescan initiated', async t => {
+test('Verify that when user clicks on “clear” control and filter per key name is applied filter is reset and rescan initiated', async t => {
         keyName = `KeyForSearch${chance.word({ length: 50 })}`;
+        keyName2 = `KeyForFearch${chance.word({ length: 10 })}`;
+        //Add keys
+        await browserPage.addStringKey(keyName);
         //Search for not existed key name
-        await browserPage.searchByKeyName(keyName);
+        await browserPage.searchByKeyName(keyName2);
         await t.expect(browserPage.keyListTable.textContent).contains('No results found.', 'Key is not found');
         //Verify the clear control
         await t.click(browserPage.clearFilterButton);

tests/e2e/tests/regression/browser/keys-all-databases.e2e.ts

@@ -22,7 +22,7 @@ const browserPage = new BrowserPage();
 const common = new Common();
 
 let keyName = common.generateWord(10);
-const verifyKeysAdded = async() => {
+const verifyKeysAdded = async(): Promise<void> => {
     keyName = common.generateWord(10);
     //add Hash key
     await browserPage.addHashKey(keyName);
@@ -51,6 +51,7 @@ test
         await verifyKeysAdded();
     });
 test
+    .meta({ rte: rte.reCloud })
     .before(async() => {
         await acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig);
     })

tests/e2e/tests/regression/database/overview.e2e.ts

@@ -1,24 +1,16 @@
-import { t } from 'testcafe';
 import { rte } from '../../../helpers/constants';
-import {acceptLicenseTerms, deleteDatabase} from '../../../helpers/database';
-import { BrowserPage, AddRedisDatabasePage, MyRedisDatabasePage, DatabaseOverviewPage } from '../../../pageObjects';
+import { acceptLicenseTermsAndAddRECloudDatabase, deleteDatabase } from '../../../helpers/database';
+import { BrowserPage, DatabaseOverviewPage } from '../../../pageObjects';
 import { commonUrl, cloudDatabaseConfig } from '../../../helpers/conf';
 
 const browserPage = new BrowserPage();
-const addRedisDatabasePage = new AddRedisDatabasePage();
-const myRedisDatabasePage = new MyRedisDatabasePage();
 const databaseOverviewPage = new DatabaseOverviewPage();
 
 fixture `Overview`
     .meta({ type: 'regression' })
     .page(commonUrl)
     .beforeEach(async() => {
-        await acceptLicenseTerms();
-        await addRedisDatabasePage.addRedisDataBase(cloudDatabaseConfig);
-        //Click for saving
-        await t.click(addRedisDatabasePage.addRedisDatabaseButton);
-        await t.expect(myRedisDatabasePage.dbNameList.withExactText(cloudDatabaseConfig.databaseName).exists).ok('The existence of the database', { timeout: 5000 });
-        await myRedisDatabasePage.clickOnDBByName(cloudDatabaseConfig.databaseName);
+        await acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig);
     })
     .afterEach(async() => {
         //Delete database

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

@@ -1,5 +1,5 @@
 import { acceptLicenseTermsAndAddDatabaseApi } from '../../../helpers/database';
-import { BrowserPage } from '../../../pageObjects';
+import { BrowserPage, WorkbenchPage } from '../../../pageObjects';
 import {
     commonUrl,
     ossStandaloneBigConfig,
@@ -9,9 +9,10 @@ import { KeyTypesTexts, rte } from '../../../helpers/constants';
 import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
 
 const browserPage = new BrowserPage();
+const workbenchPage = new WorkbenchPage();
 
 fixture `Tree view verifications`
-    .meta({type: 'regression'})
+    .meta({type: 'regression', rte: rte.standalone})
     .page(commonUrl)
     .beforeEach(async() => {
         await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneBigConfig, ossStandaloneBigConfig.databaseName);
@@ -21,20 +22,22 @@ fixture `Tree view verifications`
         await deleteStandaloneDatabaseApi(ossStandaloneBigConfig);
     });
 test
-    .meta({ rte: rte.standalone })
     .before(async() => {
         await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig, ossStandaloneConfig.databaseName);
     })
     .after(async() => {
         //Delete database
         await deleteStandaloneDatabaseApi(ossStandaloneConfig);
     })('Verify that user can see message "No keys to display." when there are no keys in the database', async t => {
+        const message = 'No keys to display.Use Workbench Guides and Tutorials to quickly load the data.'
         //Verify the message
         await t.click(browserPage.treeViewButton);
-        await t.expect(browserPage.keyListTable.textContent).contains('No keys to display.', 'The message is displayed');
+        await t.expect(browserPage.keyListMessage.textContent).contains(message, 'The message is displayed');
+        // Verify that workbench opened by clicking on "Use Workbench Guides and Tutorials" link
+        await t.click(browserPage.workbenchLinkButton);
+        await t.expect(workbenchPage.expandArea.visible).ok('Workbench page is not opened');
     });
-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 => {
+test('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');
@@ -46,8 +49,7 @@ test
         await t.expect(browserPage.scannedValue.visible).ok('The number of keys scanned is displayed on the Tree view');
         await t.expect(browserPage.scanMoreButton.visible).ok('The scan more button is displayed on the Tree view');
     });
-test
-    .meta({ rte: rte.standalone })('Verify that when user deletes the key he can see the key is removed from the folder, the number of keys is reduced, the percentage is recalculated', async t => {
+test('Verify that when user deletes the key he can see the key is removed from the folder, the number of keys is reduced, the percentage is recalculated', async t => {
         //Open the first key in the tree view and remove
         await t.click(browserPage.treeViewButton);
         await t.expect(browserPage.treeViewDeviceFolder.visible).ok('The key folder is displayed', { timeout: 30000 });
@@ -61,8 +63,7 @@ test
         await t.expect(browserPage.treeViewDeviceFolder.nth(2).textContent).notEql(keyFolder, 'The key folder is removed from the tree view');
         await t.expect(browserPage.treeViewDeviceKyesCount.textContent).notEql(numberOfKeys, 'The number of keys is recalculated');
     });
-test
-    .meta({ rte: rte.standalone })('Verify that user can see that “:” (colon) used as a default separator for namespaces and see the number of keys found per each namespace', async t => {
+test('Verify that user can see that “:” (colon) used as a default separator for namespaces and see the number of keys found per each namespace', async t => {
         await t.click(browserPage.treeViewButton);
         //Verify the default separator
         await t.expect(browserPage.treeViewSeparator.textContent).eql(':', 'The “:” (colon) used as a default separator for namespaces');

tests/e2e/tests/regression/workbench/workbench-re-cluster.e2e.ts

@@ -18,7 +18,7 @@ const common = new Common();
 
 const commandForSend1 = 'info';
 const commandForSend2 = 'FT._LIST';
-const verifyCommandsInWorkbench = async() => {
+const verifyCommandsInWorkbench = async(): Promise<void> => {
     const multipleCommands = [
         'info',
         'command',
@@ -55,6 +55,7 @@ test
         await verifyCommandsInWorkbench();
     });
 test
+    .meta({ rte: rte.reCloud })
     .before(async() => {
         await acceptLicenseTermsAndAddRECloudDatabase(cloudDatabaseConfig);
     })