github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts (#35046)

Browse source
This commit is contained in:
Mike Côté 2019-04-12 23:08:28 -04:00 • committed by GitHub
parent e83895b920
commit acb08ecafa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/api_integration/apis/saved_objects/bulk_get.js
View file

@ -54,9 +54,6 @@ export default function ({ getService }) {
saved_objects: [
{
id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
migrationVersion: {
visualization: '7.0.1'
},
type: 'visualization',
updated_at: '2017-09-21T18:51:23.794Z',
version: resp.body.saved_objects[0].version,
@ -69,9 +66,7 @@ export default function ({ getService }) {
uiStateJSON: resp.body.saved_objects[0].attributes.uiStateJSON,
kibanaSavedObjectMeta: resp.body.saved_objects[0].attributes.kibanaSavedObjectMeta
},
migrationVersion: {
visualization: '7.0.1',
},
migrationVersion: resp.body.saved_objects[0].migrationVersion,
references: [{
name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
type: 'index-pattern',
@ -99,6 +94,7 @@ export default function ({ getService }) {
}
]
});
expect(resp.body.saved_objects[0].migrationVersion).to.be.ok();
})
));
});

16
test/api_integration/apis/saved_objects/create.js
View file

@ -47,19 +47,15 @@ export default function ({ getService }) {
expect(resp.body).to.eql({
id: resp.body.id,
type: 'visualization',
migrationVersion: {
visualization: '7.0.1'
},
migrationVersion: resp.body.migrationVersion,
updated_at: resp.body.updated_at,
version: 'WzgsMV0=',
attributes: {
title: 'My favorite vis'
},
migrationVersion: {
visualization: '7.0.1',
},
references: [],
});
expect(resp.body.migrationVersion).to.be.ok();
});
});
});
@ -92,19 +88,15 @@ export default function ({ getService }) {
expect(resp.body).to.eql({
id: resp.body.id,
type: 'visualization',
migrationVersion: {
visualization: '7.0.1'
},
migrationVersion: resp.body.migrationVersion,
updated_at: resp.body.updated_at,
version: 'WzAsMV0=',
attributes: {
title: 'My favorite vis'
},
migrationVersion: {
visualization: '7.0.1',
},
references: [],
});
expect(resp.body.migrationVersion).to.be.ok();
});
expect(await es.indices.exists({ index: '.kibana' }))

5
test/api_integration/apis/saved_objects/find.js
View file

@ -46,9 +46,7 @@ export default function ({ getService }) {
attributes: {
'title': 'Count of requests'
},
migrationVersion: {
visualization: '7.0.1',
},
migrationVersion: resp.body.saved_objects[0].migrationVersion,
references: [
{
id: '91200a00-9efd-11e7-acb3-3dab96693fab',
@ -60,6 +58,7 @@ export default function ({ getService }) {
}
]
});
expect(resp.body.saved_objects[0].migrationVersion).to.be.ok();
})
));

8
test/api_integration/apis/saved_objects/get.js
View file

@ -36,15 +36,10 @@ export default function ({ getService }) {
.then(resp => {
expect(resp.body).to.eql({
id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
migrationVersion: {
visualization: '7.0.1'
},
type: 'visualization',
updated_at: '2017-09-21T18:51:23.794Z',
version: resp.body.version,
migrationVersion: {
visualization: '7.0.1',
},
migrationVersion: resp.body.migrationVersion,
attributes: {
title: 'Count of requests',
description: '',
@ -60,6 +55,7 @@ export default function ({ getService }) {
id: '91200a00-9efd-11e7-acb3-3dab96693fab',
}],
});
expect(resp.body.migrationVersion).to.be.ok();
})
));

4
x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts
View file

@ -89,9 +89,7 @@ export function bulkGetTestSuiteFactory(esArchiver: any, supertest: SuperTest<an
{
id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
type: 'visualization',
migrationVersion: {
visualization: '7.0.1',
},
migrationVersion: resp.body.saved_objects[0].migrationVersion,
updated_at: '2017-09-21T18:51:23.794Z',
version: resp.body.saved_objects[0].version,
attributes: {

4
x-pack/test/saved_object_api_integration/common/suites/create.ts
View file

@ -58,9 +58,7 @@ export function createTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
expect(resp.body).to.eql({
id: resp.body.id,
migrationVersion: {
visualization: '7.0.1',
},
migrationVersion: resp.body.migrationVersion,
type: spaceAwareType,
updated_at: resp.body.updated_at,
version: resp.body.version,

4
x-pack/test/saved_object_api_integration/common/suites/find.ts
View file

@ -101,9 +101,7 @@ export function findTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>)
attributes: {
title: 'Count of requests',
},
migrationVersion: {
visualization: '7.0.1',
},
migrationVersion: resp.body.saved_objects[0].migrationVersion,
references: [
{
id: `${getIdPrefix(spaceId)}91200a00-9efd-11e7-acb3-3dab96693fab`,

4
x-pack/test/saved_object_api_integration/common/suites/get.ts
View file

@ -95,9 +95,7 @@ export function getTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>)
expect(resp.body).to.eql({
id: `${getIdPrefix(spaceId)}dd7caf20-9efd-11e7-acb3-3dab96693fab`,
type: 'visualization',
migrationVersion: {
visualization: '7.0.1',
},
migrationVersion: resp.body.migrationVersion,
updated_at: '2017-09-21T18:51:23.794Z',
version: resp.body.version,
attributes: {