From f2e5c6144986c91bdb74fe152c39616f5e24b743 Mon Sep 17 00:00:00 2001
From: Elena Naboko <elena.naboko@softeq.com>
Date: Thu, 23 Dec 2021 14:16:19 +0300
Subject: [PATCH 1/2] [E2E] Command indicator and context saving for Workbench
 tests added

---
 .../components/InternalPage/InternalPage.tsx   |  1 +
 tests/e2e/pageObjects/workbench-page.ts        |  6 ++++++
 .../workbench/default-scripts-area.e2e.ts      | 18 ++++++++++++++++++
 .../regression/workbench/scripting-area.e2e.ts | 13 +++++++++++++
 4 files changed, 38 insertions(+)

diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx b/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx
index 9d8b08afed..be833d1915 100644
--- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx
+++ b/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx
@@ -120,6 +120,7 @@ const InternalPage = (props: Props) => {
         </div>
       </EuiFlyoutHeader>
       <div
+        data-testid="enablement-area__page"
         ref={containerRef}
         className={cx(styles.content, 'enablement-area__page')}
         onScroll={handleScroll}
diff --git a/tests/e2e/pageObjects/workbench-page.ts b/tests/e2e/pageObjects/workbench-page.ts
index 1aa447bdc2..839ba9f248 100644
--- a/tests/e2e/pageObjects/workbench-page.ts
+++ b/tests/e2e/pageObjects/workbench-page.ts
@@ -27,6 +27,7 @@ export class WorkbenchPage {
   preselectIndexInfo: Selector
   queryColumns: Selector
   preselectSearch: Selector
+  preselectHashCreate: Selector
   preselectManual: Selector
   scriptsLines: Selector
   queryInputScriptArea: Selector
@@ -41,6 +42,7 @@ export class WorkbenchPage {
   monacoCommandDetails: Selector
   monacoCloseCommandDetails: Selector
   monacoSuggestion: Selector
+  monacoCommandIndicator: Selector
   iframe: Selector
   internalLinkWorkingWithHashes: Selector
   preselectExactSearch: Selector
@@ -52,6 +54,7 @@ export class WorkbenchPage {
   noCommandHistoryIcon: Selector
   noCommandHistoryTitle: Selector
   noCommandHistoryText: Selector
+  scrolledEnablementArea: Selector
 
   constructor() {
       //CSS selectors
@@ -77,6 +80,7 @@ export class WorkbenchPage {
       this.selectViewType = Selector('[data-testid=select-view-type]');
       this.textViewTypeOption = Selector('[data-test-subj=view-type-option-Text]');
       this.preselectList = Selector('[data-testid*=preselect-List]');
+      this.preselectHashCreate = Selector('[data-testid=preselect-Create]');
       this.preselectIndexInfo = Selector('[data-testid*=preselect-Index]');
       this.preselectSearch = Selector('[data-testid=preselect-Search]');
       this.preselectExactSearch = Selector('[data-testid="preselect-Exact text search"]');
@@ -109,6 +113,8 @@ export class WorkbenchPage {
       this.noCommandHistoryIcon = Selector ('[data-testid=wb_no-results__icon]');
       this.noCommandHistoryTitle = Selector ('[data-testid=wb_no-results__title]');
       this.noCommandHistoryText = Selector ('[data-testid=wb_no-results__summary]');
+      this.monacoCommandIndicator = Selector('div.monaco-glyph-run-command');
+      this.scrolledEnablementArea = Selector('[data-testid=enablement-area__page]')
   }
 
   /**
diff --git a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts
index d0ebb0e71d..1fc3c9f0b0 100644
--- a/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts
+++ b/tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts
@@ -54,3 +54,21 @@ test('Verify that user can see the [Manual] option in the Enablement area', asyn
         await t.expect(displayedOptions[i]).eql(optionsForCheck[i], `Option ${optionsForCheck} is in the Enablement area`);
     }
 });
+test('Verify that user can see saved article in Enablement area when he leaves Workbench page and goes back again', async t => {
+    //Open Working with Hashes section
+    await t.click(workbenchPage.internalLinkWorkingWithHashes);
+    //Check the button from Hash page is visible
+    await t.expect(workbenchPage.preselectHashCreate.visible).ok('The end of the page is visible');
+    //Go to Browser page
+    await t.click(myRedisDatabasePage.browserButton);
+    //Go back to Workbench page
+    await t.click(myRedisDatabasePage.workbenchButton);
+    //Verify that the same article is opened in Enablement area
+    await t.expect(workbenchPage.preselectHashCreate.visible).ok('The end of the page is visible');
+    //Go to list of DBs page
+    await t.click(myRedisDatabasePage.myRedisDBButton);
+    //Go back to active DB again
+    await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
+    //Check that user is on Workbench page and "Working with Hashes" page is displayed
+    await t.expect(workbenchPage.preselectHashCreate.visible).ok('The end of the page is visible');
+});
diff --git a/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts b/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts
index e5056eb99a..34c8c9f689 100644
--- a/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts
+++ b/tests/e2e/tests/regression/workbench/scripting-area.e2e.ts
@@ -1,3 +1,4 @@
+import { Selector } from 'testcafe';
 import { addNewStandaloneDatabase } from '../../../helpers/database';
 import {
     MyRedisDatabasePage,
@@ -67,3 +68,15 @@ test('Verify that user can use double slashes (//) wrapped in double quotes and
         await t.expect(resultCommand).contains(commandsForSend[commandsForSend.length - i], `The command ${commandsForSend[commandsForSend.length - i]} is in the result`);
     }
 });
+test('Verify that user can see an indication (green triangle) of commands from the left side of the line numbers', async t => {
+    //Open Working with Hashes page
+    await t.click(workbenchPage.internalLinkWorkingWithHashes);
+    //Put Create Hash commands into Editing area
+    await t.click(workbenchPage.preselectHashCreate);
+    //Maximize Scripting area to see all the commands
+    await t.drag(workbenchPage.resizeButtonForScriptingAndResults, 0, 300, { speed: 0.4 });
+    //Get number of commands in scripting area
+    const numberOfCommands = await Selector('span').withExactText('HSET').count;
+    //Compare number of indicator displayed and expected value
+    await t.expect(workbenchPage.monacoCommandIndicator.count).eql(numberOfCommands, 'Number of command indicator');
+});

From 38f5ccb5f6e8c7c6a24281016f8738e47c15fe16 Mon Sep 17 00:00:00 2001
From: Elena Naboko <elena.naboko@softeq.com>
Date: Thu, 23 Dec 2021 14:32:06 +0300
Subject: [PATCH 2/2] [E2E] Fix attribute position

---
 .../EnablementArea/components/InternalPage/InternalPage.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx b/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx
index be833d1915..46c16ea2ac 100644
--- a/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx
+++ b/redisinsight/ui/src/pages/workbench/components/enablament-area/EnablementArea/components/InternalPage/InternalPage.tsx
@@ -120,12 +120,12 @@ const InternalPage = (props: Props) => {
         </div>
       </EuiFlyoutHeader>
       <div
-        data-testid="enablement-area__page"
         ref={containerRef}
         className={cx(styles.content, 'enablement-area__page')}
         onScroll={handleScroll}
         onClick={handleClick}
         role="none"
+        data-testid="enablement-area__page"
       >
         { isLoading && <EuiLoadingContent data-testid="enablement-area__page-loader" lines={3} /> }
         { !isLoading && error && <EmptyPrompt /> }