Kbnarchiver migration for x-pack/test/functional/es_archives/dashboar…

…d/drilldowns (#134859)
elastic · Jun 22, 2022 · 6c79885 · 6c79885
1 parent 3d36e49
commit 6c79885
Show file tree

Hide file tree

Showing 7 changed files with 319 additions and 477 deletions.
diff --git a/x-pack/test/accessibility/apps/dashboard_edit_panel.ts b/x-pack/test/accessibility/apps/dashboard_edit_panel.ts
@@ -22,7 +22,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Dashboard Edit Panel Accessibility', () => {
     before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns');
+      await kibanaServer.savedObjects.cleanStandardList();
+      await kibanaServer.importExport.load(
+        'x-pack/test/functional/fixtures/kbn_archiver/dashboard_drilldowns/drilldowns'
+      );
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await PageObjects.common.navigateToApp('dashboard');
@@ -31,7 +34,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns');
+      await kibanaServer.savedObjects.cleanStandardList();
     });
 
     it('can open menu', async () => {

diff --git a/x-pack/test/functional/apps/dashboard/group3/drilldowns/index.ts b/x-pack/test/functional/apps/dashboard/group3/drilldowns/index.ts
@@ -16,12 +16,15 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
 
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
-      await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns');
+      await kibanaServer.savedObjects.cleanStandardList();
+      await kibanaServer.importExport.load(
+        'x-pack/test/functional/fixtures/kbn_archiver/dashboard_drilldowns/drilldowns'
+      );
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
     });
 
     after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns');
+      await kibanaServer.savedObjects.cleanStandardList();
     });
 
     loadTestFile(require.resolve('./dashboard_to_dashboard_drilldown'));

diff --git a/x-pack/test/functional/apps/discover/value_suggestions.ts b/x-pack/test/functional/apps/discover/value_suggestions.ts
@@ -27,16 +27,20 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('value suggestions', function describeIndexTests() {
     before(async function () {
+      await kibanaServer.savedObjects.cleanStandardList();
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
-      await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns');
+
+      await kibanaServer.importExport.load(
+        'x-pack/test/functional/fixtures/kbn_archiver/dashboard_drilldowns/drilldowns'
+      );
       await kibanaServer.uiSettings.update({
         'doc_table:legacy': true,
       });
     });
 
     after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns');
       await kibanaServer.uiSettings.unset('doc_table:legacy');
+      await kibanaServer.savedObjects.cleanStandardList();
     });
 
     describe('useTimeRange enabled', () => {

diff --git a/x-pack/test/functional/es_archives/dashboard/drilldowns/data.json b/x-pack/test/functional/es_archives/dashboard/drilldowns/data.json
diff --git a/x-pack/test/functional/es_archives/dashboard/drilldowns/mappings.json b/x-pack/test/functional/es_archives/dashboard/drilldowns/mappings.json