[8.7] [functional tests] split security and spaces ftr configs (#156350…

…) (#156467) # Backport This will backport the following commits from `main` to `8.7`: - [[functional tests] split security and spaces ftr configs (#156350)](#156350)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Dzmitry Lemechko <[email protected]>
elastic · May 3, 2023 · 6cff858 · 6cff858
1 parent f227215
commit 6cff858
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 16 deletions.
diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
@@ -345,7 +345,9 @@ enabled:
   - x-pack/test/security_solution_endpoint/config.ts
   - x-pack/test/session_view/basic/config.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
+  - x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
+  - x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
   - x-pack/test/spaces_api_integration/spaces_only/config.ts
   - x-pack/test/timeline/security_and_spaces/config_trial.ts
   - x-pack/test/ui_capabilities/security_and_spaces/config.ts

diff --git a/x-pack/test/spaces_api_integration/common/config.ts b/x-pack/test/spaces_api_integration/common/config.ts
@@ -13,10 +13,11 @@ import { FtrConfigProviderContext } from '@kbn/test';
 interface CreateTestConfigOptions {
   license: string;
   disabledPlugins?: string[];
+  testFiles?: string[];
 }
 
 export function createTestConfig(name: string, options: CreateTestConfigOptions) {
-  const { license, disabledPlugins = [] } = options;
+  const { license, disabledPlugins = [], testFiles } = options;
 
   return async ({ readConfigFile }: FtrConfigProviderContext) => {
     const config = {
@@ -32,7 +33,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     };
 
     return {
-      testFiles: [require.resolve(`../${name}/apis/`)],
+      testFiles: testFiles ?? [require.resolve(`../${name}/apis/`)],
       servers: config.xpack.api.get('servers'),
       services: {
         es: config.kibana.api.get('services.es'),

diff --git a/...security_and_spaces/apis/copy_to_space.ts → ...paces/apis/copy_to_space/copy_to_space.ts b/...security_and_spaces/apis/copy_to_space.ts → ...paces/apis/copy_to_space/copy_to_space.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
-import { SPACES } from '../../common/lib/spaces';
-import { copyToSpaceTestSuiteFactory } from '../../common/suites/copy_to_space';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { AUTHENTICATION } from '../../../common/lib/authentication';
+import { SPACES } from '../../../common/lib/spaces';
+import { copyToSpaceTestSuiteFactory } from '../../../common/suites/copy_to_space';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function copyToSpaceSpacesAndSecuritySuite(context: FtrProviderContext) {

diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space/index.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space/index.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createUsersAndRoles } from '../../../common/lib/create_users_and_roles';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ loadTestFile, getService }: FtrProviderContext) {
+  const es = getService('es');
+  const supertest = getService('supertest');
+
+  describe('copy to space with security', function () {
+    before(async () => {
+      await createUsersAndRoles(es, supertest);
+    });
+
+    loadTestFile(require.resolve('./copy_to_space')); // ~ 19m 20s
+  });
+}
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts
@@ -18,15 +18,15 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
       await createUsersAndRoles(es, supertest);
     });
 
-    loadTestFile(require.resolve('./copy_to_space'));
-    loadTestFile(require.resolve('./resolve_copy_to_space_conflicts'));
-    loadTestFile(require.resolve('./create'));
-    loadTestFile(require.resolve('./delete'));
-    loadTestFile(require.resolve('./get_all'));
-    loadTestFile(require.resolve('./get_shareable_references'));
-    loadTestFile(require.resolve('./get'));
-    loadTestFile(require.resolve('./update'));
-    loadTestFile(require.resolve('./update_objects_spaces'));
-    loadTestFile(require.resolve('./disable_legacy_url_aliases'));
+    // total runtime ~ 17m
+    loadTestFile(require.resolve('./resolve_copy_to_space_conflicts')); // ~ 10m
+    loadTestFile(require.resolve('./create')); // ~ 2m
+    loadTestFile(require.resolve('./delete')); // ~ 1m 20s
+    loadTestFile(require.resolve('./get_all')); // ~ 50s
+    loadTestFile(require.resolve('./get_shareable_references')); // ~ 30s
+    loadTestFile(require.resolve('./get')); // ~ 30s
+    loadTestFile(require.resolve('./update')); // ~ 30s
+    loadTestFile(require.resolve('./update_objects_spaces')); // ~ 1m
+    loadTestFile(require.resolve('./disable_legacy_url_aliases')); // ~ 30s
   });
 }
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts b/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createTestConfig } from '../common/config';
+
+// eslint-disable-next-line import/no-default-export
+export default createTestConfig('security_and_spaces', {
+  license: 'basic',
+  testFiles: [require.resolve('./apis/copy_to_space')],
+});
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts b/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createTestConfig } from '../common/config';
+
+// eslint-disable-next-line import/no-default-export
+export default createTestConfig('security_and_spaces', {
+  license: 'trial',
+  testFiles: [require.resolve('./apis/copy_to_space')],
+});