diff --git a/test/accessibility/apps/filter_panel.ts b/test/accessibility/apps/filter_panel.ts index 325999794b557da..46cf9d485ff8689 100644 --- a/test/accessibility/apps/filter_panel.ts +++ b/test/accessibility/apps/filter_panel.ts @@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.discover.openAddFilterPanel(); await a11y.testAppSnapshot(); await PageObjects.discover.closeAddFilterPanel(); - await filterBar.addFilter({ field: 'OriginCityName', operation: 'is', value: 'Rome' }); + await filterBar.addFilter({ field: 'OriginCityName', operation: 'equals', value: 'Rome' }); }); it('a11y test on Edit filter as Query DSL panel', async () => { @@ -36,7 +36,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // the following tests are for the new saved query panel which also has filter panel options it('a11y test on saved query panel- on more than one filters', async () => { - await filterBar.addFilter({ field: 'DestCountry', operation: 'is', value: 'AU' }); + await filterBar.addFilter({ field: 'DestCountry', operation: 'equals', value: 'AU' }); await testSubjects.click('queryBarMenuPopover'); await a11y.testAppSnapshot(); }); diff --git a/test/examples/unified_field_list_examples/field_stats.ts b/test/examples/unified_field_list_examples/field_stats.ts index 9ed28ee618bf319..a03962ed6ecd7ef 100644 --- a/test/examples/unified_field_list_examples/field_stats.ts +++ b/test/examples/unified_field_list_examples/field_stats.ts @@ -131,7 +131,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => { }); it('should apply filters and queries', async () => { - await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'US' }); + await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'US' }); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.unifiedFieldList.clickFieldListItem('bytes'); expect(await PageObjects.unifiedFieldList.getFieldStatsViewType()).to.be( @@ -176,7 +176,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => { it('should return a single-value histogram when filtering a precalculated histogram', async () => { await filterBar.addFilter({ field: 'histogram-title', - operation: 'is', + operation: 'equals', value: 'single value', }); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/test/functional/apps/context/_context_navigation.ts b/test/functional/apps/context/_context_navigation.ts index 092324444c3fc24..237a6afb28793e7 100644 --- a/test/functional/apps/context/_context_navigation.ts +++ b/test/functional/apps/context/_context_navigation.ts @@ -45,7 +45,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.common.navigateToApp('discover'); await PageObjects.header.waitUntilLoadingHasFinished(); for (const [columnName, value] of TEST_FILTER_COLUMN_NAMES) { - await filterBar.addFilter({ field: columnName, operation: 'is', value }); + await filterBar.addFilter({ field: columnName, operation: 'equals', value }); } }); diff --git a/test/functional/apps/context/_discover_navigation.ts b/test/functional/apps/context/_discover_navigation.ts index d38d120ae0d63c9..442be05927ed705 100644 --- a/test/functional/apps/context/_discover_navigation.ts +++ b/test/functional/apps/context/_discover_navigation.ts @@ -48,7 +48,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { } for (const [columnName, value] of TEST_FILTER_COLUMN_NAMES) { - await filterBar.addFilter({ field: columnName, operation: 'is', value }); + await filterBar.addFilter({ field: columnName, operation: 'equals', value }); await PageObjects.header.waitUntilLoadingHasFinished(); } }); diff --git a/test/functional/apps/context/_filters.ts b/test/functional/apps/context/_filters.ts index 9aff3f6c805fc26..ebfe27017eccd83 100644 --- a/test/functional/apps/context/_filters.ts +++ b/test/functional/apps/context/_filters.ts @@ -63,7 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('inclusive filter should be toggleable via the filter bar', async function () { await filterBar.addFilter({ field: TEST_ANCHOR_FILTER_FIELD, - operation: 'is', + operation: 'equals', value: TEST_ANCHOR_FILTER_VALUE, }); await PageObjects.context.waitUntilContextLoadingHasFinished(); @@ -96,7 +96,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const addPinnedFilter = async () => { await filterBar.addFilter({ field: TEST_ANCHOR_FILTER_FIELD, - operation: 'is', + operation: 'equals', value: TEST_ANCHOR_FILTER_VALUE, }); await filterBar.toggleFilterPinned(TEST_ANCHOR_FILTER_FIELD); @@ -133,7 +133,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should preserve filters when the page is refreshed', async function () { await addPinnedFilter(); - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'png' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'png' }); await PageObjects.context.waitUntilContextLoadingHasFinished(); await expectFiltersToExist(); await browser.refresh(); @@ -142,7 +142,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should update filters when navigating forward and backward in history', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'png' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'png' }); await PageObjects.context.waitUntilContextLoadingHasFinished(); expect(await filterBar.getFilterCount()).to.be(1); expect(await filterBar.hasFilter('extension', 'png')).to.be(true); @@ -162,8 +162,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await filterBar.addFilter({ condition: 'OR', filters: [ - { field: 'extension', operation: 'is', value: 'png' }, - { field: 'bytes', operation: 'is between', value: { from: '1000', to: '2000' } }, + { field: 'extension', operation: 'equals', value: 'png' }, + { field: 'bytes', operation: 'between', value: { from: '1000', to: '2000' } }, ], }); @@ -182,8 +182,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await filterBar.addFilter({ condition: 'AND', filters: [ - { field: 'extension', operation: 'is one of', value: ['png', 'jpeg'] }, - { field: 'bytes', operation: 'is between', value: { from: '1000', to: '2000' } }, + { field: 'extension', operation: 'one of', value: ['png', 'jpeg'] }, + { field: 'bytes', operation: 'between', value: { from: '1000', to: '2000' } }, ], }); @@ -206,10 +206,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { condition: 'OR', filters: [ { field: 'clientip', operation: 'does not exist' }, - { field: 'extension', operation: 'is one of', value: ['png', 'jpeg'] }, + { field: 'extension', operation: 'one of', value: ['png', 'jpeg'] }, ], }, - { field: 'bytes', operation: 'is between', value: { from: '1000', to: '2000' } }, + { field: 'bytes', operation: 'between', value: { from: '1000', to: '2000' } }, ], }); @@ -225,7 +225,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should add comma delimiter values', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is one of', value: 'png, jpeg' }); + await filterBar.addFilter({ field: 'extension', operation: 'one of', value: 'png, jpeg' }); await PageObjects.context.waitUntilContextLoadingHasFinished(); expect(await filterBar.getFilterCount()).to.be(1); @@ -237,7 +237,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should display the negated values correctly', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is not', value: 'png' }); + await filterBar.addFilter({ field: 'extension', operation: 'does not equal', value: 'png' }); await PageObjects.context.waitUntilContextLoadingHasFinished(); expect(await filterBar.getFilterCount()).to.be(1); @@ -246,7 +246,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await filterBar.clickEditFilterById('0'); await filterBar.addAndFilter('0'); - await filterBar.createFilter({ field: 'extension', operation: 'is', value: 'jpeg' }, '0.1'); + await filterBar.createFilter( + { field: 'extension', operation: 'equals', value: 'jpeg' }, + '0.1' + ); await testSubjects.clickWhenNotDisabled('saveFilter'); const filterLabelUpdated = await filterBar.getFiltersLabel(); diff --git a/test/functional/apps/dashboard/group2/dashboard_filtering.ts b/test/functional/apps/dashboard/group2/dashboard_filtering.ts index 24f276b83103639..0003526d4547292 100644 --- a/test/functional/apps/dashboard/group2/dashboard_filtering.ts +++ b/test/functional/apps/dashboard/group2/dashboard_filtering.ts @@ -41,7 +41,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const addFilterAndRefresh = async () => { await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.dashboard.waitForRenderComplete(); - await filterBar.addFilter({ field: 'bytes', operation: 'is', value: '12345678' }); + await filterBar.addFilter({ field: 'bytes', operation: 'equals', value: '12345678' }); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.dashboard.waitForRenderComplete(); // first round of requests sometimes times out, refresh all visualizations to fetch again diff --git a/test/functional/apps/dashboard/group2/full_screen_mode.ts b/test/functional/apps/dashboard/group2/full_screen_mode.ts index 23be5e4b7afe6eb..0e53c2d9fa21ed2 100644 --- a/test/functional/apps/dashboard/group2/full_screen_mode.ts +++ b/test/functional/apps/dashboard/group2/full_screen_mode.ts @@ -85,7 +85,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('shows filter bar in fullscreen mode', async () => { - await filterBar.addFilter({ field: 'bytes', operation: 'is', value: '12345678' }); + await filterBar.addFilter({ field: 'bytes', operation: 'equals', value: '12345678' }); await PageObjects.dashboard.waitForRenderComplete(); await PageObjects.dashboard.clickFullScreenMode(); await retry.try(async () => { diff --git a/test/functional/apps/dashboard/group5/dashboard_error_handling.ts b/test/functional/apps/dashboard/group5/dashboard_error_handling.ts index ab8e8ac76f85b0c..6de570699ab4fdf 100644 --- a/test/functional/apps/dashboard/group5/dashboard_error_handling.ts +++ b/test/functional/apps/dashboard/group5/dashboard_error_handling.ts @@ -44,7 +44,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.dashboard.gotoDashboardLandingPage(); await PageObjects.dashboard.loadSavedDashboard('Dashboard with Missing Lens Panel'); await PageObjects.header.waitUntilLoadingHasFinished(); - await filterBar.addFilter({ field: 'bytes', operation: 'is', value: '12345678' }); + await filterBar.addFilter({ field: 'bytes', operation: 'equals', value: '12345678' }); await PageObjects.header.waitUntilLoadingHasFinished(); expect(await filterBar.getFilterCount()).to.be(1); }); diff --git a/test/functional/apps/dashboard/group5/saved_search_embeddable.ts b/test/functional/apps/dashboard/group5/saved_search_embeddable.ts index f20172d10ed5c8f..37e36d48114f778 100644 --- a/test/functional/apps/dashboard/group5/saved_search_embeddable.ts +++ b/test/functional/apps/dashboard/group5/saved_search_embeddable.ts @@ -44,7 +44,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('highlighting on filtering works', async function () { await dashboardAddPanel.addSavedSearch('Rendering-Test:-saved-search'); - await filterBar.addFilter({ field: 'agent', operation: 'is', value: 'Mozilla' }); + await filterBar.addFilter({ field: 'agent', operation: 'equals', value: 'Mozilla' }); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.dashboard.waitForRenderComplete(); const dataTable = await find.byCssSelector(`[data-test-subj="embeddedSavedSearchDocTable"]`); diff --git a/test/functional/apps/dashboard/group5/share.ts b/test/functional/apps/dashboard/group5/share.ts index 45bb5cd80c50851..454b3062d598c77 100644 --- a/test/functional/apps/dashboard/group5/share.ts +++ b/test/functional/apps/dashboard/group5/share.ts @@ -63,7 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('unpinned filter should show up only in app state when dashboard is unsaved', async () => { - await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'AE' }); + await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'AE' }); await PageObjects.dashboard.waitForRenderComplete(); const sharedUrl = await getSharedUrl(mode); diff --git a/test/functional/apps/dashboard_elements/controls/common/control_group_settings.ts b/test/functional/apps/dashboard_elements/controls/common/control_group_settings.ts index f4359f9887c59c7..4429887338dd4fe 100644 --- a/test/functional/apps/dashboard_elements/controls/common/control_group_settings.ts +++ b/test/functional/apps/dashboard_elements/controls/common/control_group_settings.ts @@ -122,7 +122,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('do not apply global filters', async () => { it('- filter pills', async () => { - await filterBar.addFilter({ field: 'animal.keyword', operation: 'is', value: 'cat' }); + await filterBar.addFilter({ field: 'animal.keyword', operation: 'equals', value: 'cat' }); await dashboardControls.optionsListOpenPopover(firstOptionsListId); let afterCount = await dashboardControls.optionsListPopoverGetAvailableOptionsCount(); expect(afterCount).to.be.lessThan(beforeCount); diff --git a/test/functional/apps/dashboard_elements/controls/options_list/options_list_dashboard_interaction.ts b/test/functional/apps/dashboard_elements/controls/options_list/options_list_dashboard_interaction.ts index 16d0b2cd5fc2d22..4328fa82aea9aed 100644 --- a/test/functional/apps/dashboard_elements/controls/options_list/options_list_dashboard_interaction.ts +++ b/test/functional/apps/dashboard_elements/controls/options_list/options_list_dashboard_interaction.ts @@ -115,7 +115,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { before(async () => { await filterBar.addFilter({ field: 'sound.keyword', - operation: 'is one of', + operation: 'one of', value: ['bark', 'bow ow ow', 'ruff'], }); await header.waitUntilLoadingHasFinished(); diff --git a/test/functional/apps/dashboard_elements/controls/options_list/options_list_validation.ts b/test/functional/apps/dashboard_elements/controls/options_list/options_list_validation.ts index d8c1002f485e4aa..8b28d347cdf564e 100644 --- a/test/functional/apps/dashboard_elements/controls/options_list/options_list_validation.ts +++ b/test/functional/apps/dashboard_elements/controls/options_list/options_list_validation.ts @@ -102,7 +102,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('Can mark multiple selections invalid with Filter', async () => { - await filterBar.addFilter({ field: 'sound.keyword', operation: 'is', value: 'hiss' }); + await filterBar.addFilter({ field: 'sound.keyword', operation: 'equals', value: 'hiss' }); await dashboard.waitForRenderComplete(); await header.waitUntilLoadingHasFinished(); await dashboardControls.ensureAvailableOptionsEqual(controlId, { @@ -144,7 +144,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('Does not mark multiple selections invalid with Filter', async () => { - await filterBar.addFilter({ field: 'sound.keyword', operation: 'is', value: 'hiss' }); + await filterBar.addFilter({ field: 'sound.keyword', operation: 'equals', value: 'hiss' }); await dashboard.waitForRenderComplete(); await header.waitUntilLoadingHasFinished(); await dashboardControls.ensureAvailableOptionsEqual(controlId, { diff --git a/test/functional/apps/discover/ccs_compatibility/_saved_queries.ts b/test/functional/apps/discover/ccs_compatibility/_saved_queries.ts index 417d9ad1bbcf2f7..6ec249ec584d7f1 100644 --- a/test/functional/apps/discover/ccs_compatibility/_saved_queries.ts +++ b/test/functional/apps/discover/ccs_compatibility/_saved_queries.ts @@ -60,7 +60,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { expect(hitCount).to.be('4,731'); }); - await filterBar.addFilter({ field: 'extension.raw', operation: 'is one of', value: ['jpg'] }); + await filterBar.addFilter({ field: 'extension.raw', operation: 'one of', value: ['jpg'] }); await retry.try(async function tryingForTime() { const hitCount = await PageObjects.discover.getHitCount(); expect(hitCount).to.be('3,029'); diff --git a/test/functional/apps/discover/group1/_filter_editor.ts b/test/functional/apps/discover/group1/_filter_editor.ts index 7e338f553d940ae..de776898d4e41bf 100644 --- a/test/functional/apps/discover/group1/_filter_editor.ts +++ b/test/functional/apps/discover/group1/_filter_editor.ts @@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should add a phrases filter', async function () { await filterBar.addFilter({ field: 'extension.raw', - operation: 'is one of', + operation: 'one of', value: ['jpg'], }); expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(true); @@ -60,7 +60,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should support filtering on nested fields', async () => { await filterBar.addFilter({ field: 'nestedField.child', - operation: 'is', + operation: 'equals', value: 'nestedValue', }); expect(await filterBar.hasFilter('nestedField.child', 'nestedValue')).to.be(true); @@ -117,7 +117,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should support range filter on version fields', async () => { await filterBar.addFilter({ field: 'version', - operation: 'is between', + operation: 'between', value: { from: '2.0.0', to: '3.0.0' }, }); expect(await filterBar.hasFilter('version', '2.0.0 to 3.0.0')).to.be(true); @@ -137,7 +137,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); await filterBar.addFilter({ field: 'extension.raw', - operation: 'is', + operation: 'equals', value: 'css', }); if (pinned) { diff --git a/test/functional/apps/discover/group1/_url_state.ts b/test/functional/apps/discover/group1/_url_state.ts index 027e767e8fe3d47..708717b808d6916 100644 --- a/test/functional/apps/discover/group1/_url_state.ts +++ b/test/functional/apps/discover/group1/_url_state.ts @@ -90,7 +90,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.timePicker.setDefaultAbsoluteRange(); await filterBar.addFilter({ field: 'extension.raw', - operation: 'is one of', + operation: 'one of', value: ['jpg', 'css'], }); await filterBar.toggleFilterPinned('extension.raw'); diff --git a/test/functional/apps/discover/group3/_request_counts.ts b/test/functional/apps/discover/group3/_request_counts.ts index a1038b3f7e4eed1..033f84a72ae9949 100644 --- a/test/functional/apps/discover/group3/_request_counts.ts +++ b/test/functional/apps/discover/group3/_request_counts.ts @@ -186,7 +186,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await expectSearches(type, 2, async () => { await filterBar.addFilter({ field: 'extension', - operation: 'is', + operation: 'equals', value: 'jpg', }); }); diff --git a/test/functional/apps/discover/group3/_sidebar.ts b/test/functional/apps/discover/group3/_sidebar.ts index 313c350209930b2..3f32d7ba4a90957 100644 --- a/test/functional/apps/discover/group3/_sidebar.ts +++ b/test/functional/apps/discover/group3/_sidebar.ts @@ -227,7 +227,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.unifiedFieldList.clickFieldListItem('extension'); expect(await testSubjects.getVisibleText('dscFieldStats-topValues')).to.be(allTermsResult); - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'jpg' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'jpg' }); await PageObjects.header.waitUntilLoadingHasFinished(); const onlyJpgResult = 'jpg\n100%'; @@ -573,7 +573,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { 'jpg\n65.0%\ncss\n15.4%\npng\n9.8%\ngif\n6.6%\nphp\n3.2%' ); - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'jpg' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'jpg' }); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded(); diff --git a/test/functional/apps/discover/group3/_unsaved_changes_badge.ts b/test/functional/apps/discover/group3/_unsaved_changes_badge.ts index c931a11f4f5f462..692833b691d8735 100644 --- a/test/functional/apps/discover/group3/_unsaved_changes_badge.ts +++ b/test/functional/apps/discover/group3/_unsaved_changes_badge.ts @@ -167,7 +167,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should not show the badge after pinning the first filter but after disabling a filter', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'png' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'png' }); await filterBar.addFilter({ field: 'bytes', operation: 'exists' }); await PageObjects.discover.saveSearch(SAVED_SEARCH_WITH_FILTERS_NAME); await PageObjects.discover.waitUntilSearchingHasFinished(); diff --git a/test/functional/apps/discover/group4/_adhoc_data_views.ts b/test/functional/apps/discover/group4/_adhoc_data_views.ts index 2fe01677636879c..00025dc73cb826e 100644 --- a/test/functional/apps/discover/group4/_adhoc_data_views.ts +++ b/test/functional/apps/discover/group4/_adhoc_data_views.ts @@ -96,7 +96,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should support query and filtering', async () => { await filterBar.addFilter({ field: 'nestedField.child', - operation: 'is', + operation: 'equals', value: 'nestedValue', }); expect(await filterBar.hasFilter('nestedField.child', 'nestedValue')).to.be(true); @@ -236,12 +236,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await filterBar.addFilter({ field: 'nestedField.child', - operation: 'is', + operation: 'equals', value: 'nestedValue', }); await PageObjects.header.waitUntilLoadingHasFinished(); - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'jpg' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'jpg' }); await PageObjects.header.waitUntilLoadingHasFinished(); const first = await PageObjects.discover.getCurrentDataViewId(); diff --git a/test/functional/apps/visualize/group1/_data_table.ts b/test/functional/apps/visualize/group1/_data_table.ts index 90936b26808a8f6..e1a21b91680ba1c 100644 --- a/test/functional/apps/visualize/group1/_data_table.ts +++ b/test/functional/apps/visualize/group1/_data_table.ts @@ -225,7 +225,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should correctly filter for applied time filter on the main timefield', async () => { await filterBar.addFilter({ field: '@timestamp', - operation: 'is between', + operation: 'between', value: { from: '2015-09-19', to: '2015-09-21' }, }); await PageObjects.visChart.waitForVisualizationRenderingStabilized(); diff --git a/test/functional/apps/visualize/group1/_data_table_nontimeindex.ts b/test/functional/apps/visualize/group1/_data_table_nontimeindex.ts index 897722d7141452b..3ded3a9b8f2b094 100644 --- a/test/functional/apps/visualize/group1/_data_table_nontimeindex.ts +++ b/test/functional/apps/visualize/group1/_data_table_nontimeindex.ts @@ -129,7 +129,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should correctly filter for applied time filter on the main timefield', async () => { await filterBar.addFilter({ field: '@timestamp', - operation: 'is between', + operation: 'between', value: { from: '2015-09-19', to: '2015-09-21' }, }); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/test/functional/apps/visualize/group1/_embedding_chart.ts b/test/functional/apps/visualize/group1/_embedding_chart.ts index 4aea828e4898406..6f9298806cafda7 100644 --- a/test/functional/apps/visualize/group1/_embedding_chart.ts +++ b/test/functional/apps/visualize/group1/_embedding_chart.ts @@ -64,7 +64,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should allow to filter in embedded mode', async () => { await filterBar.addFilter({ field: '@timestamp', - operation: 'is between', + operation: 'between', value: { from: '2015-09-21', to: '2015-09-23' }, }); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/test/functional/apps/visualize/group3/_linked_saved_searches.ts b/test/functional/apps/visualize/group3/_linked_saved_searches.ts index f97a4c86e456049..cd501b4564786b7 100644 --- a/test/functional/apps/visualize/group3/_linked_saved_searches.ts +++ b/test/functional/apps/visualize/group3/_linked_saved_searches.ts @@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.visualize.initTests(); await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings(); await PageObjects.common.navigateToApp('discover'); - await filterBar.addFilter({ field: 'extension.raw', operation: 'is', value: 'jpg' }); + await filterBar.addFilter({ field: 'extension.raw', operation: 'equals', value: 'jpg' }); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.discover.saveSearch(savedSearchName); discoverSavedSearchUrlPath = (await browser.getCurrentUrl()).split('?')[0]; @@ -85,7 +85,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should allow adding filters while having a linked saved search', async () => { await filterBar.addFilter({ field: 'bytes', - operation: 'is between', + operation: 'between', value: { from: '100', to: '3000' }, }); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/test/functional/apps/visualize/group6/_vega_chart.ts b/test/functional/apps/visualize/group6/_vega_chart.ts index d7e17a6a08e9141..0b4fad2491332f3 100644 --- a/test/functional/apps/visualize/group6/_vega_chart.ts +++ b/test/functional/apps/visualize/group6/_vega_chart.ts @@ -91,7 +91,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { const fullDataLabels = await PageObjects.vegaChart.getYAxisLabels(); expect(fullDataLabels[0]).to.eql('0'); expect(fullDataLabels[fullDataLabels.length - 1]).to.eql('1,600'); - await filterBar.addFilter({ field: '@tags.raw', operation: 'is', value: 'error' }); + await filterBar.addFilter({ field: '@tags.raw', operation: 'equals', value: 'error' }); await PageObjects.visChart.waitForVisualizationRenderingStabilized(); const filteredDataLabels = await PageObjects.vegaChart.getYAxisLabels(); expect(filteredDataLabels[0]).to.eql('0'); @@ -255,7 +255,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it('should remove filter by calling "kibanaRemoveFilter" expression', async () => { - await filterBar.addFilter({ field: 'response', operation: 'is', value: '200' }); + await filterBar.addFilter({ field: 'response', operation: 'equals', value: '200' }); expect(await filterBar.getFilterCount()).to.be(1); @@ -267,8 +267,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it('should remove all filters by calling "kibanaRemoveAllFilters" expression', async () => { - await filterBar.addFilter({ field: 'response', operation: 'is', value: '200' }); - await filterBar.addFilter({ field: 'response', operation: 'is', value: '500' }); + await filterBar.addFilter({ field: 'response', operation: 'equals', value: '200' }); + await filterBar.addFilter({ field: 'response', operation: 'equals', value: '500' }); expect(await filterBar.getFilterCount()).to.be(2); diff --git a/test/functional/services/filter_bar.ts b/test/functional/services/filter_bar.ts index cd927ee18fb8311..d3bc8febe384b20 100644 --- a/test/functional/services/filter_bar.ts +++ b/test/functional/services/filter_bar.ts @@ -10,12 +10,14 @@ import { $Values } from '@kbn/utility-types'; import { FtrService } from '../ftr_provider_context'; export const Operation = { - IS: 'is', - IS_NOT: 'is not', - IS_ONE_OF: 'is one of', - IS_NOT_ONE_OF: 'is not one of', - IS_BETWEEN: 'is between', - IS_NOT_BETWEEN: 'is not between', + EQUALS: 'equals', + DOES_NOT_EQUAL: 'does not equal', + ONE_OF: 'one of', + NOT_ONE_OF: 'not one of', + BETWEEN: 'between', + NOT_BETWEEN: 'not between', + LESS_THAN: 'less than', + GREATER_OR_EQUAL: 'greater or equal', EXISTS: 'exists', DOES_NOT_EXIST: 'does not exist', } as const; @@ -32,17 +34,17 @@ interface BasicFilter { } interface FilterWithMultipleValues extends BasicFilter { - operation: typeof Operation.IS_ONE_OF | typeof Operation.IS_NOT_ONE_OF; + operation: typeof Operation.ONE_OF | typeof Operation.NOT_ONE_OF; value: string[] | string; } interface FilterWithRange extends BasicFilter { - operation: typeof Operation.IS_BETWEEN | typeof Operation.IS_NOT_BETWEEN; + operation: typeof Operation.BETWEEN | typeof Operation.NOT_BETWEEN; value: { from: string | undefined; to: string | undefined }; } interface FilterWithSingleValue extends BasicFilter { - operation: typeof Operation.IS | typeof Operation.IS_NOT; + operation: typeof Operation.EQUALS | typeof Operation.DOES_NOT_EQUAL; value: string; } diff --git a/test/plugin_functional/test_suites/data_plugin/session.ts b/test/plugin_functional/test_suites/data_plugin/session.ts index 793e9f1ca2faa86..6d6f03dd8945bf8 100644 --- a/test/plugin_functional/test_suites/data_plugin/session.ts +++ b/test/plugin_functional/test_suites/data_plugin/session.ts @@ -69,7 +69,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide }); it('Starts a new session on filter change', async () => { - await filterBar.addFilter({ field: 'line_number', operation: 'is', value: '4.3.108' }); + await filterBar.addFilter({ field: 'line_number', operation: 'equals', value: '4.3.108' }); await PageObjects.header.waitUntilLoadingHasFinished(); const sessionIds = await getSessionIds(); expect(sessionIds.length).to.be(1); diff --git a/x-pack/plugins/timelines/common/types/timeline/data_provider/index.ts b/x-pack/plugins/timelines/common/types/timeline/data_provider/index.ts index d9ef64c0ea1e33b..10620442dea608f 100644 --- a/x-pack/plugins/timelines/common/types/timeline/data_provider/index.ts +++ b/x-pack/plugins/timelines/common/types/timeline/data_provider/index.ts @@ -14,10 +14,10 @@ export const IS_OPERATOR = ':'; export const EXISTS_OPERATOR = ':*'; /** The `is one of` operator in a KQL query */ -export const IS_ONE_OF_OPERATOR = 'includes'; +export const ONE_OF_OPERATOR = 'includes'; /** The operator applied to a field */ -export type QueryOperator = typeof IS_OPERATOR | typeof EXISTS_OPERATOR | typeof IS_ONE_OF_OPERATOR; +export type QueryOperator = typeof IS_OPERATOR | typeof EXISTS_OPERATOR | typeof ONE_OF_OPERATOR; export enum DataProviderType { default = 'default', diff --git a/x-pack/test/cloud_security_posture_functional/pages/findings.ts b/x-pack/test/cloud_security_posture_functional/pages/findings.ts index 48bd8cede1e2560..f33effa1da0d137 100644 --- a/x-pack/test/cloud_security_posture_functional/pages/findings.ts +++ b/x-pack/test/cloud_security_posture_functional/pages/findings.ts @@ -129,7 +129,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe.skip('SearchBar', () => { it('add filter', async () => { // Filter bar uses the field's customLabel in the DataView - await filterBar.addFilter({ field: 'Rule Name', operation: 'is', value: ruleName1 }); + await filterBar.addFilter({ field: 'Rule Name', operation: 'equals', value: ruleName1 }); expect(await filterBar.hasFilter('rule.name', ruleName1)).to.be(true); expect(await latestFindingsTable.hasColumnValue('rule.name', ruleName1)).to.be(true); diff --git a/x-pack/test/cloud_security_posture_functional/pages/findings_grouping.ts b/x-pack/test/cloud_security_posture_functional/pages/findings_grouping.ts index 2939f3eed9266ea..a20846e5d585f16 100644 --- a/x-pack/test/cloud_security_posture_functional/pages/findings_grouping.ts +++ b/x-pack/test/cloud_security_posture_functional/pages/findings_grouping.ts @@ -371,7 +371,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await groupSelector.setValue('Resource'); // Filter bar uses the field's customLabel in the DataView - await filterBar.addFilter({ field: 'Rule Name', operation: 'is', value: ruleName1 }); + await filterBar.addFilter({ field: 'Rule Name', operation: 'equals', value: ruleName1 }); expect(await filterBar.hasFilter('rule.name', ruleName1)).to.be(true); const grouping = await findings.findingsGrouping(); diff --git a/x-pack/test/functional/apps/dashboard/group2/sync_colors.ts b/x-pack/test/functional/apps/dashboard/group2/sync_colors.ts index a388a4d90af3be5..5dd25576c056aab 100644 --- a/x-pack/test/functional/apps/dashboard/group2/sync_colors.ts +++ b/x-pack/test/functional/apps/dashboard/group2/sync_colors.ts @@ -88,7 +88,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { palette: { mode: 'legacy', id: 'default' }, }); - await filterBar.addFilter({ field: 'geo.src', operation: 'is not', value: 'CN' }); + await filterBar.addFilter({ field: 'geo.src', operation: 'does not equal', value: 'CN' }); await PageObjects.lens.save('vis2', false, true); await PageObjects.dashboard.openSettingsFlyout(); diff --git a/x-pack/test/functional/apps/dashboard/group3/drilldowns/dashboard_to_dashboard_drilldown.ts b/x-pack/test/functional/apps/dashboard/group3/drilldowns/dashboard_to_dashboard_drilldown.ts index deb51950408004b..cca93d9621b0ace 100644 --- a/x-pack/test/functional/apps/dashboard/group3/drilldowns/dashboard_to_dashboard_drilldown.ts +++ b/x-pack/test/functional/apps/dashboard/group3/drilldowns/dashboard_to_dashboard_drilldown.ts @@ -205,7 +205,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('carries over all filters from source dashboard', async () => { // add a new unrelated filter. - await filterBar.addFilter({ field: 'machine.os', operation: 'is', value: 'ios' }); + await filterBar.addFilter({ field: 'machine.os', operation: 'equals', value: 'ios' }); await openContextMenuFromPieSlice(); diff --git a/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts b/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts index c23f991f69f072d..9997812a4525e80 100644 --- a/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts +++ b/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts @@ -104,7 +104,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.dashboard.loadSavedDashboard('Ecom Dashboard - 3 Day Period'); // add a filter - await filterBar.addFilter({ field: 'category', operation: 'is', value: `Men's Shoes` }); + await filterBar.addFilter({ field: 'category', operation: 'equals', value: `Men's Shoes` }); await clickActionsMenu('EcommerceData'); await clickDownloadCsv(); @@ -187,7 +187,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ); await PageObjects.common.sleep(1000); - await filterBar.addFilter({ field: 'name.keyword', operation: 'is', value: 'Fethany' }); + await filterBar.addFilter({ field: 'name.keyword', operation: 'equals', value: 'Fethany' }); await PageObjects.common.sleep(1000); }); diff --git a/x-pack/test/functional/apps/discover/reporting.ts b/x-pack/test/functional/apps/discover/reporting.ts index 173869a85465f52..26180f0bb60caf0 100644 --- a/x-pack/test/functional/apps/discover/reporting.ts +++ b/x-pack/test/functional/apps/discover/reporting.ts @@ -295,7 +295,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); // filter - await filterBar.addFilter({ field: 'category', operation: 'is', value: `Men's Shoes` }); + await filterBar.addFilter({ field: 'category', operation: 'equals', value: `Men's Shoes` }); await retry.try(async () => { expect(await PageObjects.discover.getHitCount()).to.equal('154'); }); diff --git a/x-pack/test/functional/apps/discover/saved_searches.ts b/x-pack/test/functional/apps/discover/saved_searches.ts index 8f5fe5dc9bc11a7..fc0c1c08d7bf54d 100644 --- a/x-pack/test/functional/apps/discover/saved_searches.ts +++ b/x-pack/test/functional/apps/discover/saved_searches.ts @@ -67,7 +67,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it(`should unselect saved search when navigating to a 'new'`, async function () { await PageObjects.common.navigateToApp('discover'); await PageObjects.discover.selectIndexPattern('ecommerce'); - await filterBar.addFilter({ field: 'category', operation: 'is', value: `Men's Shoes` }); + await filterBar.addFilter({ field: 'category', operation: 'equals', value: `Men's Shoes` }); await queryBar.setQuery('customer_gender:MALE'); await queryBar.submitQuery(); diff --git a/x-pack/test/functional/apps/discover/value_suggestions.ts b/x-pack/test/functional/apps/discover/value_suggestions.ts index 8d0c0ac5a969ac2..cf37b51f9e18d46 100644 --- a/x-pack/test/functional/apps/discover/value_suggestions.ts +++ b/x-pack/test/functional/apps/discover/value_suggestions.ts @@ -98,7 +98,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.context.waitUntilContextLoadingHasFinished(); // Apply filter in context view - await filterBar.addFilter({ field: 'geo.dest', operation: 'is', value: 'US' }); + await filterBar.addFilter({ field: 'geo.dest', operation: 'equals', value: 'US' }); }); }); }); diff --git a/x-pack/test/functional/apps/discover/visualize_field.ts b/x-pack/test/functional/apps/discover/visualize_field.ts index bbd5e94dc4c75e3..9412e844fee08ac 100644 --- a/x-pack/test/functional/apps/discover/visualize_field.ts +++ b/x-pack/test/functional/apps/discover/visualize_field.ts @@ -89,7 +89,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { it('should preserve app filters in lens', async () => { await filterBar.addFilter({ field: 'bytes', - operation: 'is between', + operation: 'between', value: { from: '3500', to: '4000' }, }); await PageObjects.unifiedFieldList.findFieldByName('geo.src'); diff --git a/x-pack/test/functional/apps/lens/group2/fields_list.ts b/x-pack/test/functional/apps/lens/group2/fields_list.ts index 79baafe6100a6e7..f13cee80b1b44ee 100644 --- a/x-pack/test/functional/apps/lens/group2/fields_list.ts +++ b/x-pack/test/functional/apps/lens/group2/fields_list.ts @@ -180,7 +180,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { 10 ); // define a filter - await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'CN' }); + await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'CN' }); await retry.waitFor('Wait for the filter to take effect', async () => { await testSubjects.click(fieldId); // check for top values chart has changed compared to the previous test @@ -197,7 +197,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // One Fields cap's limitation is to not know when an index has no fields based on filters it('should detect fields have no data in popup if filter excludes them', async () => { await filterBar.removeAllFilters(); - await filterBar.addFilter({ field: 'bytes', operation: 'is', value: '-1' }); + await filterBar.addFilter({ field: 'bytes', operation: 'equals', value: '-1' }); // check via popup fields have no data const [fieldId] = await PageObjects.lens.findFieldIdsByType('keyword'); await log.debug(`Opening field stats for ${fieldId}`); diff --git a/x-pack/test/functional/apps/lens/group2/persistent_context.ts b/x-pack/test/functional/apps/lens/group2/persistent_context.ts index de34f7127242790..b63de5422c9ff4f 100644 --- a/x-pack/test/functional/apps/lens/group2/persistent_context.ts +++ b/x-pack/test/functional/apps/lens/group2/persistent_context.ts @@ -160,7 +160,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { 'Sep 6, 2015 @ 06:31:44.000', 'Sep 18, 2025 @ 06:31:44.000' ); - await filterBar.addFilter({ field: 'ip', operation: 'is', value: '97.220.3.248' }); + await filterBar.addFilter({ field: 'ip', operation: 'equals', value: '97.220.3.248' }); await filterBar.toggleFilterPinned('ip'); await PageObjects.header.clickDiscover(); const timeRange = await PageObjects.timePicker.getTimeConfig(); diff --git a/x-pack/test/functional/apps/lens/group4/dashboard.ts b/x-pack/test/functional/apps/lens/group4/dashboard.ts index 50e8c427567d2f5..68dfe3c67e14578 100644 --- a/x-pack/test/functional/apps/lens/group4/dashboard.ts +++ b/x-pack/test/functional/apps/lens/group4/dashboard.ts @@ -151,7 +151,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ); const hasGeoDestFilter = await filterBar.hasFilter('geo.dest', 'AL'); expect(hasGeoDestFilter).to.be(true); - await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'US' }); + await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'US' }); await filterBar.toggleFilterPinned('geo.src'); }); @@ -159,9 +159,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.dashboard.navigateToApp(); await PageObjects.dashboard.clickNewDashboard(); await PageObjects.timePicker.setDefaultAbsoluteRange(); - await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'US' }); + await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'US' }); await filterBar.toggleFilterPinned('geo.src'); - await filterBar.addFilter({ field: 'geo.dest', operation: 'is', value: 'LS' }); + await filterBar.addFilter({ field: 'geo.dest', operation: 'equals', value: 'LS' }); await dashboardAddPanel.clickCreateNewLink(); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/x-pack/test/functional/apps/lens/group4/share.ts b/x-pack/test/functional/apps/lens/group4/share.ts index c7cd22974b289e6..e8c043648ab754b 100644 --- a/x-pack/test/functional/apps/lens/group4/share.ts +++ b/x-pack/test/functional/apps/lens/group4/share.ts @@ -89,7 +89,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should preserve filter and query when sharing', async () => { - await filterBarService.addFilter({ field: 'bytes', operation: 'is', value: '1' }); + await filterBarService.addFilter({ field: 'bytes', operation: 'equals', value: '1' }); await queryBar.setQuery('host.keyword www.elastic.co'); await queryBar.submitQuery(); await PageObjects.lens.waitForVisualization('xyVisChart'); diff --git a/x-pack/test/functional/apps/lens/group4/show_underlying_data_dashboard.ts b/x-pack/test/functional/apps/lens/group4/show_underlying_data_dashboard.ts index e51f78796da75cb..1725d5dd7b1f284 100644 --- a/x-pack/test/functional/apps/lens/group4/show_underlying_data_dashboard.ts +++ b/x-pack/test/functional/apps/lens/group4/show_underlying_data_dashboard.ts @@ -95,7 +95,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await savedQueryManagementComponent.closeSavedQueryManagementComponent(); await queryBar.setQuery('host.keyword www.elastic.co'); await queryBar.submitQuery(); - await filterBarService.addFilter({ field: 'geo.src', operation: 'is', value: 'AF' }); + await filterBarService.addFilter({ field: 'geo.src', operation: 'equals', value: 'AF' }); // the filter bar seems to need a moment to settle before saving and returning await PageObjects.common.sleep(1000); @@ -107,7 +107,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await queryBar.submitQuery(); await filterBarService.addFilter({ field: 'host.raw', - operation: 'is', + operation: 'equals', value: 'cdn.theacademyofperformingartsandscience.org', }); diff --git a/x-pack/test/functional/apps/lens/open_in_lens/dashboard/dashboard.ts b/x-pack/test/functional/apps/lens/open_in_lens/dashboard/dashboard.ts index 7fa3fb49a558847..8f92ee573b397ab 100644 --- a/x-pack/test/functional/apps/lens/open_in_lens/dashboard/dashboard.ts +++ b/x-pack/test/functional/apps/lens/open_in_lens/dashboard/dashboard.ts @@ -39,7 +39,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await testSubjects.click('visualizesaveAndReturnButton'); await dashboard.waitForRenderComplete(); // define a filter - await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'CN' }); + await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'CN' }); await dashboard.waitForRenderComplete(); expect(await dashboard.isNotificationExists(0)).to.be(true); }); @@ -81,7 +81,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await dashboardAddPanel.clickAggBasedVisualizations(); await dashboardAddPanel.clickVisType('histogram'); await testSubjects.click('savedObjectTitlelogstash-*'); - await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'CN' }); + await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'CN' }); await testSubjects.exists('visualizesaveAndReturnButton'); await testSubjects.click('visualizesaveAndReturnButton'); await dashboard.waitForRenderComplete(); diff --git a/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts b/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts index e0069b7eb285051..aea436030607bc4 100644 --- a/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts +++ b/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts @@ -36,7 +36,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { it('should convert a by value TSVB viz to a Lens viz', async () => { await visualBuilder.resetPage(); // adds filters - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'css' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'css' }); await header.waitUntilLoadingHasFinished(); await testSubjects.click('visualizeSaveButton'); diff --git a/x-pack/test/functional/apps/lens/open_in_lens/tsvb/timeseries.ts b/x-pack/test/functional/apps/lens/open_in_lens/tsvb/timeseries.ts index ea658b39b318c5b..50a092a82674765 100644 --- a/x-pack/test/functional/apps/lens/open_in_lens/tsvb/timeseries.ts +++ b/x-pack/test/functional/apps/lens/open_in_lens/tsvb/timeseries.ts @@ -64,7 +64,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it('should preserve app filters in lens', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'css' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'css' }); await header.waitUntilLoadingHasFinished(); await visualize.navigateToLensFromAnotherVisualization(); await lens.waitForVisualization('xyVisChart'); diff --git a/x-pack/test/functional/apps/lens/open_in_lens/tsvb/top_n.ts b/x-pack/test/functional/apps/lens/open_in_lens/tsvb/top_n.ts index 5207b18035837ca..52e6a9c2e1a6138 100644 --- a/x-pack/test/functional/apps/lens/open_in_lens/tsvb/top_n.ts +++ b/x-pack/test/functional/apps/lens/open_in_lens/tsvb/top_n.ts @@ -164,7 +164,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it('should preserve app filters in lens', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'css' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'css' }); await header.waitUntilLoadingHasFinished(); await visualize.navigateToLensFromAnotherVisualization(); await lens.waitForVisualization('xyVisChart'); diff --git a/x-pack/test/functional/apps/maps/group2/embeddable/dashboard.js b/x-pack/test/functional/apps/maps/group2/embeddable/dashboard.js index bdc681e06eece85..8a524f27f9c3617 100644 --- a/x-pack/test/functional/apps/maps/group2/embeddable/dashboard.js +++ b/x-pack/test/functional/apps/maps/group2/embeddable/dashboard.js @@ -101,14 +101,14 @@ export default function ({ getPageObjects, getService }) { it('should apply new container state (time, query, filters) to embeddable', async () => { await filterBar.addFilterAndSelectDataView('logstash-*', { field: 'machine.os', - operation: 'is', + operation: 'equals', value: 'win 8', }); await PageObjects.maps.waitForLayersToLoad(); await filterBar.addFilterAndSelectDataView('meta_for_geo_shapes*', { field: 'shape_name', - operation: 'is', + operation: 'equals', value: 'alpha', }); await PageObjects.maps.waitForLayersToLoad(); @@ -134,7 +134,7 @@ export default function ({ getPageObjects, getService }) { await dashboardPanelActions.editPanelByTitle('geo grid vector grid example'); await PageObjects.maps.waitForLayersToLoad(); - await filterBar.addFilter({ field: 'machine.os', operation: 'is', value: 'ios' }); + await filterBar.addFilter({ field: 'machine.os', operation: 'equals', value: 'ios' }); await PageObjects.maps.waitForLayersToLoad(); await testSubjects.click('mapSaveAndReturnButton'); const { rawResponse: gridResponse } = await PageObjects.maps.getResponseFromDashboardPanel( diff --git a/x-pack/test/functional/apps/maps/group4/lens/choropleth_chart.ts b/x-pack/test/functional/apps/maps/group4/lens/choropleth_chart.ts index ba7f50befe8445d..74d9d9b96dd94a2 100644 --- a/x-pack/test/functional/apps/maps/group4/lens/choropleth_chart.ts +++ b/x-pack/test/functional/apps/maps/group4/lens/choropleth_chart.ts @@ -58,7 +58,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // add filter to force data fetch to set activeData await filterBar.addFilter({ field: 'bytes', - operation: 'is between', + operation: 'between', value: { from: '200', to: '10000' }, }); diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_filters.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_filters.ts index 4be111e00bc859f..22c57615523f921 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_filters.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_filters.ts @@ -41,7 +41,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await filterBar.addFilter({ field: PINNED_FILTER.key, - operation: 'is', + operation: 'equals', value: PINNED_FILTER.value, }); await filterBar.toggleFilterPinned(PINNED_FILTER.key); @@ -109,7 +109,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await ml.testExecution.logTestStep(`${testData.suiteTitle} adds a pinned filter`); await filterBar.addFilter({ field: PINNED_FILTER.key, - operation: 'is', + operation: 'equals', value: PINNED_FILTER.value, }); await filterBar.toggleFilterPinned(PINNED_FILTER.key); diff --git a/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts b/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts index 6b668f75d56d3aa..54b959006332446 100644 --- a/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts +++ b/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts @@ -220,7 +220,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ruleId = value; } - await filterBar.addFilter({ field: 'rule_id', operation: 'is', value: ruleId }); + await filterBar.addFilter({ field: 'rule_id', operation: 'equals', value: ruleId }); await PageObjects.discover.waitUntilSearchingHasFinished(); const link = await getResultsLink(); @@ -409,7 +409,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // change rule configuration await testSubjects.click('openEditRuleFlyoutButton'); await queryBar.setQuery('message:msg-1'); - await filterBar.addFilter({ field: 'message.keyword', operation: 'is', value: 'msg-1' }); + await filterBar.addFilter({ field: 'message.keyword', operation: 'equals', value: 'msg-1' }); await testSubjects.click('thresholdPopover'); await testSubjects.setValue('alertThresholdInput', '1'); diff --git a/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js b/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js index a3d226b36e7bc51..c36e20d3d77955f 100644 --- a/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js +++ b/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js @@ -201,7 +201,7 @@ export default ({ getService, getPageObjects }) => { ); const hitCountNumber = await PageObjects.discover.getHitCount(); const originalHitCount = parseInt(hitCountNumber.replace(/\,/g, '')); - await filterBar.addFilter({ field: 'extension.keyword', operation: 'is', value: 'jpg' }); + await filterBar.addFilter({ field: 'extension.keyword', operation: 'equals', value: 'jpg' }); expect(await filterBar.hasFilter('extension.keyword', 'jpg')).to.be(true); await retry.try(async () => { const hitCountNumber = await PageObjects.discover.getHitCount(); diff --git a/x-pack/test_serverless/functional/test_suites/common/context/_context_navigation.ts b/x-pack/test_serverless/functional/test_suites/common/context/_context_navigation.ts index f23ebd55f107290..d6e83215f8f7fdc 100644 --- a/x-pack/test_serverless/functional/test_suites/common/context/_context_navigation.ts +++ b/x-pack/test_serverless/functional/test_suites/common/context/_context_navigation.ts @@ -50,7 +50,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.common.navigateToApp('discover'); await PageObjects.header.waitUntilLoadingHasFinished(); for (const [columnName, value] of TEST_FILTER_COLUMN_NAMES) { - await filterBar.addFilter({ field: columnName, operation: 'is', value }); + await filterBar.addFilter({ field: columnName, operation: 'equals', value }); } // TODO: Serverless sidebar causes the grid to be hidden, so set a larger window size await browser.setWindowSize(1920, 1080); diff --git a/x-pack/test_serverless/functional/test_suites/common/context/_discover_navigation.ts b/x-pack/test_serverless/functional/test_suites/common/context/_discover_navigation.ts index 296a8245f9d1de3..154b57ec53da315 100644 --- a/x-pack/test_serverless/functional/test_suites/common/context/_discover_navigation.ts +++ b/x-pack/test_serverless/functional/test_suites/common/context/_discover_navigation.ts @@ -48,7 +48,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { } for (const [columnName, value] of TEST_FILTER_COLUMN_NAMES) { - await filterBar.addFilter({ field: columnName, operation: 'is', value }); + await filterBar.addFilter({ field: columnName, operation: 'equals', value }); await PageObjects.header.waitUntilLoadingHasFinished(); } // TODO: Serverless sidebar causes the grid to be hidden, so set a larger window size diff --git a/x-pack/test_serverless/functional/test_suites/common/context/_filters.ts b/x-pack/test_serverless/functional/test_suites/common/context/_filters.ts index c27998a658899c5..92567554d1b5f04 100644 --- a/x-pack/test_serverless/functional/test_suites/common/context/_filters.ts +++ b/x-pack/test_serverless/functional/test_suites/common/context/_filters.ts @@ -62,7 +62,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('inclusive filter should be toggleable via the filter bar', async function () { await filterBar.addFilter({ field: TEST_ANCHOR_FILTER_FIELD, - operation: 'is', + operation: 'equals', value: TEST_ANCHOR_FILTER_VALUE, }); await PageObjects.context.waitUntilContextLoadingHasFinished(); @@ -95,7 +95,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const addPinnedFilter = async () => { await filterBar.addFilter({ field: TEST_ANCHOR_FILTER_FIELD, - operation: 'is', + operation: 'equals', value: TEST_ANCHOR_FILTER_VALUE, }); await filterBar.toggleFilterPinned(TEST_ANCHOR_FILTER_FIELD); @@ -132,7 +132,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should preserve filters when the page is refreshed', async function () { await addPinnedFilter(); - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'png' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'png' }); await PageObjects.context.waitUntilContextLoadingHasFinished(); await expectFiltersToExist(); await browser.refresh(); @@ -141,7 +141,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should update filters when navigating forward and backward in history', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'png' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'png' }); await PageObjects.context.waitUntilContextLoadingHasFinished(); expect(await filterBar.getFilterCount()).to.be(1); expect(await filterBar.hasFilter('extension', 'png')).to.be(true); @@ -161,8 +161,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await filterBar.addFilter({ condition: 'OR', filters: [ - { field: 'extension', operation: 'is', value: 'png' }, - { field: 'bytes', operation: 'is between', value: { from: '1000', to: '2000' } }, + { field: 'extension', operation: 'equals', value: 'png' }, + { field: 'bytes', operation: 'between', value: { from: '1000', to: '2000' } }, ], }); @@ -181,8 +181,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await filterBar.addFilter({ condition: 'AND', filters: [ - { field: 'extension', operation: 'is one of', value: ['png', 'jpeg'] }, - { field: 'bytes', operation: 'is between', value: { from: '1000', to: '2000' } }, + { field: 'extension', operation: 'one of', value: ['png', 'jpeg'] }, + { field: 'bytes', operation: 'between', value: { from: '1000', to: '2000' } }, ], }); @@ -205,10 +205,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { condition: 'OR', filters: [ { field: 'clientip', operation: 'does not exist' }, - { field: 'extension', operation: 'is one of', value: ['png', 'jpeg'] }, + { field: 'extension', operation: 'one of', value: ['png', 'jpeg'] }, ], }, - { field: 'bytes', operation: 'is between', value: { from: '1000', to: '2000' } }, + { field: 'bytes', operation: 'between', value: { from: '1000', to: '2000' } }, ], }); @@ -224,7 +224,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should add comma delimiter values', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is one of', value: 'png, jpeg' }); + await filterBar.addFilter({ field: 'extension', operation: 'one of', value: 'png, jpeg' }); await PageObjects.context.waitUntilContextLoadingHasFinished(); expect(await filterBar.getFilterCount()).to.be(1); @@ -236,7 +236,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should display the negated values correctly', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is not', value: 'png' }); + await filterBar.addFilter({ field: 'extension', operation: 'does not equal', value: 'png' }); await PageObjects.context.waitUntilContextLoadingHasFinished(); expect(await filterBar.getFilterCount()).to.be(1); @@ -245,7 +245,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await filterBar.clickEditFilterById('0'); await filterBar.addAndFilter('0'); - await filterBar.createFilter({ field: 'extension', operation: 'is', value: 'jpeg' }, '0.1'); + await filterBar.createFilter( + { field: 'extension', operation: 'equals', value: 'jpeg' }, + '0.1' + ); await testSubjects.clickWhenNotDisabled('saveFilter'); const filterLabelUpdated = await filterBar.getFiltersLabel(); diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group1/_url_state.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group1/_url_state.ts index 0f8c9ffd5474402..9c07af508ad7a25 100644 --- a/x-pack/test_serverless/functional/test_suites/common/discover/group1/_url_state.ts +++ b/x-pack/test_serverless/functional/test_suites/common/discover/group1/_url_state.ts @@ -95,7 +95,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.timePicker.setDefaultAbsoluteRange(); await filterBar.addFilter({ field: 'extension.raw', - operation: 'is one of', + operation: 'one of', value: ['jpg', 'css'], }); await filterBar.toggleFilterPinned('extension.raw'); diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group2/_adhoc_data_views.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group2/_adhoc_data_views.ts index 03dd58892e5cf0d..10fefcb7aea23fb 100644 --- a/x-pack/test_serverless/functional/test_suites/common/discover/group2/_adhoc_data_views.ts +++ b/x-pack/test_serverless/functional/test_suites/common/discover/group2/_adhoc_data_views.ts @@ -96,7 +96,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { it('should support query and filtering', async () => { await filterBar.addFilter({ field: 'nestedField.child', - operation: 'is', + operation: 'equals', value: 'nestedValue', }); expect(await filterBar.hasFilter('nestedField.child', 'nestedValue')).to.be(true); @@ -242,12 +242,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await filterBar.addFilter({ field: 'nestedField.child', - operation: 'is', + operation: 'equals', value: 'nestedValue', }); await PageObjects.header.waitUntilLoadingHasFinished(); - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'jpg' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'jpg' }); await PageObjects.header.waitUntilLoadingHasFinished(); const first = await PageObjects.discover.getCurrentDataViewId(); diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group3/_request_counts.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group3/_request_counts.ts index 8e373bae57ad614..6633f1824fcca0f 100644 --- a/x-pack/test_serverless/functional/test_suites/common/discover/group3/_request_counts.ts +++ b/x-pack/test_serverless/functional/test_suites/common/discover/group3/_request_counts.ts @@ -184,7 +184,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await expectSearches(type, 2, async () => { await filterBar.addFilter({ field: 'extension', - operation: 'is', + operation: 'equals', value: 'jpg', }); }); diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group3/_sidebar.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group3/_sidebar.ts index 0435fdffa7ede41..70ee583445c3441 100644 --- a/x-pack/test_serverless/functional/test_suites/common/discover/group3/_sidebar.ts +++ b/x-pack/test_serverless/functional/test_suites/common/discover/group3/_sidebar.ts @@ -196,7 +196,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.unifiedFieldList.clickFieldListItem('extension'); expect(await testSubjects.getVisibleText('dscFieldStats-topValues')).to.be(allTermsResult); - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'jpg' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'jpg' }); await PageObjects.header.waitUntilLoadingHasFinished(); const onlyJpgResult = 'jpg\n100%'; @@ -492,7 +492,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { 'jpg\n65.0%\ncss\n15.4%\npng\n9.8%\ngif\n6.6%\nphp\n3.2%' ); - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'jpg' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'jpg' }); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded(); diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group3/_unsaved_changes_badge.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group3/_unsaved_changes_badge.ts index 1f6f89a7bb33b83..6c24977c7ed8c68 100644 --- a/x-pack/test_serverless/functional/test_suites/common/discover/group3/_unsaved_changes_badge.ts +++ b/x-pack/test_serverless/functional/test_suites/common/discover/group3/_unsaved_changes_badge.ts @@ -166,7 +166,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); it('should not show the badge after pinning the first filter but after disabling a filter', async () => { - await filterBar.addFilter({ field: 'extension', operation: 'is', value: 'png' }); + await filterBar.addFilter({ field: 'extension', operation: 'equals', value: 'png' }); await filterBar.addFilter({ field: 'bytes', operation: 'exists' }); await PageObjects.discover.saveSearch(SAVED_SEARCH_WITH_FILTERS_NAME); await PageObjects.discover.waitUntilSearchingHasFinished(); diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/x_pack/reporting.ts b/x-pack/test_serverless/functional/test_suites/common/discover/x_pack/reporting.ts index e2a491de828d90d..2ccaa498798b61c 100644 --- a/x-pack/test_serverless/functional/test_suites/common/discover/x_pack/reporting.ts +++ b/x-pack/test_serverless/functional/test_suites/common/discover/x_pack/reporting.ts @@ -341,7 +341,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); // filter - await filterBar.addFilter({ field: 'category', operation: 'is', value: `Men's Shoes` }); + await filterBar.addFilter({ field: 'category', operation: 'equals', value: `Men's Shoes` }); await retry.try(async () => { expect(await PageObjects.discover.getHitCount()).to.equal('154'); }); diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/x_pack/visualize_field.ts b/x-pack/test_serverless/functional/test_suites/common/discover/x_pack/visualize_field.ts index e412fea58df577c..e36fdcfdce91002 100644 --- a/x-pack/test_serverless/functional/test_suites/common/discover/x_pack/visualize_field.ts +++ b/x-pack/test_serverless/functional/test_suites/common/discover/x_pack/visualize_field.ts @@ -71,7 +71,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { it('should preserve app filters in lens', async () => { await filterBar.addFilter({ field: 'bytes', - operation: 'is between', + operation: 'between', value: { from: '3500', to: '4000' }, }); await PageObjects.unifiedFieldList.findFieldByName('geo.src'); diff --git a/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts b/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts index f683e02237996e6..1799b46d6a4f793 100644 --- a/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts +++ b/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts @@ -252,7 +252,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { ruleId = value; } - await filterBar.addFilter({ field: 'rule_id', operation: 'is', value: ruleId }); + await filterBar.addFilter({ field: 'rule_id', operation: 'equals', value: ruleId }); await PageObjects.discover.waitUntilSearchingHasFinished(); const link = await getResultsLink(); @@ -454,7 +454,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { // change rule configuration await testSubjects.click('openEditRuleFlyoutButton'); await queryBar.setQuery('message:msg-1'); - await filterBar.addFilter({ field: 'message.keyword', operation: 'is', value: 'msg-1' }); + await filterBar.addFilter({ field: 'message.keyword', operation: 'equals', value: 'msg-1' }); await testSubjects.click('thresholdPopover'); await testSubjects.setValue('alertThresholdInput', '1'); diff --git a/x-pack/test_serverless/functional/test_suites/common/examples/unified_field_list_examples/field_stats.ts b/x-pack/test_serverless/functional/test_suites/common/examples/unified_field_list_examples/field_stats.ts index 47bbefa0dc8d678..fcee65f5a4d393e 100644 --- a/x-pack/test_serverless/functional/test_suites/common/examples/unified_field_list_examples/field_stats.ts +++ b/x-pack/test_serverless/functional/test_suites/common/examples/unified_field_list_examples/field_stats.ts @@ -130,7 +130,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => { }); it('should apply filters and queries', async () => { - await filterBar.addFilter({ field: 'geo.src', operation: 'is', value: 'US' }); + await filterBar.addFilter({ field: 'geo.src', operation: 'equals', value: 'US' }); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.unifiedFieldList.clickFieldListItem('bytes'); expect(await PageObjects.unifiedFieldList.getFieldStatsViewType()).to.be( @@ -175,7 +175,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => { it('should return a single-value histogram when filtering a precalculated histogram', async () => { await filterBar.addFilter({ field: 'histogram-title', - operation: 'is', + operation: 'equals', value: 'single value', }); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/vega_chart.ts b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/vega_chart.ts index e38c188a7309638..6b266c42f3107a7 100644 --- a/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/vega_chart.ts +++ b/x-pack/test_serverless/functional/test_suites/common/visualizations/group1/vega_chart.ts @@ -90,7 +90,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { const fullDataLabels = await PageObjects.vegaChart.getYAxisLabels(); expect(fullDataLabels[0]).to.eql('0'); expect(fullDataLabels[fullDataLabels.length - 1]).to.eql('1,600'); - await filterBar.addFilter({ field: '@tags.raw', operation: 'is', value: 'error' }); + await filterBar.addFilter({ field: '@tags.raw', operation: 'equals', value: 'error' }); await PageObjects.visChart.waitForVisualizationRenderingStabilized(); const filteredDataLabels = await PageObjects.vegaChart.getYAxisLabels(); expect(filteredDataLabels[0]).to.eql('0'); @@ -254,7 +254,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it('should remove filter by calling "kibanaRemoveFilter" expression', async () => { - await filterBar.addFilter({ field: 'response', operation: 'is', value: '200' }); + await filterBar.addFilter({ field: 'response', operation: 'equals', value: '200' }); expect(await filterBar.getFilterCount()).to.be(1); @@ -266,8 +266,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); it('should remove all filters by calling "kibanaRemoveAllFilters" expression', async () => { - await filterBar.addFilter({ field: 'response', operation: 'is', value: '200' }); - await filterBar.addFilter({ field: 'response', operation: 'is', value: '500' }); + await filterBar.addFilter({ field: 'response', operation: 'equals', value: '200' }); + await filterBar.addFilter({ field: 'response', operation: 'equals', value: '500' }); expect(await filterBar.getFilterCount()).to.be(2);