From a9cbfbd1535ef21b4773f0b8d4b69bb5f32f6ef8 Mon Sep 17 00:00:00 2001 From: spalger Date: Tue, 8 Jun 2021 15:22:16 -0700 Subject: [PATCH] adapt other `saved_objects/*` archives --- .../api_integration/apis/saved_objects/export.ts | 12 ++++++++---- test/api_integration/apis/saved_objects/find.ts | 16 ++++++++++++---- .../apis/saved_objects_management/find.ts | 8 ++++++-- .../apis/telemetry/telemetry_local.ts | 12 ++++++++---- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/test/api_integration/apis/saved_objects/export.ts b/test/api_integration/apis/saved_objects/export.ts index 467e46a8de3dd..000b7f155a743 100644 --- a/test/api_integration/apis/saved_objects/export.ts +++ b/test/api_integration/apis/saved_objects/export.ts @@ -269,8 +269,12 @@ export default function ({ getService }: FtrProviderContext) { }); describe('10,000 objects', () => { - before(() => esArchiver.load('saved_objects/10k')); - after(() => esArchiver.unload('saved_objects/10k')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/10k') + ); + after(() => + esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/10k') + ); it('should return 400 when exporting without type or objects passed in', async () => { await supertest @@ -497,7 +501,7 @@ export default function ({ getService }: FtrProviderContext) { describe('10,001 objects', () => { let customVisId: string; before(async () => { - await esArchiver.load('saved_objects/10k'); + await esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/10k'); await supertest .post('/api/saved_objects/visualization') .send({ @@ -512,7 +516,7 @@ export default function ({ getService }: FtrProviderContext) { }); after(async () => { await supertest.delete(`/api/saved_objects/visualization/${customVisId}`).expect(200); - await esArchiver.unload('saved_objects/10k'); + await esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/10k'); }); it('should allow exporting more than 10,000 objects if permitted by maxImportExportSize', async () => { diff --git a/test/api_integration/apis/saved_objects/find.ts b/test/api_integration/apis/saved_objects/find.ts index ed48ce0c55502..5f4c6e696b6cf 100644 --- a/test/api_integration/apis/saved_objects/find.ts +++ b/test/api_integration/apis/saved_objects/find.ts @@ -244,8 +244,12 @@ export default function ({ getService }: FtrProviderContext) { }); describe('`has_reference` and `has_reference_operator` parameters', () => { - before(() => esArchiver.load('saved_objects/references')); - after(() => esArchiver.unload('saved_objects/references')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/references') + ); + after(() => + esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/references') + ); it('search for a reference', async () => { await supertest @@ -307,8 +311,12 @@ export default function ({ getService }: FtrProviderContext) { }); describe('searching for special characters', () => { - before(() => esArchiver.load('saved_objects/find_edgecases')); - after(() => esArchiver.unload('saved_objects/find_edgecases')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases') + ); + after(() => + esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases') + ); it('can search for objects with dashes', async () => await supertest diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts index 19f57e8cd2fb0..118f2fb1e91eb 100644 --- a/test/api_integration/apis/saved_objects_management/find.ts +++ b/test/api_integration/apis/saved_objects_management/find.ts @@ -90,8 +90,12 @@ export default function ({ getService }: FtrProviderContext) { }); describe('`hasReference` and `hasReferenceOperator` parameters', () => { - before(() => esArchiver.load('saved_objects/references')); - after(() => esArchiver.unload('saved_objects/references')); + before(() => + esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/references') + ); + after(() => + esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/references') + ); it('search for a reference', async () => { await supertest diff --git a/test/api_integration/apis/telemetry/telemetry_local.ts b/test/api_integration/apis/telemetry/telemetry_local.ts index 1da86b1e444d0..7562a8b318f4d 100644 --- a/test/api_integration/apis/telemetry/telemetry_local.ts +++ b/test/api_integration/apis/telemetry/telemetry_local.ts @@ -189,8 +189,12 @@ export default function ({ getService }: FtrProviderContext) { }); describe('UI Counters telemetry', () => { - before('Add UI Counters saved objects', () => esArchiver.load('saved_objects/ui_counters')); - after('cleanup saved objects changes', () => esArchiver.unload('saved_objects/ui_counters')); + before('Add UI Counters saved objects', () => + esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/ui_counters') + ); + after('cleanup saved objects changes', () => + esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/ui_counters') + ); it('returns ui counters aggregated by day', async () => { const stats = await retrieveTelemetry(supertest); expect(stats.stack_stats.kibana.plugins.ui_counters).to.eql(basicUiCounters); @@ -199,10 +203,10 @@ export default function ({ getService }: FtrProviderContext) { describe('Usage Counters telemetry', () => { before('Add UI Counters saved objects', () => - esArchiver.load('saved_objects/usage_counters') + esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/usage_counters') ); after('cleanup saved objects changes', () => - esArchiver.unload('saved_objects/usage_counters') + esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/usage_counters') ); it('returns usage counters aggregated by day', async () => {