From 5e6306a213f24879f1326427d39882f589e34ad6 Mon Sep 17 00:00:00 2001 From: Tre' Seymour Date: Wed, 25 Aug 2021 15:26:27 +0100 Subject: [PATCH] [Archive Migration][Partial] test/functional/fixtures/es_archiver/discover Comes from https://github.com/elastic/kibana/pull/102827 Helps with https://github.com/elastic/kibana/pull/108503 Piggy back off of the work from @tylersmalley Only inlude the changes under the test/accessibility/apps/ folder. --- test/accessibility/apps/discover.ts | 3 ++- test/accessibility/apps/management.ts | 3 ++- test/accessibility/apps/visualize.ts | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/test/accessibility/apps/discover.ts b/test/accessibility/apps/discover.ts index 6705598ef6e74..c7794c5023bae 100644 --- a/test/accessibility/apps/discover.ts +++ b/test/accessibility/apps/discover.ts @@ -19,8 +19,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Discover a11y tests', () => { before(async () => { - await esArchiver.load('test/functional/fixtures/es_archiver/discover'); await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover'); await kibanaServer.uiSettings.update({ defaultIndex: 'logstash-*', 'doc_table:legacy': true, @@ -30,6 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { + await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover'); await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); }); diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts index 2fb3de63a81a7..69b799cc3b9e7 100644 --- a/test/accessibility/apps/management.ts +++ b/test/accessibility/apps/management.ts @@ -22,8 +22,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('Management', () => { before(async () => { - await esArchiver.load('test/functional/fixtures/es_archiver/discover'); await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional'); + await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover'); await kibanaServer.uiSettings.update({ defaultIndex: 'logstash-*', }); @@ -31,6 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); after(async () => { + await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover'); await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional'); }); diff --git a/test/accessibility/apps/visualize.ts b/test/accessibility/apps/visualize.ts index 6478907fcb96a..d0592352170fb 100644 --- a/test/accessibility/apps/visualize.ts +++ b/test/accessibility/apps/visualize.ts @@ -11,14 +11,18 @@ import { FtrProviderContext } from '../ftr_provider_context'; export default function ({ getService, getPageObjects }: FtrProviderContext) { const PageObjects = getPageObjects(['common', 'visualize', 'header']); const a11y = getService('a11y'); - const esArchiver = getService('esArchiver'); + const kibanaServer = getService('kibanaServer'); describe('Visualize', () => { before(async () => { - await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover'); + await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover'); await PageObjects.common.navigateToApp('visualize'); }); + after(async () => { + await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover'); + }); + it('visualize', async () => { await a11y.testAppSnapshot(); });