Merge pull request #2947 from RedisInsight/e2e/feature/RI-5256_rename-recommendations

E2e/feature/ri 5256 rename recommendations

Author: mariasergeenko

tests/e2e/helpers/constants.ts

@@ -77,7 +77,7 @@ export enum ResourcePath {
 }
 
 export enum ExploreTabs {
-    Explore  = 'Explore Redis',
-    Recommendations = 'Redis Tips',
+    Explore  = 'Explore',
+    Tips = 'Tips',
 }
 

tests/e2e/pageObjects/components/insights-panel.ts

@@ -36,7 +36,7 @@ export class InsightsPanel {
      * @param type of the tab
      */
     async setActiveTab(type: ExploreTabs.Explore): Promise<ExploreTab>
-    async setActiveTab(type: ExploreTabs.Recommendations): Promise<RecommendationsTab>
+    async setActiveTab(type: ExploreTabs.Tips): Promise<RecommendationsTab>
     async setActiveTab(type: ExploreTabs): Promise<ExploreTab | RecommendationsTab> {
         if(type === ExploreTabs.Explore) {
             await t.click(this.exploreTab);
@@ -51,7 +51,7 @@ export class InsightsPanel {
      * Get Insights panel selector
      */
     getInsightsPanel(): Selector {
-        return Selector('[class=euiButton__text]').withExactText(ExploreTabs.Recommendations);
+        return Selector('[class=euiButton__text]').withExactText(ExploreTabs.Tips);
     }
 
 }

tests/e2e/tests/web/critical-path/memory-efficiency/memory-efficiency.e2e.ts

@@ -45,7 +45,7 @@ test
     })('No reports/keys message and report tooltip', async t => {
         const noReportsMessage = 'No Reports foundRun "New Analysis" to generate first report.';
         const noKeysMessage = 'No keys to displayUse Workbench Guides and Tutorials to quickly load the data.';
-        const tooltipText = 'Analyze up to 10 000 keys to get an overview of your data and recommendations';
+        const tooltipText = 'Analyze up to 10 000 keys to get an overview of your data and tips';
 
         // Verify that user can see the “No reports found” message when report wasn't generated
         await t.expect(memoryEfficiencyPage.noReportsText.textContent).eql(noReportsMessage, 'No reports message not displayed or text is invalid');

tests/e2e/tests/web/regression/insights/feature-flag.e2e.ts

@@ -89,7 +89,7 @@ test
         await browserPage.InsightsPanel.togglePanel(true);
         await t.expect(browserPage.InsightsPanel.getInsightsPanel().exists).ok('Insights panel not displayed for the other db connection');
         await browserPage.InsightsPanel.togglePanel(true);
-        const tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+        const tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
         await t.expect(tab.getRecommendationByName(redisVersionRecom).exists).ok('Redis Version recommendation not displayed');
 
         await browserPage.InsightsPanel.togglePanel(false);

tests/e2e/tests/web/regression/insights/import-tutorials.e2e.ts

@@ -114,7 +114,14 @@ test
             .notOk(`${tutorialName} tutorial is not uploaded`);
     });
 // https://redislabs.atlassian.net/browse/RI-4186, https://redislabs.atlassian.net/browse/RI-4213, https://redislabs.atlassian.net/browse/RI-4302
-test('Verify that user can upload tutorial with URL with manifest.json', async t => {
+test.after(async() => {
+    tutorialName = 'Tutorials with manifest';
+    const tutorials = await workbenchPage.InsightsPanel.setActiveTab(ExploreTabs.Explore);
+    if(await tutorials.tutorialAccordionButton.withText(tutorialName).exists) {
+        await tutorials.deleteTutorialByName(tutorialName);
+    }
+    await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
+})('Verify that user can upload tutorial with URL with manifest.json', async t => {
     const labelFromManifest = 'Working with JSON label';
     const link = 'https://drive.google.com/u/2/uc?id=1a45zHZGYYvtKgM83Rff6rfjy1yfWiwHt&export=download';
     internalLinkName1 = 'manifest-id';

tests/e2e/tests/web/regression/insights/live-recommendations.e2e.ts

@@ -27,7 +27,7 @@ const databasesForAdding = [
 const tenSecondsTimeout = 10000;
 const keyName = `recomKey-${Common.generateWord(10)}`;
 const logger = telemetry.createLogger();
-const telemetryEvent = 'INSIGHTS_RECOMMENDATION_VOTED';
+const telemetryEvent = 'INSIGHTS_TIPS_VOTED';
 const expectedProperties = [
     'buildType',
     'databaseId',
@@ -83,10 +83,10 @@ test
     })('Verify Insights panel Recommendations displaying', async t => {
         await browserPage.InsightsPanel.togglePanel(true);
         // Verify that "Welcome to recommendations" panel displayed when there are no recommendations
-        let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+        let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
         await t
-            .expect(tab.noRecommendationsScreen.exists).ok('No recommendations panel not displayed')
-            .expect(tab.noRecommendationsScreen.textContent).contains('Welcome toRecommendations', 'Welcome to recommendations text not displayed');
+            .expect(tab.noRecommendationsScreen.exists).ok('No tips panel not displayed')
+            .expect(tab.noRecommendationsScreen.textContent).contains('Welcome toTips!', 'Welcome to recommendations text not displayed');
 
         await browserPage.InsightsPanel.togglePanel(false);
         // Go to 2nd database
@@ -95,7 +95,7 @@ test
         await browserPage.InsightsPanel.togglePanel(true);
         // Verify that live recommendations displayed for each database separately
         // Verify that user can see the live recommendation "Update Redis database" when Redis database is less than 6.0 highlighted as RedisStack
-        tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+        tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
         await t
             .expect(await tab.getRecommendationByName(redisVersionRecom).visible).ok('Redis Version recommendation not displayed')
             .expect(await tab.getRecommendationByName(redisTimeSeriesRecom).visible).notOk('Optimize Time Series recommendation displayed');
@@ -106,7 +106,7 @@ test
         // Verify that the list of recommendations updated every 10 seconds
         await t.wait(tenSecondsTimeout);
         await browserPage.InsightsPanel.togglePanel(true);
-        tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+        tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
         // Verify that user can see the live recommendation "Optimize the use of time series"
         await t.expect(await tab.getRecommendationByName(redisTimeSeriesRecom).visible).ok('Optimize Time Series recommendation not displayed');
     });
@@ -127,7 +127,7 @@ test
         const notUsefulVoteOption = 'not useful';
         const usefulVoteOption = 'useful';
         await browserPage.InsightsPanel.togglePanel(true);
-        await t.expect(await browserPage.InsightsPanel.getActiveTabName()).contains(ExploreTabs.Recommendations);
+        await t.expect(await browserPage.InsightsPanel.getActiveTabName()).contains(ExploreTabs.Tips);
         await recommendationsActions.voteForRecommendation(redisVersionRecom, notUsefulVoteOption);
         // Verify that user can rate recommendations with one of 2 existing types at the same time
         await recommendationsActions.verifyVoteIsSelected(redisVersionRecom, notUsefulVoteOption);
@@ -143,7 +143,7 @@ test
         // Verify that user can see previous votes when reload the page
         await browserPage.reloadPage();
         await browserPage.InsightsPanel.togglePanel(true);
-        const tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+        const tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
         await tab.toggleRecommendation(redisVersionRecom, true);
         await recommendationsActions.verifyVoteIsSelected(redisVersionRecom, notUsefulVoteOption);
 
@@ -157,10 +157,10 @@ test('Verify that user can hide recommendations and checkbox value is saved', as
     await browserPage.Cli.sendCommandInCli(commandToGetRecommendation);
 
     await browserPage.InsightsPanel.togglePanel(true);
-    let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+    let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
     await t.click(browserPage.InsightsPanel.closeButton);
     await browserPage.InsightsPanel.togglePanel(true);
-    await t.expect(await browserPage.InsightsPanel.getActiveTabName()).eql(ExploreTabs.Recommendations);
+    await t.expect(await browserPage.InsightsPanel.getActiveTabName()).eql(ExploreTabs.Tips);
     await tab.toggleShowHiddenRecommendations(false);
     await tab.hideRecommendation(searchVisualizationRecom);
     await t.expect(await tab.getRecommendationByName(searchVisualizationRecom).exists)
@@ -169,7 +169,7 @@ test('Verify that user can hide recommendations and checkbox value is saved', as
     // check recommendation state is saved after reload
     await browserPage.reloadPage();
     await browserPage.InsightsPanel.togglePanel(true);
-    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
     await t.expect(await tab.getRecommendationByName(searchVisualizationRecom).exists)
         .notOk('recommendation is displayed when show hide recommendation is unchecked');
 
@@ -179,7 +179,7 @@ test('Verify that user can hide recommendations and checkbox value is saved', as
         .ok('recommendation is not displayed when show hide recommendation is checked');
     await browserPage.reloadPage();
     await browserPage.InsightsPanel.togglePanel(true);
-    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
     await t.expect(await tab.getRecommendationByName(searchVisualizationRecom).visible)
         .ok('recommendation is not displayed when show hide recommendation is checked');
 });
@@ -188,18 +188,18 @@ test('Verify that user can snooze recommendation', async t => {
     await browserPage.Cli.sendCommandInCli(commandToGetRecommendation);
 
     await browserPage.InsightsPanel.togglePanel(true);
-    let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+    let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
     await tab.snoozeRecommendation(searchVisualizationRecom);
 
     await browserPage.reloadPage();
     await browserPage.InsightsPanel.togglePanel(true);
-    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
     await t.expect(await tab.getRecommendationByName(searchVisualizationRecom).visible)
         .notOk('recommendation is displayed when after snoozing');
     await browserPage.InsightsPanel.togglePanel(false);
     await browserPage.Cli.sendCommandInCli(commandToGetRecommendation);
     await browserPage.InsightsPanel.togglePanel(true);
-    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
     await t.expect(await tab.getRecommendationByName(searchVisualizationRecom).visible).ok('recommendation is not displayed again');
 });
 test
@@ -217,7 +217,7 @@ test
     })('Verify that recommendations from database analysis are displayed in Insight panel above live recommendations', async t => {
 
         await browserPage.InsightsPanel.togglePanel(true);
-        let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+        let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
         const redisVersionRecommendationSelector = tab.getRecommendationByName(redisVersionRecom);
         // Verify that live recommendation displayed in Insights panel
         await t.expect(await tab.getRecommendationByName(redisVersionRecom).visible).ok(`${redisVersionRecom} recommendation not displayed`);
@@ -228,7 +228,7 @@ test
         await t.click(myRedisDatabasePage.NavigationPanel.analysisPageButton);
         await t.click(memoryEfficiencyPage.newReportBtn);
         await browserPage.InsightsPanel.togglePanel(true);
-        tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+        tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
         // Verify that recommendations are synchronized
         await t.expect(await tab.getRecommendationByName(setPasswordRecom).visible).ok('Recommendations are not synchronized');
         // Verify that duplicates are not displayed
@@ -237,15 +237,15 @@ test
 //https://redislabs.atlassian.net/browse/RI-4413
 test('Verify that if user clicks on the Analyze button and link, the pop up with analyze button is displayed and new report is generated', async t => {
     await browserPage.InsightsPanel.togglePanel(true);
-    let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+    let tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
     await t.click(tab.analyzeDatabaseButton);
     await t.click(tab.analyzeTooltipButton);
     //Verify that user is navigated to DB Analysis page via Analyze button and new report is generated
     await t.click(memoryEfficiencyPage.selectedReport);
     await t.expect(memoryEfficiencyPage.reportItem.visible).ok('Database analysis page not opened');
     await t.click(memoryEfficiencyPage.NavigationPanel.workbenchButton);
     await workbenchPage.InsightsPanel.togglePanel(true);
-    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+    tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
     await t.click(tab.analyzeDatabaseLink);
     await t.click(tab.analyzeTooltipButton);
     //Verify that user is navigated to DB Analysis page via Analyze link and new report is generated
@@ -263,7 +263,7 @@ test
         await browserPage.Cli.sendCommandInCli(cliCommand);
         await t.click(browserPage.refreshKeysButton);
         await browserPage.InsightsPanel.togglePanel(true);
-        const tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+        const tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
         let keyNameFromRecommendation = await tab.getRecommendationByName(RecommendationIds.searchJson)
             .find(tab.cssKeyName)
             .innerText;

tests/e2e/tests/web/regression/insights/open-insights-panel.e2e.ts

@@ -24,7 +24,7 @@ test('Verify Explore redis tab is opened from empty screens', async t => {
     await t.click(browserPage.openTutorialsBtn);
     await t.expect(browserPage.InsightsPanel.sidePanel.exists).ok('the panel is opened');
     await t.expect(await browserPage.InsightsPanel.getActiveTabName()).eql(ExploreTabs.Explore);
-    await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Recommendations);
+    await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
     await browserPage.InsightsPanel.togglePanel(false);
     await t.click(browserPage.NavigationPanel.workbenchButton);
     await t.click(workbenchPage.exploreRedisBtn);

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

@@ -39,11 +39,12 @@ test
         // Delete database
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
     })('Verify that user can see message "No keys to display." when there are no keys in the database', async t => {
-        const message = 'No Keys Found\nCreate your first key to get started\nKeys are the foundation of Redis. Create your first key to start exploring Redis and Redis Stack capabilities';
-
+        const message = 'NoKeystoDisplayCreateyourfirstkeytogetstartedKeysarethefoundationofRedis.CreateyourfirstkeyortryourinteractiveTutorialstolearnhowRediscansolveyourusecases.+KeyorExplore';
+        const actualMessage = await browserPage.keyListMessage.innerText;
+        const cleanMessage = actualMessage.replace(/[\s\n]+/g, '');
         // Verify the message
         await t.click(browserPage.treeViewButton);
-        await t.expect(browserPage.keyListMessage.innerText).contains(message, 'The message is not displayed');
+        await t.expect(cleanMessage).contains(message, 'The message is not displayed');
         await t.expect(browserPage.guideLinksBtn.count).gte(5);
         await browserPage.clickGuideLinksByName('JSON');
         await t.expect(workbenchPage.queryInput.visible).ok('Workbench page is not opened');