Skip to content

Commit da040d7

Browse files
flash1293flash1293
committed
fix tests
1 parent c9b0cc0 commit da040d7

12 files changed

Lines changed: 994 additions & 986 deletions

File tree

‎packages/kbn-unified-field-list/src/components/field_list_grouped/field_list_grouped.test.tsx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
144144
ExistenceFetchStatus.succeeded
145145
);
146146
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
147-
'25 available fields. 3 meta fields.'
147+
'25 available fields. 4 meta fields.'
148148
);
149149
expect(wrapper.find(FieldsAccordion)).toHaveLength(2);
150150
expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
@@ -173,7 +173,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
173173
ExistenceFetchStatus.failed
174174
);
175175
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
176-
'25 available fields. 3 meta fields.'
176+
'25 available fields. 4 meta fields.'
177177
);
178178
expect(wrapper.find(FieldsAccordion)).toHaveLength(2);
179179
expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
@@ -242,7 +242,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
242242
});
243243

244244
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
245-
'25 available fields. 3 meta fields.'
245+
'25 available fields. 4 meta fields.'
246246
);
247247
expect(
248248
wrapper.find(FieldsAccordion).map((accordion) => accordion.prop('paginatedFields').length)
@@ -275,7 +275,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
275275
});
276276

277277
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
278-
'25 available fields. 112 unmapped fields. 3 meta fields.'
278+
'25 available fields. 112 unmapped fields. 4 meta fields.'
279279
);
280280
expect(
281281
wrapper.find(FieldsAccordion).map((accordion) => accordion.prop('paginatedFields').length)
@@ -322,7 +322,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
322322
});
323323

324324
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
325-
'25 available fields. 112 unmapped fields. 3 meta fields.'
325+
'25 available fields. 112 unmapped fields. 4 meta fields.'
326326
);
327327

328328
await act(async () => {
@@ -350,7 +350,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
350350
});
351351

352352
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
353-
'3 available fields. 24 unmapped fields. 3 meta fields.'
353+
'3 available fields. 24 unmapped fields. 4 meta fields.'
354354
);
355355

356356
await act(async () => {
@@ -385,7 +385,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
385385
});
386386

387387
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
388-
'25 available fields. 112 unmapped fields. 3 meta fields.'
388+
'25 available fields. 112 unmapped fields. 4 meta fields.'
389389
);
390390

391391
await act(async () => {
@@ -399,7 +399,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
399399
});
400400

401401
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
402-
'23 available fields. 104 unmapped fields. 3 meta fields.'
402+
'23 available fields. 104 unmapped fields. 4 meta fields.'
403403
);
404404
});
405405

@@ -417,7 +417,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
417417
});
418418

419419
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
420-
'25 available fields. 112 unmapped fields. 3 meta fields.'
420+
'25 available fields. 112 unmapped fields. 4 meta fields.'
421421
);
422422

423423
await act(async () => {
@@ -432,7 +432,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
432432
});
433433

434434
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
435-
'2 selected fields. 25 available fields. 112 unmapped fields. 3 meta fields.'
435+
'2 selected fields. 25 available fields. 112 unmapped fields. 4 meta fields.'
436436
);
437437
});
438438

@@ -452,7 +452,7 @@ describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
452452
});
453453

454454
expect(wrapper.find(`#${defaultProps.screenReaderDescriptionId}`).first().text()).toBe(
455-
'2 selected fields. 10 popular fields. 25 available fields. 112 unmapped fields. 3 meta fields.'
455+
'2 selected fields. 10 popular fields. 25 available fields. 112 unmapped fields. 4 meta fields.'
456456
);
457457
});
458458

‎test/examples/unified_field_list_examples/existing_fields.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { FtrProviderContext } from '../../functional/ftr_provider_context';
1111

1212
const TEST_START_TIME = 'Jan 2, 2021 @ 00:00:00.000';
1313
const TEST_END_TIME = 'Jan 2, 2022 @ 00:00:00.000';
14-
const metaFields = ['_id', '_index', '_score'];
14+
const metaFields = ['_id', '_index', '_score', '_ignored'];
1515

1616
const fieldsWithData = [
1717
'ts',

‎test/functional/apps/discover/group3/_drag_drop.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
4848
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
4949

5050
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
51-
'48 available fields. 5 empty fields. 3 meta fields.'
51+
'48 available fields. 5 empty fields. 4 meta fields.'
5252
);
5353
expect((await PageObjects.discover.getColumnHeaders()).join(', ')).to.be(
5454
'@timestamp, Document'
@@ -72,7 +72,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
7272
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
7373

7474
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
75-
'48 available fields. 5 empty fields. 3 meta fields.'
75+
'48 available fields. 5 empty fields. 4 meta fields.'
7676
);
7777
expect((await PageObjects.discover.getColumnHeaders()).join(', ')).to.be(
7878
'@timestamp, Document'

‎test/functional/apps/discover/group6/_sidebar.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
2929
const dataViews = getService('dataViews');
3030
const retry = getService('retry');
3131
const dataGrid = getService('dataGrid');
32-
const INITIAL_FIELD_LIST_SUMMARY = '48 available fields. 5 empty fields. 3 meta fields.';
32+
const INITIAL_FIELD_LIST_SUMMARY = '48 available fields. 5 empty fields. 4 meta fields.';
3333

3434
describe('discover sidebar', function describeIndexTests() {
3535
before(async function () {
@@ -82,7 +82,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
8282
await retry.waitFor('second updates', async () => {
8383
return (
8484
(await PageObjects.unifiedFieldList.getSidebarAriaDescription()) ===
85-
'10 available fields. 3 empty fields. 3 meta fields.'
85+
'10 available fields. 3 empty fields. 4 meta fields.'
8686
);
8787
});
8888

@@ -382,7 +382,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
382382
).to.be('relatedContent');
383383

384384
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
385-
'48 available fields. 1 unmapped field. 5 empty fields. 3 meta fields.'
385+
'48 available fields. 1 unmapped field. 5 empty fields. 4 meta fields.'
386386
);
387387
});
388388

@@ -403,7 +403,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
403403
expect(availableFields.includes('@message')).to.be(true);
404404

405405
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
406-
'2 selected fields. 2 popular fields. 48 available fields. 5 empty fields. 3 meta fields.'
406+
'2 selected fields. 2 popular fields. 48 available fields. 5 empty fields. 4 meta fields.'
407407
);
408408

