Skip to content

Commit

Permalink
fix merge issue (elastic#126179)
Browse files Browse the repository at this point in the history
Co-authored-by: Kibana Machine <[email protected]>
  • Loading branch information
Lee Drengenberg and kibanamachine authored Feb 24, 2022
1 parent 219ada4 commit 753306b
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await esArchiver.loadIfNeeded(
'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
);
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load(
'test/functional/fixtures/kbn_archiver/index_pattern_without_timefield'
);
await kibanaServer.uiSettings.replace({
defaultIndex: 'without-timefield',
'timepicker:timeDefaults': '{ "from": "2019-01-18T19:37:13.000Z", "to": "now"}',
Expand All @@ -37,6 +41,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
);
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
});

it('should not display a timepicker', async () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
{
"type": "doc",
"value": {
"id": "index-pattern:without-timefield",
"index": ".kibana",
"source": {
"index-pattern": {
"fields": "[]",
"title": "without-timefield"
},
"type": "index-pattern"
}
}
}

{
"type": "doc",
"value": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"attributes": {
"fields": "[]",
"timeFieldName": "@timestamp",
"title": "with-timefield"
},
"coreMigrationVersion": "7.17.1",
"id": "with-timefield",
"migrationVersion": {
"index-pattern": "7.11.0"
},
"references": [],
"type": "index-pattern",
"version": "WzEzLDJd"
}

{
"attributes": {
"fields": "[]",
"title": "without-timefield"
},
"coreMigrationVersion": "7.17.1",
"id": "without-timefield",
"migrationVersion": {
"index-pattern": "7.11.0"
},
"references": [],
"type": "index-pattern",
"version": "WzEyLDJd"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';

export default function ({ getService, getPageObjects }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const queryBar = getService('queryBar');
const PageObjects = getPageObjects(['common', 'settings', 'context', 'header']);

Expand All @@ -17,12 +18,23 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await esArchiver.loadIfNeeded(
'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
);
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load(
'test/functional/fixtures/kbn_archiver/index_pattern_without_timefield'
);
await kibanaServer.uiSettings.replace({ defaultIndex: 'without-timefield' });
await kibanaServer.uiSettings.update({
'doc_table:legacy': true,
});
});

after(async () => {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
);
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.uiSettings.unset('defaultIndex');
await kibanaServer.uiSettings.unset('doc_table:legacy');
});

it('shows all autosuggest options for a filter in discover context app', async () => {
Expand Down

0 comments on commit 753306b

Please sign in to comment.