Merge pull request #3953 from RedisInsight/e2e/feature/RI-6151_add-autocompletion-to-workbench

E2e/feature/ri 6151 add autocompletion to workbench

Author: vlad-dargel

tests/e2e/pageObjects/workbench-page.ts

@@ -113,6 +113,7 @@ export class WorkbenchPage extends InstancePage {
         for (const command of commands) {
             await t
                 .typeText(this.queryInput, command, { replace: false, speed: 1, paste: true })
+                .pressKey('esc')
                 .pressKey('enter');
         }
         await t.click(this.submitCommandButton);
@@ -195,6 +196,7 @@ export class WorkbenchPage extends InstancePage {
         await t.typeText(this.queryInput, value, { replace: false });
         // Select query option into autosuggest and go out of quotes
         await t.pressKey('tab');
+        await t.pressKey('tab');
         await t.pressKey('right');
         await t.pressKey('space');
     }

tests/e2e/tests/web/critical-path/workbench/autocomplete.e2e.ts

@@ -36,15 +36,15 @@ test('Verify that when user have selected a command (via “Enter” from the li
     await t.pressKey('enter');
     const script = await workbenchPage.queryInputScriptArea.textContent;
     // Verify that user can select a command from the list with auto-suggestions when type in any character in the Editor
-    await t.expect(script.replace(/\s/g, ' ')).contains('LINDEX ', 'Result of sent command exists');
+    await t.expect(script.replace(/\s/g, ' ')).eql('LINDEX ', 'Result of sent command not exists');
 
-    // Check the required arguments inserted
+    // Check the required arguments suggested
     for (const argument of commandArguments) {
-        await t.expect(script).contains(argument, `The required argument ${argument} is inserted`);
+        await t.expect(workbenchPage.MonacoEditor.monacoHintWithArguments.textContent).contains(argument, `The required argument ${argument} is not suggested`);
     }
 });
 test('Verify that user can change any required argument inserted', async t => {
-    const command = 'HMGET';
+    const command = 'HMGE';
     const commandArguments = [
         'key',
         'field'
@@ -54,7 +54,7 @@ test('Verify that user can change any required argument inserted', async t => {
         'secondArgument'
     ];
 
-    // Select command via Enter
+    // Select HMGET command via Enter
     await t.typeText(workbenchPage.queryInput, command, { replace: true });
     await t.pressKey('enter');
     // Change required arguments
@@ -68,15 +68,18 @@ test('Verify that user can change any required argument inserted', async t => {
     await t.expect(scriptAfterEdit).notContains(commandArguments[0], `The argument ${commandArguments[0]} is not changed`);
 });
 test('Verify that the list of optional arguments will not be inserted with autocomplete', async t => {
-    const command = 'ZPOPMAX';
+    const command = 'ZPOPMA';
     const commandRequiredArgument = 'key';
-    const commandOptionalArgument = 'count';
+    const commandOptionalArgument = '[count]';
 
-    // Select command via Enter
+    // Select ZPOPMAX command via Enter
     await t.typeText(workbenchPage.queryInput, command, { replace: true });
     await t.pressKey('enter');
     // Verify the command arguments inserted
     const script = await workbenchPage.queryInputScriptArea.textContent;
-    await t.expect(script).contains(commandRequiredArgument, 'The required argument is inserted');
-    await t.expect(script).notContains(commandOptionalArgument, 'The optional argument is not inserted');
+    await t.expect(script.replace(/\s/g, ' ')).eql('ZPOPMAX ', 'Result of sent command not exists');
+
+    // Check the required and optional arguments suggested
+    await t.expect(workbenchPage.MonacoEditor.monacoHintWithArguments.textContent).contains(commandRequiredArgument, `The required argument is not suggested`);
+    await t.expect(workbenchPage.MonacoEditor.monacoHintWithArguments.textContent).contains(commandOptionalArgument, `The optional argument is not suggested in blocks`);
 });

tests/e2e/tests/web/critical-path/workbench/command-results.e2e.ts

@@ -175,7 +175,8 @@ test
         await t
             .click(workbenchPage.queryInput)
             .pressKey('ctrl+a')
-            .pressKey('delete');
+            .pressKey('delete')
+            .pressKey('esc');
         // Verify the quick access to command history by up button
         for (const command of commands.reverse()) {
             await t.pressKey('up');

tests/e2e/tests/web/critical-path/workbench/scripting-area.e2e.ts

@@ -112,9 +112,9 @@ test('Verify that user can run one command in multiple lines in Workbench page',
         'ON HASH PREFIX 1 product:',
         'SCHEMA price NUMERIC SORTABLE'
     ];
-        //Send command in multiple lines
+    // Send command in multiple lines
     await workbenchPage.sendCommandInWorkbench(multipleLinesCommand.join('\n\t'), 0.5);
-    //Check the result
+    // Check the result
     const resultCommand = await workbenchPage.queryCardCommand.nth(0).textContent;
     for(const commandPart of multipleLinesCommand) {
         await t.expect(resultCommand).contains(commandPart, 'The multiple lines command is in the result');
@@ -126,12 +126,12 @@ test('Verify that user can use one indent to indicate command in several lines i
         `FT.CREATE ${indexName}`,
         'ON HASH PREFIX 1 product: SCHEMA price NUMERIC SORTABLE'
     ];
-        //Send command in multiple lines
+    // Send command in multiple lines
     await t.typeText(workbenchPage.queryInput, multipleLinesCommand[0]);
-    await t.pressKey('enter tab');
+    await t.pressKey('enter esc tab');
     await t.typeText(workbenchPage.queryInput, multipleLinesCommand[1]);
     await t.click(workbenchPage.submitCommandButton);
-    //Check the result
+    // Check the result
     const resultCommand = await workbenchPage.queryCardCommand.nth(0).textContent;
     for(const commandPart of multipleLinesCommand) {
         await t.expect(resultCommand).contains(commandPart, 'The multiple lines command is in the result');

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

@@ -246,7 +246,7 @@ test
         //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 t.click(memoryEfficiencyPage.NavigationPanel.browserButton);
         await workbenchPage.NavigationHeader.togglePanel(true);
         tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tips);
         await t.click(tab.analyzeDatabaseLink);

tests/e2e/tests/web/regression/search-and-query/no-indexes-suggestions.e2e.ts

@@ -24,7 +24,6 @@ test
     })('Verify suggestions when there are no indexes', async t => {
 
         await t.click(browserPage.NavigationPanel.workbenchButton);
-        await t.pressKey('ctrl+space');
 
         await t.typeText(workbenchPage.queryInput, 'FT.SE', { replace: true });
         await t.pressKey('tab');

tests/e2e/tests/web/regression/search-and-query/search-and-query-tab.e2e.ts

@@ -37,7 +37,6 @@ fixture `Autocomplete for entered commands in search and query`
         // Create 3 keys and index
         await browserPage.Cli.sendCommandsInCli(commands);
         await t.click(browserPage.NavigationPanel.workbenchButton);
-        await t.pressKey('ctrl+space');
     })
     .afterEach(async() => {
         // Clear and delete database
@@ -51,7 +50,7 @@ test('Verify that tutorials can be opened from Workbench', async t => {
     await t.click(workbenchPage.getTutorialLinkLocator('sq-intro'));
     await t.expect(workbenchPage.InsightsPanel.sidePanel.exists).ok('Insight panel is not opened');
     const tab = await browserPage.InsightsPanel.setActiveTab(ExploreTabs.Tutorials);
-    await t.expect(tab.preselectArea.textContent).contains('EXACT MATCH', 'the tutorial page is incorrect');
+    await t.expect(tab.preselectArea.textContent).contains('INTRODUCTION', 'the tutorial page is incorrect');
 });
 test('Verify that user can use show more to see command fully in 2nd tooltip', async t => {
     const commandDetails = [
@@ -92,12 +91,13 @@ test('Verify full commands suggestions with index and query for FT.AGGREGATE', a
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withText('FT.AGGREGATE').exists).ok('FT.AGGREGATE auto-suggestions are not displayed');
 
     // Select command and check result
+    await t.typeText(workbenchPage.queryInput, '.AG', { replace: false });
     await t.pressKey('enter');
     let script = await workbenchPage.queryInputScriptArea.textContent;
     await t.expect(script.replace(/\s/g, ' ')).contains('FT.AGGREGATE ', 'Result of sent command exists');
 
     // Verify that user can see the list of all the indexes in database when put a space after only FT.SEARCH and FT.AGGREGATE commands
-    await t.expect(script.replace(/\s/g, ' ')).contains(`"${indexName1}" "" `, 'Index not suggested into input');
+    await t.expect(script.replace(/\s/g, ' ')).contains(`'${indexName1}' 'query to search' `, 'Index not suggested into input');
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withExactText(indexName1).exists).ok('Index not auto-suggested');
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withExactText(indexName2).exists).ok('All indexes not auto-suggested');
 
@@ -115,10 +115,12 @@ test('Verify full commands suggestions with index and query for FT.AGGREGATE', a
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withExactText('city').exists).ok('Index field not auto-suggested after starting typing');
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.count).eql(1, 'Wrong index fields suggested after typing first letter');
 
-    // Verify contextual suggestions after typing letters for commands
+    // Go out of index field
+    await t.pressKey('tab');
     await t.pressKey('tab');
     await t.pressKey('right');
     await t.pressKey('space');
+    // Verify contextual suggestions after typing letters for commands
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withExactText('APPLY').exists).ok('FT.AGGREGATE arguments not suggested');
     await t.typeText(workbenchPage.queryInput, 'g', { replace: false });
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.nth(0).textContent).contains('GROUPBY', 'Argument not suggested after typing first letters');
@@ -141,23 +143,22 @@ test('Verify full commands suggestions with index and query for FT.AGGREGATE', a
     await t.typeText(workbenchPage.queryInput, 'stud', { replace: false });
 
     await t.pressKey('space');
-    await t.debug();
     // Verify multiple argument option suggestions
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.nth(0).textContent).contains('REDUCE', 'Incorrect order of suggested arguments');
     // Verify complex command sequences like nargs and properties are suggested accurately for GROUPBY
-    const expectedText = `FT.AGGREGATE "${indexName1}" "@city" GROUPBY 1 "London" REDUCE SUM 1 @students AS stud REDUCE`.trim().replace(/\s+/g, ' ');
+    const expectedText = `FT.AGGREGATE '${indexName1}' '@city:{tag} ' GROUPBY 1 "London" REDUCE SUM 1 @students AS stud REDUCE`.trim().replace(/\s+/g, ' ');
     await t.expect((await workbenchPage.queryInputForText.innerText).trim().replace(/\s+/g, ' ')).contains(expectedText, 'Incorrect order of entered arguments');
 });
 test('Verify full commands suggestions with index and query for FT.SEARCH', async t => {
-    await t.typeText(workbenchPage.queryInput, 'FT.SE', { replace: true });
+    await t.typeText(workbenchPage.queryInput, 'FT.SEA', { replace: true });
     // Select command and check result
     await t.pressKey('enter');
     const script = await workbenchPage.queryInputScriptArea.textContent;
     await t.expect(script.replace(/\s/g, ' ')).contains('FT.SEARCH ', 'Result of sent command exists');
 
-    await t.pressKey('tab');
+    await t.pressKey('tab')
     // Select '@city' field
-    await workbenchPage.selectFieldUsingAutosuggest('city');
+    await workbenchPage.selectFieldUsingAutosuggest('city')
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withExactText('DIALECT').exists).ok('FT.SEARCH arguments not suggested');
     await t.typeText(workbenchPage.queryInput, 'n', { replace: false });
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.nth(0).textContent).contains('NOCONTENT', 'Argument not suggested after typing first letters');
@@ -199,7 +200,7 @@ test('Verify full commands suggestions with index and query for FT.PROFILE(SEARC
     await workbenchPage.selectFieldUsingAutosuggest('city');
     // Verify that there are no more suggestions
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.exists).notOk('Additional invalid commands suggested');
-    const expectedText = `FT.PROFILE "${indexName1}" SEARCH QUERY "@city"`.trim().replace(/\s+/g, ' ');
+    const expectedText = `FT.PROFILE '${indexName1}' SEARCH QUERY '@city:{tag} '`.trim().replace(/\s+/g, ' ');
     // Verify command entered correctly
     await t.expect((await workbenchPage.queryInputForText.innerText).trim().replace(/\s+/g, ' ')).contains(expectedText, 'Incorrect order of entered arguments');
 });
