Merge pull request #2177 from RedisInsight/e2e/feature/RI-4106_rework-search

fix for regression tests

Author: mariasergeenko

tests/e2e/pageObjects/browser-page.ts

@@ -127,11 +127,9 @@ export class BrowserPage extends InstancePage {
     hashOption = Selector('#hash');
     streamOption = Selector('#stream');
     removeFromHeadSelection = Selector('#HEAD');
-    selectedFilterTypeString = Selector('[data-testid=filter-option-type-selected-string]');
     filterOptionType = Selector('[data-test-subj^=filter-option-type-]');
     filterByKeyTypeDropDown = Selector('[data-testid=select-filter-key-type]', { timeout: 500 });
     filterAllKeyType = Selector('[id=all]');
-    filterOptionTypeSelected = Selector('[data-testid^=filter-option-type-selected]');
     consumerOption = Selector('[data-testid=consumer-option]');
     claimTimeOptionSelect = Selector('[data-testid=time-option-select]');
     relativeTimeOption = Selector('#idle');

tests/e2e/pageObjects/components/browser/bulk-actions.ts

@@ -10,7 +10,7 @@ export class BulkActions {
     //BUTTONS
     bulkDeleteTooltipIcon = Selector('[data-testid=bulk-delete-tooltip]');
     actionButton = Selector('[data-testid=bulk-action-warning-btn]');
-    bulkApplyButton = Selector('[data-testid=bulk-action-apply-btn]');
+    bulkApplyButton = Selector('[data-testid=bulk-action-apply-btn]', { timeout: 500 });
     bulkStopButton = Selector('[data-testid=bulk-action-stop-btn]');
     bulkStartAgainButton = Selector('[data-testid=bulk-action-start-again-btn]');
     bulkCancelButton = Selector('[data-testid=bulk-action-cancel-btn]');

tests/e2e/tests/critical-path/browser/context.e2e.ts

@@ -59,9 +59,9 @@ test('Verify that user can see saved filter per key type applied when he returns
     await t.click(myRedisDatabasePage.NavigationPanel.settingsButton);
     // Return back to Browser and check filter applied
     await t.click(myRedisDatabasePage.NavigationPanel.browserButton);
-    await t.expect(browserPage.selectedFilterTypeString.exists).ok('Filter per key type is still applied');
+    await t.expect(browserPage.filterByKeyTypeDropDown.innerText).eql(KeyTypesTexts.String, 'Filter per key type is still applied');
     // Clear filter
-    await t.click(browserPage.clearFilterButton);
+    await browserPage.setAllKeyType();
     // Filter per key name and open Settings
     await browserPage.searchByKeyName(keyName);
     await t.click(myRedisDatabasePage.NavigationPanel.settingsButton);

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

@@ -68,5 +68,5 @@ test('Verify that when user switched from Tree View to Browser and goes back sta
     await t.click(browserPage.browserViewButton);
     await t.click(browserPage.treeViewButton);
     // Verify that state of filer by key type is saved
-    await t.expect(browserPage.selectedFilterTypeString.exists).ok('Filter per key type is not applied');
+    await t.expect(browserPage.filterByKeyTypeDropDown.innerText).eql(KeyTypesTexts.String, 'Filter per key type is not applied');
 });