409409
await PageObjects.unifiedFieldList.clickFieldListItemRemove('@message');
@@ -423,7 +423,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
423423
).to.be('@message, _id, extension');
424424

425425
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
426-
'3 selected fields. 3 popular fields. 48 available fields. 5 empty fields. 3 meta fields.'
426+
'3 selected fields. 3 popular fields. 48 available fields. 5 empty fields. 4 meta fields.'
427427
);
428428
});
429429

@@ -475,7 +475,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
475475
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
476476

477477
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
478-
'48 available fields. 5 empty fields. 3 meta fields.'
478+
'48 available fields. 5 empty fields. 4 meta fields.'
479479
);
480480
});
481481

@@ -542,7 +542,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
542542
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
543543

544544
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
545-
'6 available fields. 3 meta fields.'
545+
'6 available fields. 4 meta fields.'
546546
);
547547

548548
await dataViews.switchToAndValidate('with-timefield');
@@ -551,7 +551,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
551551
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
552552

553553
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
554-
'0 available fields. 7 empty fields. 3 meta fields.'
554+
'0 available fields. 7 empty fields. 4 meta fields.'
555555
);
556556
await testSubjects.existOrFail(
557557
`${PageObjects.unifiedFieldList.getSidebarSectionSelector(
@@ -621,7 +621,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
621621
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
622622

623623
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
624-
'6873 available fields. 3 meta fields.'
624+
'6873 available fields. 4 meta fields.'
625625
);
626626

627627
await dataViews.switchToAndValidate('logstash-*');
@@ -665,7 +665,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
665665
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
666666

667667
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
668-
'49 available fields. 5 empty fields. 3 meta fields.'
668+
'49 available fields. 5 empty fields. 4 meta fields.'
669669
);
670670

671671
let allFields = await PageObjects.unifiedFieldList.getAllFieldNames();
@@ -684,7 +684,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
684684
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
685685

686686
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
687-
'49 available fields. 5 empty fields. 3 meta fields.'
687+
'49 available fields. 5 empty fields. 4 meta fields.'
688688
);
689689

690690
allFields = await PageObjects.unifiedFieldList.getAllFieldNames();
@@ -721,7 +721,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
721721

722722
// check that the sidebar is rendered
723723
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
724-
'49 available fields. 5 empty fields. 3 meta fields.'
724+
'49 available fields. 5 empty fields. 4 meta fields.'
725725
);
726726
let allFields = await PageObjects.unifiedFieldList.getAllFieldNames();
727727
expect(allFields.includes('_invalid-runtimefield')).to.be(true);
@@ -761,7 +761,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
761761
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
762762

763763
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
764-
'0 available fields. 7 empty fields. 3 meta fields.'
764+
'0 available fields. 7 empty fields. 4 meta fields.'
765765
);
766766
await testSubjects.existOrFail(
767767
`${PageObjects.unifiedFieldList.getSidebarSectionSelector(
@@ -778,7 +778,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
778778
await PageObjects.unifiedFieldList.waitUntilSidebarHasLoaded();
779779

780780
expect(await PageObjects.unifiedFieldList.getSidebarAriaDescription()).to.be(
781-
'7 available fields. 3 meta fields.'
781+
'7 available fields. 4 meta fields.'
782782
);
783783

784784
await kibanaServer.importExport.unload(

‎test/plugin_functional/test_suites/data_plugin/index_patterns.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
3434
indexPatternId = body.id;
3535
expect(body.id).not.empty();
3636
expect(body.title).to.equal(title);
37-
expect(body.fields.length).to.equal(14);
37+
expect(body.fields.length).to.equal(15);
3838
expect(body.fieldFormatMap).to.eql(fieldFormats);
3939
});
4040

‎x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_pivot_dropdown_options.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export function getPivotDropdownOptions(
6969
const aggOptions: DropDownOptionWithField[] = [];
7070
const aggOptionsData: PivotAggsConfigWithUiSupportDict = {};
7171

72-
const ignoreFieldNames = ['_id', '_index', '_type'];
72+
const ignoreFieldNames = ['_id', '_index', '_type', '_ignored'];
7373
const dataViewFields = dataView.fields
7474
.filter(
7575
(field) =>

‎x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,15 @@ function getOptions(
4949
.filter((ip) => ip.runtimeField === undefined)
5050
: [];
5151

52-
const ignoreFieldNames = new Set(['_source', '_type', '_index', '_id', '_version', '_score']);
52+
const ignoreFieldNames = new Set([
53+
'_source',
54+
'_type',
55+
'_index',
56+
'_id',
57+
'_version',
58+
'_score',
59+
'_ignored',
60+
]);
5361

5462
const runtimeFieldsOptions = runtimeMappings
5563
? Object.entries(runtimeMappings).map(([fieldName, fieldMapping]) => ({

0 commit comments

Comments
 (0)