Skip to content

Commit a9cbfbd

Browse files
spalgerspalger
committed
adapt other saved_objects/* archives
1 parent d349c23 commit a9cbfbd

4 files changed

Lines changed: 34 additions & 14 deletions

File tree

‎test/api_integration/apis/saved_objects/export.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,12 @@ export default function ({ getService }: FtrProviderContext) {
269269
});
270270

271271
describe('10,000 objects', () => {
272-
before(() => esArchiver.load('saved_objects/10k'));
273-
after(() => esArchiver.unload('saved_objects/10k'));
272+
before(() =>
273+
esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/10k')
274+
);
275+
after(() =>
276+
esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/10k')
277+
);
274278

275279
it('should return 400 when exporting without type or objects passed in', async () => {
276280
await supertest
@@ -497,7 +501,7 @@ export default function ({ getService }: FtrProviderContext) {
497501
describe('10,001 objects', () => {
498502
let customVisId: string;
499503
before(async () => {
500-
await esArchiver.load('saved_objects/10k');
504+
await esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/10k');
501505
await supertest
502506
.post('/api/saved_objects/visualization')
503507
.send({
@@ -512,7 +516,7 @@ export default function ({ getService }: FtrProviderContext) {
512516
});
513517
after(async () => {
514518
await supertest.delete(`/api/saved_objects/visualization/${customVisId}`).expect(200);
515-
await esArchiver.unload('saved_objects/10k');
519+
await esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/10k');
516520
});
517521

518522
it('should allow exporting more than 10,000 objects if permitted by maxImportExportSize', async () => {

‎test/api_integration/apis/saved_objects/find.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,12 @@ export default function ({ getService }: FtrProviderContext) {
244244
});
245245

246246
describe('`has_reference` and `has_reference_operator` parameters', () => {
247-
before(() => esArchiver.load('saved_objects/references'));
248-
after(() => esArchiver.unload('saved_objects/references'));
247+
before(() =>
248+
esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/references')
249+
);
250+
after(() =>
251+
esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/references')
252+
);
249253

250254
it('search for a reference', async () => {
251255
await supertest
@@ -307,8 +311,12 @@ export default function ({ getService }: FtrProviderContext) {
307311
});
308312

309313
describe('searching for special characters', () => {
310-
before(() => esArchiver.load('saved_objects/find_edgecases'));
311-
after(() => esArchiver.unload('saved_objects/find_edgecases'));
314+
before(() =>
315+
esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases')
316+
);
317+
after(() =>
318+
esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases')
319+
);
312320

313321
it('can search for objects with dashes', async () =>
314322
await supertest

‎test/api_integration/apis/saved_objects_management/find.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,12 @@ export default function ({ getService }: FtrProviderContext) {
9090
});
9191

9292
describe('`hasReference` and `hasReferenceOperator` parameters', () => {
93-
before(() => esArchiver.load('saved_objects/references'));
94-
after(() => esArchiver.unload('saved_objects/references'));
93+
before(() =>
94+
esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/references')
95+
);
96+
after(() =>
97+
esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/references')
98+
);
9599

96100
it('search for a reference', async () => {
97101
await supertest

‎test/api_integration/apis/telemetry/telemetry_local.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,12 @@ export default function ({ getService }: FtrProviderContext) {
189189
});
190190

191191
describe('UI Counters telemetry', () => {
192-
before('Add UI Counters saved objects', () => esArchiver.load('saved_objects/ui_counters'));
193-
after('cleanup saved objects changes', () => esArchiver.unload('saved_objects/ui_counters'));
192+
before('Add UI Counters saved objects', () =>
193+
esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/ui_counters')
194+
);
195+
after('cleanup saved objects changes', () =>
196+
esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/ui_counters')
197+
);
194198
it('returns ui counters aggregated by day', async () => {
195199
const stats = await retrieveTelemetry(supertest);
196200
expect(stats.stack_stats.kibana.plugins.ui_counters).to.eql(basicUiCounters);
@@ -199,10 +203,10 @@ export default function ({ getService }: FtrProviderContext) {
199203

200204
describe('Usage Counters telemetry', () => {
201205
before('Add UI Counters saved objects', () =>
202-
esArchiver.load('saved_objects/usage_counters')
206+
esArchiver.load('test/api_integration/fixtures/es_archiver/saved_objects/usage_counters')
203207
);
204208
after('cleanup saved objects changes', () =>
205-
esArchiver.unload('saved_objects/usage_counters')
209+
esArchiver.unload('test/api_integration/fixtures/es_archiver/saved_objects/usage_counters')
206210
);
207211

208212
it('returns usage counters aggregated by day', async () => {

0 commit comments

Comments
 (0)