updates by pr comments

Author: vlad-dargel

tests/e2e/common-actions/cli-actions.ts

@@ -0,0 +1,33 @@
+import { t } from 'testcafe';
+import { CliPage } from '../pageObjects';
+
+const cliPage = new CliPage();
+
+export class CliActions {
+    
+    /**
+     * Check list of commands searched
+     * @param searchedCommand Searched command in Command Helper
+     * @param listToCompare The list with commands to compare with opened in Command Helper
+     */
+     async checkSearchedCommandInCommandHelper(searchedCommand: string, listToCompare: string[]): Promise<void> {
+        await t.typeText(cliPage.cliHelperSearch, searchedCommand, { speed: 0.5 });
+        //Verify results in the output
+        const commandsCount = await cliPage.cliHelperOutputTitles.count;
+        for (let i = 0; i < commandsCount; i++) {
+            await t.expect(cliPage.cliHelperOutputTitles.nth(i).textContent).eql(listToCompare[i], 'Results in the output contains searched value');
+        }
+    }
+
+    /**
+    * Check commands list
+    * @param listToCompare The list with commands to compare with opened in Command Helper
+    */
+    async checkCommandsInCommandHelper(listToCompare: string[]): Promise<void> {
+        //Verify results in the output
+        const commandsCount = await cliPage.cliHelperOutputTitles.count;
+        for (let i = 0; i < commandsCount; i++) {
+            await t.expect(cliPage.cliHelperOutputTitles.nth(i).textContent).eql(listToCompare[i], 'Results in the output not contain searched value');
+        }
+    }
+}

tests/e2e/pageObjects/cli-page.ts

@@ -128,30 +128,4 @@ export class CliPage {
         await t.click(this.readMoreButton);
         await t.expect(getPageUrl()).eql(url, 'The opened page');
     }
-
-    /**
-     * Check list of commands searched
-     * @param searchedCommand Searched command in Command Helper
-     * @param listToCompare The list with commands to compare with opened in Command Helper
-     */
-    async checkSearchedCommandInCommandHelper(searchedCommand: string, listToCompare: string[]): Promise<void> {
-        await t.typeText(this.cliHelperSearch, searchedCommand, { speed: 0.5 });
-        //Verify results in the output
-        const commandsCount = await this.cliHelperOutputTitles.count;
-        for (let i = 0; i < commandsCount; i++) {
-            await t.expect(this.cliHelperOutputTitles.nth(i).textContent).eql(listToCompare[i], 'Results in the output contains searched value');
-        }
-    }
-
-    /**
-    * Check commands list
-    * @param listToCompare The list with commands to compare with opened in Command Helper
-    */
-    async checkCommandsInCommandHelper(listToCompare: string[]): Promise<void> {
-        //Verify results in the output
-        const commandsCount = await this.cliHelperOutputTitles.count;
-        for (let i = 0; i < commandsCount; i++) {
-            await t.expect(this.cliHelperOutputTitles.nth(i).textContent).eql(listToCompare[i], 'Results in the output not contain searched value');
-        }
-    }
 }

tests/e2e/tests/critical-path/cli/cli-command-helper.e2e.ts

@@ -3,8 +3,10 @@ import { acceptLicenseTermsAndAddDatabaseApi } from '../../../helpers/database';
 import { CliPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
 import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
+import { CliActions } from '../../../common-actions/cli-actions';
 
 const cliPage = new CliPage();
+const cliActions = new CliActions();
 
 const defaultHelperText = 'Enter any command in CLI or use search to see detailed information.';
 const COMMAND_APPEND = 'APPEND';
@@ -123,7 +125,7 @@ test
         //Unselect group from list
         await cliPage.selectFilterGroupType(COMMAND_GROUP_TIMESERIES);
         //Search per part of command and check all opened commands
-        await cliPage.checkSearchedCommandInCommandHelper(commandForSearch, timeSeriesCommands);
+        await cliActions.checkSearchedCommandInCommandHelper(commandForSearch, timeSeriesCommands);
         //Check the first command documentation url
         await cliPage.checkURLCommand(timeSeriesCommands[0], `https://redis.io/commands/${timeSeriesCommands[0].toLowerCase()}/`);
         await t.switchToParentWindow();
@@ -144,7 +146,7 @@ test
         //Unselect group from list
         await cliPage.selectFilterGroupType(COMMAND_GROUP_GRAPH);
         //Search per part of command and check all opened commands
-        await cliPage.checkSearchedCommandInCommandHelper(commandForSearch, graphCommands);
+        await cliActions.checkSearchedCommandInCommandHelper(commandForSearch, graphCommands);
         //Check the first command documentation url
         await cliPage.checkURLCommand(graphCommands[0], externalPageLink);
         await t.switchToParentWindow();

tests/e2e/tests/regression/cli/cli-command-helper.e2e.ts

@@ -8,9 +8,11 @@ import {
 } from '../../../helpers/conf';
 import { env, rte } from '../../../helpers/constants';
 import { deleteStandaloneDatabaseApi } from '../../../helpers/api/api-database';
+import { CliActions } from '../../../common-actions/cli-actions';
 
 const cliPage = new CliPage();
 const common = new Common();
+const cliActions = new CliActions();
 let filteringGroup = '';
 let filteringGroups: string[] = [];
 let commandToCheck = '';
@@ -268,6 +270,6 @@ test
         // Click return button
         await t.click(cliPage.returnToList);
         // Check that user returned to list with filter and search applied
-        await cliPage.checkCommandsInCommandHelper(filteredCommands);
+        await cliActions.checkCommandsInCommandHelper(filteredCommands);
         await t.expect(cliPage.returnToList.exists).notOk('Return to list button still displayed');
     });