Merge pull request #4129 from RedisInsight/e2e/feature/RI-6300_multiple-delimiters-in-tree-view

e2e/bugfix/RI-6300_fix-e2e-after-bugfix

Author: vlad-dargel

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

@@ -70,10 +70,10 @@ export class BrowserActions {
     }
 
     /**
-     * Verify that not patterned keys not visible with delimiter
+     * Verify that not patterned keys not displayed with delimiter
      * @param delimiter string with delimiter value
      */
-    async verifyNotPatternedKeys(delimiter: string): Promise<void> {
+    async verifyNotPatternedKeysNotDisplayed(delimiter: string): Promise<void> {
         const notPatternedKeys = Selector('[data-testid^="badge"]').parent('[data-testid^="node-item_"]');
         const notPatternedKeysNumber = await notPatternedKeys.count;
 
@@ -88,8 +88,8 @@ export class BrowserActions {
      * @param folderName name of folder
      * @param delimiter string with delimiter value
      */
-    getNodeName(startFolder: string, folderName: string, delimiters: string[]): string {
-        return `${startFolder}${folderName}${delimiters.join('|')}`;
+    getNodeName(startFolder: string, folderName: string, delimiter?: string): string {
+        return delimiter ? `${startFolder}${delimiter}${folderName}` : `${startFolder}${folderName}`;
     }
 
     /**
@@ -106,28 +106,30 @@ export class BrowserActions {
      * @param delimiter string with delimiter value
      */
     async checkTreeViewFoldersStructure(folders: string[][], delimiters: string[]): Promise<void> {
-        // Verify not patterned keys
-        await this.verifyNotPatternedKeys(delimiters[0]);
+        await this.verifyNotPatternedKeysNotDisplayed(delimiters[0]);
 
-        const foldersNumber = folders.length;
+        for (let i = 0; i < folders.length; i++) {
+            const delimiter = delimiters.length > 1 ? '-' : delimiters[0];
+            let prevNodeName = '';
+            let prevDelimiter = '';
 
-        for (let i = 0; i < foldersNumber; i++) {
-            const innerFoldersNumber = folders[i].length;
-            let prevNodeSelector = '';
-
-            for (let j = 0; j < innerFoldersNumber; j++) {
-                const nodeName = this.getNodeName(prevNodeSelector, folders[i][j], delimiters);
+            // Expand subfolders
+            for (let j = 0; j < folders[i].length; j++) {
+                const nodeName = this.getNodeName(prevNodeName, folders[i][j], prevDelimiter);
                 const node = this.getNodeSelector(nodeName);
                 const fullTestIdSelector = await node.getAttribute('data-testid');
+
                 if (!fullTestIdSelector?.includes('expanded')) {
                     await t.click(node);
                 }
-                prevNodeSelector = nodeName;
+
+                prevNodeName = nodeName;
+                prevDelimiter = delimiter;
             }
 
             // Verify that the last folder level contains required keys
-            const foundKeyName = `${folders[i].join(delimiters.join('|'))}`;
-            const firstFolderName = this.getNodeName('', folders[i][0], delimiters);
+            const foundKeyName = `${folders[i].join(delimiter)}`;
+            const firstFolderName = this.getNodeName('', folders[i][0]);
             const firstFolder = this.getNodeSelector(firstFolderName);
             await t
                 .expect(Selector(`[data-testid*="node-item_${foundKeyName}"]`).find('[data-testid^="key-"]').exists).ok('Specific key not found')

tests/e2e/tests/web/critical-path/tree-view/delimiter.e2e.ts

@@ -51,6 +51,9 @@ test
         await databaseHelper.acceptLicenseTermsAndAddDatabaseApi(ossStandaloneV8Config);
         keyNames = [
             `device:common-dev`,
+            `device-common:dev`,
+            `device:common:dev`,
+            `device-common-dev`,
             `device:common-stage`,
             `device:common1-stage`,
             `mobile:common-dev`,
@@ -82,7 +85,7 @@ test
         // Switch to tree view
         await t.click(browserPage.treeViewButton);
         // Verify folders ordering with default delimiter
-        await browserActions.checkTreeViewFoldersStructure([['device'], ['mobile']], [':']);
+        await browserActions.checkTreeViewFoldersStructure([['device', 'common'], ['device-common'], ['mobile']], [':']);
         await t.click(browserPage.TreeView.treeViewSettingsBtn);
         // Apply new value to the field
         await browserPage.TreeView.FiltersDialog.addDelimiterItem('-');
@@ -92,6 +95,6 @@ test
 
         // Verify that namespace names tooltip contains valid names and delimiter
         await t.click(browserActions.getNodeSelector('device'));
-        await t.hover(browserActions.getNodeSelector('device:|-common:|-'));
-        await browserActions.verifyTooltipContainsText('device:common-stage-*', true);
+        await t.hover(browserActions.getNodeSelector('device-common'));
+        await browserActions.verifyTooltipContainsText('device-common-*\n:\n-\n5 key(s)', true);
     });