e2e/feature/RI-6226_change_sorting_for_ft

Author: vlad-dargel

tests/e2e/pageObjects/components/monaco-editor.ts

@@ -23,7 +23,7 @@ export class MonacoEditor {
     async sendTextToMonaco(input: Selector, command: string, clean = true): Promise<void> {
 
         await t.click(input);
-        if(clean) {
+        if (clean) {
             await t
                 // remove text since replace doesn't work here
                 .pressKey('ctrl+a')
@@ -39,10 +39,10 @@ export class MonacoEditor {
      * @param depth level of depth of the object
      */
     async insertTextByLines(input: Selector, lines: string[], depth: number): Promise<void> {
-        for(let i = 0; i < lines.length; i++) {
+        for (let i = 0; i < lines.length; i++) {
             const line = lines[i];
 
-            for(let j = 0; j < depth; j++) {
+            for (let j = 0; j < depth; j++) {
                 await t.pressKey('shift+tab');
             }
 
@@ -61,4 +61,22 @@ export class MonacoEditor {
         const textAreaMonaco = Selector('[class^=view-lines ]');
         return (await textAreaMonaco.textContent).replace(/\s+/g, ' ');
     }
+
+    /**
+    * Get suggestions as ordered array from monaco from the beginning
+    * @param suggestions number of elements to get
+    */
+    async getSuggestionsArrayFromMonaco(suggestions: number): Promise<string[]> {
+        const textArray: string[] = [];
+        const suggestionElements = this.monacoSuggestion;
+
+        for (let i = 0; i < suggestions; i++) {
+            const suggestionItem = suggestionElements.nth(i);
+            if (await suggestionItem.exists) {
+                textArray.push(await suggestionItem.textContent);
+            }
+        }
+
+        return textArray;
+    }
 }

tests/e2e/tests/web/regression/search-and-query/no-indexes-suggestions.e2e.ts renamed to tests/e2e/tests/web/critical-path/workbench/no-indexes-suggestions.e2e.ts

@@ -1,7 +1,7 @@
 import { DatabaseHelper } from '../../../../helpers/database';
 import { BrowserPage, WorkbenchPage } from '../../../../pageObjects';
 import { rte } from '../../../../helpers/constants';
-import { commonUrl, ossClusterConfig, ossStandaloneConfig, ossStandaloneRedisearch } from '../../../../helpers/conf';
+import { commonUrl, ossClusterConfig } from '../../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 
 const browserPage = new BrowserPage();
@@ -14,11 +14,11 @@ fixture `Search and Query Raw mode`
     .page(commonUrl);
 
 test
-    .before(async t => {
+    .before(async () => {
         await databaseHelper.acceptLicenseTermsAndAddOSSClusterDatabase(ossClusterConfig);
         await browserPage.Cli.sendCommandInCli('flushdb');
     })
-    .after(async t => {
+    .after(async () => {
         await databaseAPIRequests.deleteOSSClusterDatabaseApi(ossClusterConfig);
 
     })('Verify suggestions when there are no indexes', async t => {

tests/e2e/tests/web/regression/search-and-query/search-and-query-tab.e2e.ts renamed to tests/e2e/tests/web/critical-path/workbench/search-and-query-autocomplete.e2e.ts

@@ -18,7 +18,7 @@ let indexName2: string;
 let indexName3: string;
 
 fixture `Autocomplete for entered commands in search and query`
-    .meta({ type: 'regression', rte: rte.standalone })
+    .meta({ type: 'critical_path', rte: rte.standalone })
     .page(commonUrl)
     .beforeEach(async t => {
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneConfig);
@@ -84,8 +84,12 @@ test('Verify full commands suggestions with index and query for FT.AGGREGATE', a
         'students',
         'type'
     ];
+    const ftSortedCommands = ['FT.SEARCH', 'FT.CREATE', 'FT.EXPLAIN', 'FT.PROFILE'];
+
     // Verify basic commands suggestions FT.SEARCH and FT.AGGREGATE
     await t.typeText(workbenchPage.queryInput, 'FT', { replace: true });
+    // Verify custom sorting for FT. commands
+    await t.expect(await workbenchPage.MonacoEditor.getSuggestionsArrayFromMonaco(4)).eql(ftSortedCommands, 'Wrong order of FT commands');
     // Verify that the list with FT.SEARCH and FT.AGGREGATE auto-suggestions is displayed
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withText('FT._LIST').exists).ok('FT._LIST auto-suggestions are not displayed');
     await t.expect(workbenchPage.MonacoEditor.monacoSuggestion.withText('FT.AGGREGATE').exists).ok('FT.AGGREGATE auto-suggestions are not displayed');