update e2e tests

vlad-dargel · vlad-dargel · commit 529438717ba3 · 2023-09-21T12:02:45.000+02:00
diff --git a/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/MoreInfoPopover.tsx b/redisinsight/ui/src/components/database-overview/components/MoreInfoPopover/MoreInfoPopover.tsx
@@ -102,7 +102,11 @@ const MoreInfoPopover = ({ metrics, modules }: IProps) => {
           <h4 className={styles.mi_fieldName}>Modules</h4>
           {
             modules?.map(({ name = '', semanticVersion = '', version = '' }) => (
-              <div key={name} className={cx(styles.mi_moduleName)}>
+              <div
+                key={name}
+                className={cx(styles.mi_moduleName)}
+                data-testid={`${truncateText(getModule(name)?.name || DATABASE_LIST_MODULES_TEXT[name] || name, 50)}`}
+              >
                 {`${truncateText(getModule(name)?.name || DATABASE_LIST_MODULES_TEXT[name] || name, 50)} `}
                 {!!(semanticVersion || version) && (
                   <span className={styles.mi_version}>
diff --git a/tests/e2e/pageObjects/components/overview-panel.ts b/tests/e2e/pageObjects/components/overview-panel.ts
@@ -7,7 +7,7 @@ export class OverviewPanel {
     databaseModules = Selector('[data-testid$=module]');
     overviewTooltipStatTitle = Selector('[data-testid=overview-db-stat-title]');
     // BUTTONS
-    myRedisDbIcon = Selector('[data-testid=my-redis-db-icon]');
+    myRedisDBLink = Selector('[data-testid=my-redis-db-btn]', { timeout: 1000 });
     overviewRedisStackLogo = Selector('[data-testid=redis-stack-logo]');
     overviewMoreInfo = Selector('[data-testid=overview-more-info-button]');
     changeIndexBtn = Selector('[data-testid=change-index-btn]');
diff --git a/tests/e2e/tests/critical-path/browser/search-capabilities.e2e.ts b/tests/e2e/tests/critical-path/browser/search-capabilities.e2e.ts
@@ -261,7 +261,7 @@ test
     .after(async() => {
         //clear database
         await browserPage.Cli.sendCommandInCli(`FT.DROPINDEX ${indexNameBigDb}`);
-        await t.click(browserPage.OverviewPanel.myRedisDbIcon); // go back to database selection page
+        await t.click(browserPage.OverviewPanel.myRedisDBLink); // go back to database selection page
         await myRedisDatabasePage.clickOnDBByName(simpleDbName); // click standalone database
         await browserPage.Cli.sendCommandInCli(`FT.DROPINDEX ${indexNameSimpleDb}`);
         await t.click(browserPage.patternModeBtn);
@@ -290,7 +290,7 @@ test
 
         await browserPage.Cli.sendCommandsInCli(commandsForBigStandalone);
 
-        await t.click(browserPage.OverviewPanel.myRedisDbIcon); // go back to database selection page
+        await t.click(browserPage.OverviewPanel.myRedisDBLink); // go back to database selection page
         await myRedisDatabasePage.clickOnDBByName(simpleDbName); // click standalone database
 
         const commandsForStandalone = [
@@ -311,7 +311,7 @@ test
 
         await verifyKeysDisplayedInTheList(keyNames); // verify created keys are visible
 
-        await t.click(browserPage.OverviewPanel.myRedisDbIcon); // go back to database selection page
+        await t.click(browserPage.OverviewPanel.myRedisDBLink); // go back to database selection page
         await myRedisDatabasePage.clickOnDBByName(bigDbName); // click database name from ossStandaloneBigConfig.databaseName
 
         await verifyKeysNotDisplayedInTheList(keyNames); // Verify that standandalone database keys are NOT visible
diff --git a/tests/e2e/tests/critical-path/database-overview/database-overview.e2e.ts b/tests/e2e/tests/critical-path/database-overview/database-overview.e2e.ts
@@ -1,4 +1,5 @@
 import { Chance } from 'chance';
+import { Selector } from 'testcafe';
 import { DatabaseHelper } from '../../../helpers/database';
 import { rte } from '../../../helpers/constants';
 import { Common } from '../../../helpers/common';
@@ -15,6 +16,7 @@ import {
 } from '../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../helpers/api/api-database';
 
+
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const browserPage = new BrowserPage();
 const chance = new Chance();
@@ -45,35 +47,28 @@ test
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
     })('Verify that user can see the list of Modules updated each time when he connects to the database', async t => {
-        const firstDatabaseModules: string[] = [];
-        const secondDatabaseModules: string[] = [];
+        let firstDatabaseModules: string[] = [];
+        let secondDatabaseModules: string[] = [];
         //Remember modules
-        let countOfModules = await browserPage.modulesButton.count;
+        await t.click(browserPage.OverviewPanel.overviewMoreInfo);
+        const moduleIcons = Selector('div').find('[data-testid^=Redi]');
+        let countOfModules = await moduleIcons.count;
         for(let i = 0; i < countOfModules; i++) {
-            firstDatabaseModules.push(await browserPage.modulesButton.nth(i).getAttribute('data-testid'));
-        }
-        //Verify the list of modules in Browser page
-        for (const module of firstDatabaseModules) {
-            await t.expect(browserPage.OverviewPanel.databaseModules.withAttribute('aria-labelledby', module).exists).ok(`${module} is displayed in the list`);
-        }
-        //Open the Workbench page and verify modules
-        await t.click(myRedisDatabasePage.NavigationPanel.workbenchButton);
-        for (const module of firstDatabaseModules) {
-            await t.expect(browserPage.OverviewPanel.databaseModules.withAttribute('aria-labelledby', module).exists).ok(`${module} is displayed in the list`);
+            firstDatabaseModules.push(await moduleIcons.nth(i).textContent);
         }
+
+        // Verify that user can be redirected to db list page by clicking on "Databases" link in the top left corner
+        await t.click(browserPage.OverviewPanel.myRedisDBLink);
         //Add database with different modules
-        await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
         await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneRedisearch);
         await browserPage.reloadPage();
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneRedisearch.databaseName);
-        countOfModules = await browserPage.modulesButton.count;
+        await t.click(browserPage.OverviewPanel.overviewMoreInfo);
+        countOfModules = await moduleIcons.count;
         for(let i = 0; i < countOfModules; i++) {
-            secondDatabaseModules.push(await browserPage.modulesButton.nth(i).getAttribute('data-testid'));
+            secondDatabaseModules.push(await moduleIcons.nth(i).textContent);
         }
         //Verify the list of modules
-        for (const module of secondDatabaseModules) {
-            await t.expect(browserPage.OverviewPanel.databaseModules.withAttribute('aria-labelledby', module).exists).ok(`${module} is displayed in the list`);
-        }
         await t.expect(firstDatabaseModules).notEql(secondDatabaseModules, 'The list of Modules updated');
     });
 test
diff --git a/tests/e2e/tests/critical-path/database/connecting-to-the-db.e2e.ts b/tests/e2e/tests/critical-path/database/connecting-to-the-db.e2e.ts
@@ -132,13 +132,13 @@ test
         await Common.checkURLContainsText('browser');
 
         // Verify that user can add SSH tunnel with Private Key
-        await t.click(browserPage.OverviewPanel.myRedisDbIcon);
+        await t.click(browserPage.OverviewPanel.myRedisDBLink);
         await myRedisDatabasePage.AddRedisDatabase.addStandaloneSSHDatabase(sshDbPrivateKey, sshWithPrivateKey);
         await myRedisDatabasePage.clickOnDBByName(sshDbPrivateKey.databaseName);
         await Common.checkURLContainsText('browser');
 
         // Verify that user can edit SSH parameters for existing database connections
-        await t.click(browserPage.OverviewPanel.myRedisDbIcon);
+        await t.click(browserPage.OverviewPanel.myRedisDBLink);
         await myRedisDatabasePage.clickOnEditDBByName(sshDbPrivateKey.databaseName);
         await t
             .typeText(myRedisDatabasePage.AddRedisDatabase.sshPrivateKeyInput, sshWithPassphrase.sshPrivateKey, { replace: true, paste: true })
diff --git a/tests/e2e/tests/regression/database/redisstack.e2e.ts b/tests/e2e/tests/regression/database/redisstack.e2e.ts
@@ -47,14 +47,3 @@ test('Verify that user can see Redis Stack icon in Edit mode near the DB name',
     const databaseName = myRedisDatabasePage.redisStackIcon.parent().nextSibling();
     await t.expect(databaseName.withAttribute('data-testid', 'edit-alias-btn').exists).ok('Edit button not found');
 });
-test('Verify that user can see Redis Stack icon and logo in Browser page in Overview.', async t => {
-    await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
-    await t.expect(browserPage.OverviewPanel.overviewRedisStackLogo.visible).ok('Redis Stack logo not found');
-    // Open Workbench page
-    await t.click(myRedisDatabasePage.NavigationPanel.workbenchButton);
-    await t.expect(browserPage.OverviewPanel.overviewRedisStackLogo.visible).ok('Redis Stack logo not found');
-    // Check modules inside of the tooltip
-    await t.hover(browserPage.OverviewPanel.overviewRedisStackLogo);
-    await t.expect(myRedisDatabasePage.moduleTooltip.visible).ok('Tooltip with modules not found');
-    await myRedisDatabasePage.checkModulesInTooltip(moduleNameList);
-});
diff --git a/tests/e2e/tests/regression/insights/feature-flag.e2e.ts b/tests/e2e/tests/regression/insights/feature-flag.e2e.ts
@@ -84,7 +84,7 @@ test
         await t.expect(browserPage.InsightsPanel.insightsBtn.exists).ok('Insights panel not displayed when enabled from remote config');
 
         // Verify that recommendations displayed for all databases if option enabled
-        await t.click(browserPage.OverviewPanel.myRedisDbIcon);
+        await t.click(browserPage.OverviewPanel.myRedisDBLink);
         await myRedisDatabasePage.clickOnDBByName(ossStandaloneV5Config.databaseName);
         await t.expect(browserPage.InsightsPanel.insightsBtn.exists).ok('Insights panel not displayed for the other db connection');
         await browserPage.InsightsPanel.toggleInsightsPanel(true);
diff --git a/tests/e2e/tests/smoke/database/add-standalone-db.e2e.ts b/tests/e2e/tests/smoke/database/add-standalone-db.e2e.ts
@@ -71,7 +71,7 @@ test
         // Verify that telemetry event 'CONFIG_DATABASES_OPEN_DATABASE' sent and has all expected properties
         await telemetry.verifyEventHasProperties(telemetryEvent, expectedProperties, logger);
 
-        await t.click(browserPage.OverviewPanel.myRedisDbIcon);
+        await t.click(browserPage.OverviewPanel.myRedisDBLink);
         // Verify that user can't see an indicator of databases that were opened
         await myRedisDatabasePage.verifyDatabaseStatusIsNotVisible(databaseName);
 
