Merge branch 'main' into xpack-es-to-kbn-archiver-advanced-settings

Merge branch 'master' into xpack-es-to-kbn-archiver-advanced-settings
[QA][X Pack] Swap es archiver for kbn archiver - advanced settings
2021-11-03 09:50:16 -04:00 · 2021-06-14 09:20:39 -04:00 · 2021-06-09 16:28:53 -05:00
2 changed files with 0 additions and 11 deletions
--- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
+++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
@ -9,7 +9,6 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';

 export default function ({ getPageObjects, getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
  const kibanaServer = getService('kibanaServer');
  const security = getService('security');
  const PageObjects = getPageObjects(['common', 'settings', 'security', 'spaceSelector']);
@ -18,14 +17,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
  const globalNav = getService('globalNav');

  describe('security feature controls', () => {
-    before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
-    });
-
-    after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
-    });
-
    describe('global advanced_settings all privileges', () => {
      before(async () => {
        await security.role.create('global_advanced_settings_all_role', {
--- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts
+++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts
@ -25,7 +25,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
      before(async () => {
        // we need to load the following in every situation as deleting
        // a space deletes all of the associated saved objects
-        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');

        await spacesService.create({
          id: 'custom_space',
@ -36,7 +35,6 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {

      after(async () => {
        await spacesService.delete('custom_space');
-        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
      });

      it('shows Management navlink', async () => {
Author	SHA1	Message	Date
Kibana Machine	36ec3d8623	Merge branch 'main' into xpack-es-to-kbn-archiver-advanced-settings	2021-11-03 09:50:16 -04:00
Kibana Machine	d6b73d173c	Merge branch 'master' into xpack-es-to-kbn-archiver-advanced-settings	2021-06-14 09:20:39 -04:00
Tre' Seymour	aafdde3c47	[QA][X Pack] Swap es archiver for kbn archiver - advanced settings Drop all empty kibana calls	2021-06-09 16:28:53 -05:00