From 1572e5d5bf5648e4906e59b245ebe920aaff9786 Mon Sep 17 00:00:00 2001 From: Nodir Latipov Date: Wed, 18 May 2022 00:34:00 +0500 Subject: [PATCH] fix: rollback test --- .../value_suggestion_provider.test.ts | 38 +++++++++---------- .../lib/filter_editor_utils.test.ts | 33 ++++++++-------- .../query_string_input.test.tsx | 32 ++++++++-------- 3 files changed, 51 insertions(+), 52 deletions(-) diff --git a/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts index 9c38ec0e9b4acd..a17172a2b60728 100644 --- a/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts +++ b/src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts @@ -7,8 +7,7 @@ */ import { IUiSettingsClient, CoreSetup } from '@kbn/core/public'; -import { stubFields } from '@kbn/data-views-plugin/common/stubs'; -import { stubDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { stubIndexPattern, stubFields } from '@kbn/data-plugin/public/stubs'; import type { TimefilterSetup } from '@kbn/data-plugin/public'; import { UI_SETTINGS } from '@kbn/data-plugin/common'; import { setupValueSuggestionProvider } from './value_suggestion_provider'; @@ -49,7 +48,7 @@ describe('FieldSuggestions', () => { it('should return an empty array', async () => { const suggestions = await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field: stubFields[0], query: '', }); @@ -65,7 +64,7 @@ describe('FieldSuggestions', () => { it('should return true/false for boolean fields', async () => { const [field] = stubFields.filter(({ type }) => type === 'boolean'); const suggestions = await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', }); @@ -77,7 +76,7 @@ describe('FieldSuggestions', () => { it('should return an empty array if the field type is not a string or boolean', async () => { const [field] = stubFields.filter(({ type }) => type !== 'string' && type !== 'boolean'); const suggestions = await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', }); @@ -89,7 +88,7 @@ describe('FieldSuggestions', () => { it('should return an empty array if the field is not aggregatable', async () => { const [field] = stubFields.filter(({ aggregatable }) => !aggregatable); const suggestions = await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', }); @@ -104,7 +103,7 @@ describe('FieldSuggestions', () => { ); await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', useTimeRange: false, @@ -118,7 +117,7 @@ describe('FieldSuggestions', () => { ({ type, aggregatable }) => type === 'string' && aggregatable ); const args = { - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', useTimeRange: false, @@ -135,7 +134,7 @@ describe('FieldSuggestions', () => { ({ type, aggregatable }) => type === 'string' && aggregatable ); const args = { - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', useTimeRange: false, @@ -159,34 +158,35 @@ describe('FieldSuggestions', () => { ); await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field: fields[0], query: '', useTimeRange: false, }); await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field: fields[0], query: 'query', useTimeRange: false, }); await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field: fields[1], query: '', useTimeRange: false, }); await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field: fields[1], query: 'query', useTimeRange: false, }); - const customIndexPattern = Object.assign({}, stubDataView, { + const customIndexPattern = { + ...stubIndexPattern, title: 'customIndexPattern', useTimeRange: false, - }); + }; await getValueSuggestions({ indexPattern: customIndexPattern, @@ -222,7 +222,7 @@ describe('FieldSuggestions', () => { ); await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', useTimeRange: true, @@ -243,7 +243,7 @@ describe('FieldSuggestions', () => { ); await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', useTimeRange: true, @@ -263,7 +263,7 @@ describe('FieldSuggestions', () => { ); await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', useTimeRange: true, @@ -283,7 +283,7 @@ describe('FieldSuggestions', () => { ); await getValueSuggestions({ - indexPattern: stubDataView, + indexPattern: stubIndexPattern, field, query: '', useTimeRange: true, diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts index 0b93dd8e7b4f95..d6c44228eb72fa 100644 --- a/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts +++ b/src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.test.ts @@ -11,11 +11,10 @@ import { phraseFilter, phrasesFilter, rangeFilter, + stubIndexPattern, + stubFields, } from '@kbn/data-plugin/common/stubs'; -import { stubDataView } from '@kbn/data-views-plugin/common/data_view.stub'; -import { stubFields } from '@kbn/data-views-plugin/common/stubs'; - -import { toggleFilterNegated } from '@kbn/es-query'; +import { toggleFilterNegated } from '@kbn/data-plugin/common'; import { getFieldFromFilter, getFilterableFields, @@ -29,7 +28,7 @@ import { existsOperator, isBetweenOperator, isOneOfOperator, isOperator } from ' describe('Filter editor utils', () => { describe('getFieldFromFilter', () => { it('should return the field from the filter', () => { - const field = getFieldFromFilter(phraseFilter, stubDataView); + const field = getFieldFromFilter(phraseFilter, stubIndexPattern); expect(field).not.toBeUndefined(); expect(field && field.name).toBe(phraseFilter.meta.key); }); @@ -99,12 +98,12 @@ describe('Filter editor utils', () => { describe('getFilterableFields', () => { it('returns the list of fields from the given index pattern', () => { - const fieldOptions = getFilterableFields(stubDataView); + const fieldOptions = getFilterableFields(stubIndexPattern); expect(fieldOptions.length).toBeGreaterThan(0); }); it('limits the fields to the filterable fields', () => { - const fieldOptions = getFilterableFields(stubDataView); + const fieldOptions = getFilterableFields(stubIndexPattern); const nonFilterableFields = fieldOptions.filter((field) => !field.filterable); expect(nonFilterableFields.length).toBe(0); }); @@ -140,39 +139,39 @@ describe('Filter editor utils', () => { }); it('should return false if field is not provided', () => { - const isValid = isFilterValid(stubDataView, undefined, isOperator, 'foo'); + const isValid = isFilterValid(stubIndexPattern, undefined, isOperator, 'foo'); expect(isValid).toBe(false); }); it('should return false if operator is not provided', () => { - const isValid = isFilterValid(stubDataView, stubFields[0], undefined, 'foo'); + const isValid = isFilterValid(stubIndexPattern, stubFields[0], undefined, 'foo'); expect(isValid).toBe(false); }); it('should return false for phrases filter without phrases', () => { - const isValid = isFilterValid(stubDataView, stubFields[0], isOneOfOperator, []); + const isValid = isFilterValid(stubIndexPattern, stubFields[0], isOneOfOperator, []); expect(isValid).toBe(false); }); it('should return true for phrases filter with phrases', () => { - const isValid = isFilterValid(stubDataView, stubFields[0], isOneOfOperator, ['foo']); + const isValid = isFilterValid(stubIndexPattern, stubFields[0], isOneOfOperator, ['foo']); expect(isValid).toBe(true); }); it('should return false for range filter without range', () => { - const isValid = isFilterValid(stubDataView, stubFields[0], isBetweenOperator, undefined); + const isValid = isFilterValid(stubIndexPattern, stubFields[0], isBetweenOperator, undefined); expect(isValid).toBe(false); }); it('should return true for range filter with from', () => { - const isValid = isFilterValid(stubDataView, stubFields[0], isBetweenOperator, { + const isValid = isFilterValid(stubIndexPattern, stubFields[0], isBetweenOperator, { from: 'foo', }); expect(isValid).toBe(true); }); it('should return true for range filter with from/to', () => { - const isValid = isFilterValid(stubDataView, stubFields[0], isBetweenOperator, { + const isValid = isFilterValid(stubIndexPattern, stubFields[0], isBetweenOperator, { from: 'foo', to: 'goo', }); @@ -180,7 +179,7 @@ describe('Filter editor utils', () => { }); it('should return false for date range filter with bad from', () => { - const isValid = isFilterValid(stubDataView, stubFields[4], isBetweenOperator, { + const isValid = isFilterValid(stubIndexPattern, stubFields[4], isBetweenOperator, { from: 'foo', to: 'now', }); @@ -188,7 +187,7 @@ describe('Filter editor utils', () => { }); it('should return false for date range filter with bad to', () => { - const isValid = isFilterValid(stubDataView, stubFields[4], isBetweenOperator, { + const isValid = isFilterValid(stubIndexPattern, stubFields[4], isBetweenOperator, { from: '2020-01-01', to: 'mau', }); @@ -196,7 +195,7 @@ describe('Filter editor utils', () => { }); it('should return true for exists filter without params', () => { - const isValid = isFilterValid(stubDataView, stubFields[0], existsOperator); + const isValid = isFilterValid(stubIndexPattern, stubFields[0], existsOperator); expect(isValid).toBe(true); }); }); diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx index 491f9c6cf991be..7437bf5fd4ece9 100644 --- a/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx +++ b/src/plugins/unified_search/public/query_string_input/query_string_input.test.tsx @@ -25,7 +25,7 @@ import QueryStringInputUI from './query_string_input'; import { coreMock } from '@kbn/core/public/mocks'; import { dataPluginMock } from '@kbn/data-plugin/public/mocks'; -import { stubDataView } from '@kbn/data-views-plugin/common/data_view.stub'; +import { stubIndexPattern } from '@kbn/data-plugin/public/stubs'; import { KibanaContextProvider, withKibana } from '@kbn/kibana-react-plugin/public'; import { setAutocomplete } from '../services'; @@ -105,7 +105,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onSubmit: noop, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], }) ); @@ -117,7 +117,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: luceneQuery, onSubmit: noop, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], }) ); expect(component.find(QueryLanguageSwitcher).prop('language')).toBe(luceneQuery.language); @@ -128,7 +128,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onSubmit: noop, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, }) ); @@ -142,7 +142,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onSubmit: noop, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, appName: 'discover', }) @@ -158,7 +158,7 @@ describe('QueryStringInput', () => { { query: kqlQuery, onSubmit: mockCallback, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, appName: 'discover', }, @@ -176,7 +176,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: luceneQuery, onSubmit: noop, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableLanguageSwitcher: true, }) ); @@ -188,7 +188,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: luceneQuery, onSubmit: noop, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], iconType: 'search', }) ); @@ -202,7 +202,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onSubmit: mockCallback, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, }) ); @@ -223,7 +223,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onBlur: mockCallback, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, }) ); @@ -242,7 +242,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onChangeQueryInputFocus: mockCallback, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, }) ); @@ -267,7 +267,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onChangeQueryInputFocus: mockCallback, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, }) ); @@ -294,7 +294,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onSubmit: mockCallback, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, submitOnBlur: true, }) @@ -320,7 +320,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onSubmit: mockCallback, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, }) ); @@ -342,7 +342,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onSubmit: noop, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, persistedLog: mockPersistedLog, }) @@ -381,7 +381,7 @@ describe('QueryStringInput', () => { wrapQueryStringInputInContext({ query: kqlQuery, onChange: mockCallback, - indexPatterns: [stubDataView], + indexPatterns: [stubIndexPattern], disableAutoFocus: true, }) );