@@ -220,7 +221,7 @@ test('Verify full commands suggestions with index and query for FT.PROFILE(AGGRE
     await workbenchPage.selectFieldUsingAutosuggest('city');
     // Verify that there are no more suggestions
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.exists).notOk('Additional invalid commands suggested');
-    const expectedText = `FT.PROFILE "${indexName1}" AGGREGATE QUERY "@city"`.trim().replace(/\s+/g, ' ');
+    const expectedText = `FT.PROFILE '${indexName1}' AGGREGATE QUERY '@city:{tag} '`.trim().replace(/\s+/g, ' ');
     // Verify command entered correctly
     await t.expect((await workbenchPage.queryInputForText.innerText).trim().replace(/\s+/g, ' ')).contains(expectedText, 'Incorrect order of entered arguments');
 });
@@ -238,7 +239,7 @@ test('Verify full commands suggestions with index and query for FT.EXPLAIN', asy
     // Verify that there are no more suggestions
     await t.pressKey('space');
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.exists).notOk('Additional invalid commands suggested');
-    const expectedText = `FT.EXPLAIN "${indexName1}" "@city" DIALECT dialectTest`.trim().replace(/\s+/g, ' ');
+    const expectedText = `FT.EXPLAIN '${indexName1}' '@city:{tag} ' DIALECT dialectTest`.trim().replace(/\s+/g, ' ');
     // Verify command entered correctly
     await t.expect((await workbenchPage.queryInputForText.innerText).trim().replace(/\s+/g, ' ')).contains(expectedText, 'Incorrect order of entered arguments');
 });
