fixes

Author: vlad-dargel

tests/e2e/helpers/common.ts

@@ -1,9 +1,9 @@
 import * as path from 'path';
 import * as fs from 'fs';
-import * as archiver from 'archiver';
 import { ClientFunction, RequestMock, t } from 'testcafe';
 import { Chance } from 'chance';
 import { apiUrl, commonUrl } from './conf';
+const archiver = require('archiver');
 
 const chance = new Chance();
 

tests/e2e/pageObjects/workbench-page.ts

@@ -36,6 +36,7 @@ export class WorkbenchPage extends InstancePage {
     preselectCreateHashIndex = Selector('[data-testid="preselect-Create a hash index"]');
     preselectGroupBy = Selector('[data-testid*=preselect-Group]');
     preselectButtons = Selector('[data-testid^=preselect-]');
+    copyBtn = Selector('[data-testid^=copy-btn-]');
     reRunCommandButton = Selector('[data-testid=re-run-command]');
     preselectManual = Selector('[data-testid=preselect-Manual]');
     fullScreenButton = Selector('[data-testid=toggle-full-screen]');

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

@@ -89,28 +89,19 @@ test
             .eql(expandedTextContaiterSize, 'Lua script recommendation not expanded');
     });
 // skipped due to inability to receive no recommendations for now
-test
-.before(async() => {
-    await databaseHelper.acceptLicenseTerms();
-    // Add Sentinel databases
-    await databaseAPIRequests.discoverSentinelDatabaseApi(ossSentinelConfig);
-    await myRedisDatabasePage.reloadPage();
-})
-.after(async() => {
-    // Delete all primary groups
-    await databaseAPIRequests.deleteAllDatabasesByConnectionTypeApi('SENTINEL');
-    await myRedisDatabasePage.reloadPage();
-})
-.meta({ rte: rte.sentinel })('No recommendations message', async t => {
+test.skip('No recommendations message', async t => {
     keyName = `recomKey-${Common.generateWord(10)}`;
-    const noRecommendationsMessage = 'No recommendations at the moment, run a new report later to keep up the good work!';
+    const noRecommendationsMessage = 'No Tips at the moment,keep up the good work!';
     const command = `HSET ${keyName} field value`;
 
     // Create Hash key and create report
     await browserPage.Cli.sendCommandInCli(command);
+    // Go to Analysis Tools page
+    await t.click(myRedisDatabasePage.NavigationPanel.analysisPageButton);
     await t.click(memoryEfficiencyPage.newReportBtn);
     // Go to Recommendations tab
     await t.click(memoryEfficiencyPage.recommendationsTab);
+    await t.debug()
     // No recommendations message
     await t.expect(memoryEfficiencyPage.noRecommendationsMessage.textContent).eql(noRecommendationsMessage, 'No recommendations message not displayed');
 });
@@ -203,7 +194,6 @@ test
         // Verify that tutorial opened
         await t.click(memoryEfficiencyPage.getToTutorialBtnByRecomName(searchJsonRecommendation));
         await workbenchPage.InsightsPanel.togglePanel(true);
-        await t.expect(await workbenchPage.InsightsPanel.getActiveTabName()).eql(ExploreTabs.Tutorials);
         const tutorial = await workbenchPage.InsightsPanel.setActiveTab(ExploreTabs.Tutorials);
         await t.expect(tutorial.preselectArea.visible).ok('Workbench Enablement area not opened');
         // Verify that REDIS FOR TIME SERIES tutorial expanded

tests/e2e/tests/web/regression/workbench/default-scripts-area.e2e.ts

@@ -82,28 +82,26 @@ test('Verify that user can see saved article in Enablement area when he leaves W
     selector = tutorials.getRunSelector('Create a hash');
     await t.expect(selector.visible).ok('The end of the page is not visible');
 });
-//skipped due the issue RI-2384
 test('Verify that user can see saved scroll position in Enablement area when he leaves Workbench page and goes back again', async t => {
     // Open Working with Hashes section
     await workbenchPage.InsightsPanel.togglePanel(true);
     const tutorials = await workbenchPage.InsightsPanel.setActiveTab(ExploreTabs.Tutorials);
     await t.click(tutorials.dataStructureAccordionTutorialButton);
     await t.click(tutorials.internalLinkWorkingWithHashes);
     // Evaluate the last button in Enablement Area
-    const buttonsQuantity = await workbenchPage.preselectButtons.count;
-    const lastButton = workbenchPage.preselectButtons.nth(buttonsQuantity - 1);
+    const buttonsQuantity = await workbenchPage.copyBtn.count;
+    const lastButton = workbenchPage.copyBtn.nth(buttonsQuantity - 1);
     // Scroll to the very bottom of the page
     await t.scrollIntoView(lastButton);
+    await workbenchPage.InsightsPanel.togglePanel(false);
+    await workbenchPage.InsightsPanel.togglePanel(true);
     // Check the scroll position
     const scrollPosition = await workbenchPage.scrolledEnablementArea.scrollTop;
-    // Go to Browser page
-    await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
-    // Go back to Workbench page
-    await t.click(myRedisDatabasePage.NavigationPanel.workbenchButton);
     // Check that scroll position is saved
     await t.expect(await workbenchPage.scrolledEnablementArea.scrollTop).eql(scrollPosition, 'The scroll position status is incorrect');
     // Go to list of DBs page
     await t.click(myRedisDatabasePage.NavigationPanel.myRedisDBButton);
+    await t.wait(1000)
     // Go back to active DB again
     await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
     // Check that scroll position is saved