[Archive Migration][Partial] discover remaining

Comes from #102827 Helps with #108503 Piggy back off of the work from @tylersmalley Only include the changes under the test/plugin_functional/test_suites/doc_views & test/visual_regression/tests/discover folders.
elastic · Aug 30, 2021 · 5a890dc · 5a890dc
1 parent 234f7f6
commit 5a890dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/test/plugin_functional/test_suites/doc_views/index.ts b/test/plugin_functional/test_suites/doc_views/index.ts
@@ -9,12 +9,16 @@
 import { PluginFunctionalProviderContext } from '../../services';
 
 export default function ({ getService, loadTestFile }: PluginFunctionalProviderContext) {
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
 
   // SKIPPED: https://github.com/elastic/kibana/issues/100060
   describe.skip('doc views', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
+    });
+
+    after(async () => {
+      await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover.json');
     });
 
     loadTestFile(require.resolve('./doc_views'));

diff --git a/test/visual_regression/tests/discover/chart_visualization.ts b/test/visual_regression/tests/discover/chart_visualization.ts
@@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('discover', function describeIndexTests() {
     before(async function () {
-      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
 
       // and load a set of makelogs data
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
@@ -33,8 +33,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.timePicker.setDefaultAbsoluteRange();
     });
 
-    after(function unloadMakelogs() {
-      return esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    after(async () => {
+      await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover.json');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
     async function refreshDiscover() {