@@ -259,11 +260,12 @@ test('Verify commands suggestions for APPLY and FILTER', async t => {
     await t.typeText(workbenchPage.queryInput, '@', { replace: false });
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.visible).ok('Suggestions not displayed');
     await t.typeText(workbenchPage.queryInput, 'location', { replace: false });
-    await t.typeText(workbenchPage.queryInput, ', \'40.7128,-74.0060\'');
+    await t.typeText(workbenchPage.queryInput, ', "40.7128,-74.0060"');
     for (let i = 0; i < 3; i++) {
         await t.pressKey('right');
     }
     await t.pressKey('space');
+    await t.typeText(workbenchPage.queryInput, 'a');
     await t.pressKey('tab');
     await t.typeText(workbenchPage.queryInput, 'apply_key', { replace: false });
 
@@ -277,7 +279,6 @@ test('Verify commands suggestions for APPLY and FILTER', async t => {
     await t.pressKey('space');
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withExactText('GROUPBY').exists).ok('query can not be prolong');
 });
-
 test('Verify REDUCE commands', async t => {
     await t.typeText(workbenchPage.queryInput, `FT.AGGREGATE ${indexName1} "*" GROUPBY 1 @location`, { replace: true });
     await t.pressKey('space');
@@ -288,6 +289,7 @@ test('Verify REDUCE commands', async t => {
 
     // set value of reduce
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.visible).ok('Suggestions not displayed');
+    // Select COUNT
     await t.typeText(workbenchPage.queryInput, 'CO');
     await t.pressKey('enter');
     await t.typeText(workbenchPage.queryInput, '0');
@@ -325,7 +327,7 @@ test('Verify suggestions for fields', async t => {
     // verify suggestions for geo
     await t.typeText(workbenchPage.queryInput, 'l');
     await t.pressKey('tab');
-    await t.expect((await workbenchPage.MonacoEditor.getTextFromMonaco()).trim()).eql(`FT.AGGREGATE "${indexName1}" "@location:[lon lat radius unit]"`);
+    await t.expect((await workbenchPage.MonacoEditor.getTextFromMonaco()).trim()).eql(`FT.AGGREGATE '${indexName1}' '@location:[lon lat radius unit] '`);
 
     // verify for numeric
     await t.typeText(workbenchPage.queryInput, 'FT.AGGREGATE ', { replace: true });
@@ -336,10 +338,10 @@ test('Verify suggestions for fields', async t => {
     await t.typeText(workbenchPage.queryInput, '@');
     await t.typeText(workbenchPage.queryInput, 's');
     await t.pressKey('tab');
-    await t.expect((await workbenchPage.MonacoEditor.getTextFromMonaco()).trim()).eql(`FT.AGGREGATE "${indexName1}" "@students:[range]"`);
+    await t.expect((await workbenchPage.MonacoEditor.getTextFromMonaco()).trim()).eql(`FT.AGGREGATE '${indexName1}' '@students:[range] '`);
 });
-
-test
+// Unskip after fixing https://redislabs.atlassian.net/browse/RI-6212
+test.skip
     .after(async() => {
     // Clear and delete database
         await apiKeyRequests.deleteKeyByNameApi(keyName, ossStandaloneConfig.databaseName);
@@ -349,7 +351,6 @@ test
         await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
     })('Verify commands suggestions for CREATE', async t => {
         await t.typeText(workbenchPage.queryInput, 'FT.CREATE ', { replace: true });
-        await t.pressKey('enter');
         // Verify that indexes are not suggested for FT.CREATE
         await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.exists).notOk('Existing index suggested');
 
@@ -376,5 +377,15 @@ test
         // Select SORTABLE
         await t.typeText(workbenchPage.queryInput, 'so', { replace: false });
         await t.pressKey('tab');
-        await t.expect((await workbenchPage.MonacoEditor.getTextFromMonaco()).trim()).eql(`FT.CREATE ${indexName3} FILTER filterNew SCHEMA field_name TEXT SORTABLE`);
+
+        // Enter second field to SCHEMA
+        await t.typeText(workbenchPage.queryInput, 'field2_num', { replace: false });
+        await t.pressKey('space');
+        await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withExactText('NUMERIC').exists).ok('query can not be prolong');
+        
+        // Select NUMERIC keyword
+        await t.typeText(workbenchPage.queryInput, 'so', { replace: false });        
+        await t.pressKey('tab');
+
+        await t.expect((await workbenchPage.MonacoEditor.getTextFromMonaco()).trim()).eql(`FT.CREATE ${indexName3} FILTER filterNew SCHEMA field_name TEXT SORTABLE field2_num NUMERIC`);
     });