Merge branch 'master' into move-kbn-cli-dev-mode-into-bazel

elastic · Jun 24, 2021 · bee492c · bee492c
2 parents 7d8f295 + d5a760c
commit bee492c
Show file tree

Hide file tree

Showing 77 changed files with 1,615 additions and 2,698 deletions.
diff --git a/test/functional/apps/context/index.js b/test/functional/apps/context/index.js
@@ -15,16 +15,18 @@ export default function ({ getService, getPageObjects, loadTestFile }) {
   describe('context app', function () {
     this.tags('ciGroup1');
 
-    before(async function () {
+    before(async () => {
       await browser.setWindowSize(1200, 800);
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
-      await esArchiver.load('test/functional/fixtures/es_archiver/visualize');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await PageObjects.common.navigateToApp('discover');
     });
 
-    after(function unloadMakelogs() {
-      return esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/visualize.json'
+      );
     });
 
     loadTestFile(require.resolve('./_context_navigation'));

diff --git a/test/functional/apps/discover/_source_filters.ts b/test/functional/apps/discover/_source_filters.ts
@@ -23,8 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         defaultIndex: 'logstash-*',
       });
 
-      log.debug('load kibana index with default index pattern');
-      await esArchiver.load('test/functional/fixtures/es_archiver/visualize_source-filters');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/visualize.json');
 
       // and load a set of makelogs data
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
@@ -43,6 +42,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.common.sleep(1000);
     });
 
+    after(async () => {
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/visualize.json'
+      );
+    });
+
     it('should not get the field referer', async function () {
       const fieldNames = await PageObjects.discover.getAllFieldNames();
       expect(fieldNames).to.not.contain('referer');

diff --git a/test/functional/fixtures/es_archiver/visualize/data.json b/test/functional/fixtures/es_archiver/visualize/data.json