fix for formatters

Author: vlad-dargel

tests/e2e/pageObjects/browser-page.ts

@@ -39,7 +39,7 @@ export class BrowserPage extends InstancePage {
     refreshKeysButton = Selector('[data-testid=refresh-keys-btn]');
     refreshKeyButton = Selector('[data-testid=refresh-key-btn]');
     editKeyNameButton = Selector('[data-testid=edit-key-btn]');
-    editKeyValueButton = Selector('[data-testid=edit-key-value-btn]');
+    editKeyValueButton = Selector('[data-testid=edit-key-value-btn]', { timeout: 500 });
     closeKeyButton = Selector('[data-testid=close-key-btn]');
     plusAddKeyButton = Selector('[data-testid=btn-add-key]');
     addKeyValueItemsButton = Selector('[data-testid=add-key-value-items-btn]');

tests/e2e/tests/web/critical-path/browser/formatters.e2e.ts

@@ -57,11 +57,11 @@ formattersHighlightedSet.forEach(formatter => {
                 // Verify that value is formatted and highlighted
                 await t.expect(valueSelector.find(browserPage.cssJsonValue).exists).ok(`${key.textType} Value is not formatted to ${formatter.format}`);
                 // Verify that Hash field is formatted and highlighted for JSON and PHP serialized
-                if (key.keyName === 'hash') {
+                if (key.textType === 'Hash') {
                     await t.expect(browserPage.hashField.find(browserPage.cssJsonValue).exists).ok(`Hash field is not formatted to ${formatter.format}`);
                 }
                 // Verify that Stream field is formatted and highlighted for JSON and PHP serialized
-                if (key.keyName === 'stream') {
+                if (key.textType === 'Stream') {
                     await t.expect(Selector(browserPage.cssJsonValue).count).eql(2, `Hash field is not formatted to ${formatter.format}`);
                 }
             }
@@ -193,10 +193,10 @@ notEditableFormattersSet.forEach(formatter => {
         // Verify for Protobuf, Java serialized, Pickle
         // Verify for Hash, List, ZSet, String keys
         for (const key of keysData) {
-            if (key.keyName === 'hash' || key.keyName === 'list' || key.keyName === 'zset' || key.keyName === 'string') {
-                const editBtn = (key.keyName === 'string')
+            if (key.textType === 'Hash' || key.textType === 'List' || key.textType === 'Sorted Set' || key.textType === 'String') {
+                const editBtn = (key.textType === 'String')
                     ? browserPage.editKeyValueButton
-                    : Selector(`[data-testid^=edit-][data-testid*=${key.keyName.split('-')[0]}]`);
+                    : Selector(`[data-testid*=edit-][data-testid*=${key.keyName.split('-')[0]}]`, { timeout: 500 });
                 await browserPage.openKeyDetailsByKeyName(key.keyName);
                 await browserPage.selectFormatter(formatter.format);
                 // Verify that edit button disabled
@@ -205,8 +205,6 @@ notEditableFormattersSet.forEach(formatter => {
                 await t.hover(editBtn);
                 // Verify tooltip content
                 await t.expect(browserPage.tooltip.textContent).contains('Cannot edit the value in this format', 'Tooltip has wrong text');
-                await t.click(editBtn);
-                await t.expect(browserPage.applyButton.exists).notOk('Edit field is displayed even if disabled');
             }
         }
     });