Update .circleci and refactor code

Author: nmammadli

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

@@ -1,16 +1,42 @@
-import {t} from 'testcafe';
+import {t, Selector} from 'testcafe';
 import { WorkbenchPage } from '../pageObjects';
 
 const workbenchPage = new WorkbenchPage();
 
 export class WorkbenchActions {
-    /*
+    /**
         Verify after client list command columns are visible
+        @param columns List of columns to verify
     */
-    async verifyClientListColumnsAreVisible(): Promise<void> {
-        await t.expect(workbenchPage.clientListTableHeaderCellId.visible).ok('id column is not visible');
-        await t.expect(workbenchPage.clientListTableHeaderCellAddr.visible).ok('addr column is not visible');
-        await t.expect(workbenchPage.clientListTableHeaderCellName.visible).ok('name column is not visible');
-        await t.expect(workbenchPage.clientListTableHeaderCellUser.visible).ok('user column is not visible');
+    async verifyClientListColumnsAreVisible(columns: string[]): Promise<void> {
+        await t.switchToIframe(workbenchPage.iframe);
+        for (const column of columns) {
+            const columnSelector = Selector(`[data-test-subj^=tableHeaderCell_${column}_]`);
+            await t.expect(columnSelector.visible).ok(`${column} column is not visible`);
+        }
+        await t.switchToMainWindow();
+    }
+    /**
+        Verify after `client list` command table rows are expected count
+    */
+    async verifyClientListTableViewRowCount(): Promise<void>{
+        await t.click(workbenchPage.selectViewType)
+            .click(workbenchPage.viewTypeOptionsText);
+        // get number of rows from text view
+        const numberOfRowsInTextView = await Selector('[data-testid^=row-]').count - 1;
+        // select client list table view
+        await t.click(workbenchPage.selectViewType)
+            .click(workbenchPage.viewTypeOptionClientList);
+        await t.switchToIframe(workbenchPage.iframe);
+        await t.expect(Selector('tbody tr').count).eql(numberOfRowsInTextView);
+    }
+    /**
+        Verify error message after `client list` command if there is no permission to run
+     */
+    async verifyClientListErrorMessage(): Promise<void>{
+        await t.switchToIframe(workbenchPage.iframe);
+        await t.expect(Selector('div').withText('NOPERM this user has no permissions to run the \'client\' command or its subcommand').visible)
+            .ok('NOPERM error message is not displayed');
+        await t.switchToMainWindow();
     }
 }

tests/e2e/pageObjects/workbench-page.ts

@@ -141,10 +141,8 @@ export class WorkbenchPage {
     tableViewTypeOption = Selector('[data-test-subj^=view-type-option-Plugin]');
     graphViewTypeOption = Selector('[data-test-subj^=view-type-option-Plugin-graph]');
     typeSelectedClientsList = Selector('[data-testid=view-type-selected-Plugin-client-list__clients-list]');
-    clientListTableHeaderCellId = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_id_/);
-    clientListTableHeaderCellAddr = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_addr_/);
-    clientListTableHeaderCellName = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_name_/);
-    clientListTableHeaderCellUser = Selector('[data-test-subj]').withAttribute('data-test-subj', /^tableHeaderCell_user_/);
+    viewTypeOptionClientList = Selector('[data-test-subj=view-type-option-Plugin-client-list__clients-list]');
+    viewTypeOptionsText = Selector('[data-test-subj=view-type-option-Text-default__Text]');
     /**
      * Get card container by command
      * @param command The command

tests/e2e/tests/regression/monitor/monitor.e2e.ts

@@ -5,7 +5,7 @@ import {
     MonitorPage,
     SettingsPage,
     BrowserPage,
-    CliPage
+    CliPage, WorkbenchPage
 } from '../../../pageObjects';
 import {
     commonUrl,
@@ -16,6 +16,7 @@ import {
 import { rte } from '../../../helpers/constants';
 import { addNewStandaloneDatabaseApi, deleteStandaloneDatabaseApi, deleteStandaloneDatabasesApi } from '../../../helpers/api/api-database';
 import { Common } from '../../../helpers/common';
+import {WorkbenchActions} from '../../../common-actions/workbench-actions';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
 const monitorPage = new MonitorPage();
@@ -24,6 +25,8 @@ const browserPage = new BrowserPage();
 const cliPage = new CliPage();
 const chance = new Chance();
 const common = new Common();
+const workbenchPage = new WorkbenchPage();
+const workbencActions = new WorkbenchActions();
 
 fixture `Monitor`
     .meta({ type: 'regression', rte: rte.standalone })
@@ -115,11 +118,11 @@ test
             await t.expect(previousTimestamp).notEql(nextTimestamp, 'Monitor results not correct');
         }
     });
-    // Skipped due to redis issue https://redislabs.atlassian.net/browse/RI-4111
+// Skipped due to redis issue https://redislabs.atlassian.net/browse/RI-4111
 test.skip
     .before(async t => {
         await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig, ossStandaloneConfig.databaseName);
-        await cliPage.sendCommandInCli('acl setuser noperm nopass on +@all ~* -monitor');
+        await cliPage.sendCommandInCli('acl setuser noperm nopass on +@all ~* -monitor -client');
         // Check command result in CLI
         await t.click(cliPage.cliExpandButton);
         await t.expect(cliPage.cliOutputResponseSuccess.textContent).eql('"OK"', 'Command from autocomplete was not found & executed');
@@ -137,6 +140,7 @@ test.skip
         // Delete database
         await deleteStandaloneDatabasesApi([ossStandaloneConfig, ossStandaloneNoPermissionsConfig]);
     })('Verify that if user doesn\'t have permissions to run monitor, user can see error message', async t => {
+        const command = 'CLIENT LIST';
         // Expand the Profiler
         await t.click(monitorPage.expandMonitor);
         // Click on run monitor button
@@ -147,4 +151,8 @@ test.skip
         await t.expect(monitorPage.monitorNoPermissionsMessage.innerText).eql('The Profiler cannot be started. This user has no permissions to run the \'monitor\' command', 'No Permissions message not found');
         // Verify that if user doesn't have permissions to run monitor, run monitor button is not available
         await t.expect(monitorPage.runMonitorToggle.withAttribute('disabled').exists).ok('No permissions run icon not found');
+        await t.click(myRedisDatabasePage.workbenchButton);
+        await workbenchPage.sendCommandInWorkbench(command);
+        // Verify that user have the following error when there is no permission to run the CLIENT LIST: "NOPERM this user has no permissions to run the 'CLIENT LIST' command or its subcommand"
+        await workbencActions.verifyClientListErrorMessage();
     });

tests/e2e/tests/regression/workbench/command-results.e2e.ts

@@ -119,19 +119,18 @@ test('Big output in workbench is visible in virtualized table', async t => {
     await t.expect(lastExpectedItem.visible).ok('Final execution time message not displayed');
 });
 
-test.before(async t => {
+test.only.before(async t => {
     await acceptLicenseTermsAndAddDatabaseApi(ossStandaloneRedisearch, ossStandaloneRedisearch.databaseName);
-    // Add index and data
     await t.click(myRedisDatabasePage.workbenchButton);
 }).after(async t => {
     await t.switchToMainWindow();
     await deleteStandaloneDatabaseApi(ossStandaloneRedisearch);
-})('verify client list plugin shows table', async t => {
+})('Verify that user can see the client List visualization available for all users', async t => {
     const command = 'CLIENT LIST';
     // Send command in workbench to view client list
     await workbenchPage.sendCommandInWorkbench(command);
     await t.expect(workbenchPage.typeSelectedClientsList.visible).ok('client list view button is not visible');
-    await t.switchToIframe(workbenchPage.iframe);
-    // Verify that I can see the client List visualization available for all users.
-    await workBenchActions.verifyClientListColumnsAreVisible();
+    await workBenchActions.verifyClientListColumnsAreVisible(['id', 'addr', 'name', 'user']);
+    // verify table view row count match with text view after client list command
+    await workBenchActions.verifyClientListTableViewRowCount();
 });