replace es_archiver/empty_kibana with cleanStandardList (#139324)

elastic · Aug 24, 2022 · 220578b · 220578b
1 parent ee12c73
commit 220578b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 491 deletions.
diff --git a/test/functional/apps/dashboard_elements/index.ts b/test/functional/apps/dashboard_elements/index.ts
@@ -12,19 +12,20 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
   const browser = getService('browser');
   const log = getService('log');
   const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
 
   describe('dashboard elements', () => {
     before(async () => {
       log.debug('Starting before method');
       await browser.setWindowSize(1280, 800);
-      await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
+      await kibanaServer.savedObjects.cleanStandardList();
 
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
     });
 
     after(async () => {
-      await esArchiver.unload('test/functional/fixtures/es_archiver/empty_kibana');
+      await kibanaServer.savedObjects.cleanStandardList();
       await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
       await esArchiver.unload('test/functional/fixtures/es_archiver/long_window_logstash');
     });

diff --git a/test/functional/apps/management/_handle_alias.ts b/test/functional/apps/management/_handle_alias.ts
@@ -15,12 +15,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
   const security = getService('security');
   const PageObjects = getPageObjects(['common', 'home', 'settings', 'discover', 'timePicker']);
+  const kibanaServer = getService('kibanaServer');
 
   describe('Index patterns on aliases', function () {
     before(async function () {
+      await kibanaServer.savedObjects.cleanStandardList();
       await security.testUser.setRoles(['kibana_admin', 'test_alias_reader']);
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/alias');
-      await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
       await es.indices.updateAliases({
         body: {
           actions: [
@@ -76,6 +77,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       after(async () => {
         await PageObjects.common.unsetTime();
         await security.testUser.restoreDefaults();
+        await kibanaServer.savedObjects.cleanStandardList();
         await esArchiver.unload('test/functional/fixtures/es_archiver/alias');
       });
     });

diff --git a/test/functional/fixtures/es_archiver/empty_kibana/data.json.gz b/test/functional/fixtures/es_archiver/empty_kibana/data.json.gz
diff --git a/test/functional/fixtures/es_archiver/empty_kibana/mappings.json b/test/functional/fixtures/es_archiver/empty_kibana/mappings.json