Moving some tests around

x-pack/scripts/functional_tests.js

@@ -13,8 +13,8 @@ require('@kbn/test').runTestsCli([
   require.resolve('../test/functional/config.js'),
   require.resolve('../test/api_integration/config.js'),
   require.resolve('../test/saml_api_integration/config.js'),
-  require.resolve('../test/spaces_api_integration/spaces_only/config.js'),
-  require.resolve('../test/spaces_api_integration/security_and_spaces/config.js'),
+  require.resolve('../test/spaces_api_integration/spaces_only/config'),
+  require.resolve('../test/spaces_api_integration/security_and_spaces/config'),
   require.resolve('../test/saved_object_api_integration/security_and_spaces/config'),
   require.resolve('../test/saved_object_api_integration/security_only/config'),
   require.resolve('../test/saved_object_api_integration/spaces_only/config'),

x-pack/test/spaces_api_integration/common/config.js → x-pack/test/spaces_api_integration/common/config.ts

@@ -4,26 +4,30 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import path from 'path';
 import { resolveKibanaPath } from '@kbn/plugin-helpers';
+import path from 'path';
+import { TestInvoker } from './lib/types';
 import { EsProvider } from './services/es';
 
+interface CreateTestConfigOptions {
+  license: string;
+  disabledPlugins?: [string];
+}
 
-export function createTestConfig(name, { license = 'trial', disabledPlugins = [] } = {}) {
-
-  return async function ({ readConfigFile }) {
+export function createTestConfig(name: string, options: CreateTestConfigOptions) {
+  const { license, disabledPlugins = [] } = options;
 
+  return async ({ readConfigFile }: TestInvoker) => {
     const config = {
       kibana: {
         api: await readConfigFile(resolveKibanaPath('test/api_integration/config.js')),
-        functional: await readConfigFile(require.resolve('../../../../test/functional/config.js'))
+        functional: await readConfigFile(require.resolve('../../../../test/functional/config.js')),
       },
       xpack: {
-        api: await readConfigFile(require.resolve('../../api_integration/config.js'))
-      }
+        api: await readConfigFile(require.resolve('../../api_integration/config.js')),
+      },
     };
 
-    console.log('resolving', require.resolve(`../${name}/apis/`));
     return {
       testFiles: [require.resolve(`../${name}/apis/`)],
       servers: config.xpack.api.get('servers'),
@@ -40,7 +44,7 @@ export function createTestConfig(name, { license = 'trial', disabledPlugins = []
       },
 
       esArchiver: {
-        directory: path.join(__dirname, 'fixtures', 'es_archiver')
+        directory: path.join(__dirname, 'fixtures', 'es_archiver'),
       },
 
       esTestCluster: {

x-pack/test/spaces_api_integration/common/lib/types.ts

@@ -30,7 +30,10 @@ export type LoadTestFileFn = (path: string) => string;
 
 export type GetServiceFn = (service: string) => any;
 
+export type ReadConfigFileFn = (path: string) => any;
+
 export interface TestInvoker {
   getService: GetServiceFn;
   loadTestFile: LoadTestFileFn;
+  readConfigFile: ReadConfigFileFn;
 }

x-pack/test/spaces_api_integration/security_and_spaces/apis/spaces/create.ts → x-pack/test/spaces_api_integration/security_and_spaces/apis/create.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { createTestSuiteFactory } from '../../../common/suites/spaces/create';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { createTestSuiteFactory } from '../../common/suites/spaces/create';
 
 // tslint:disable:no-default-export
 export default function createSpacesOnlySuite({ getService }: TestInvoker) {

x-pack/test/spaces_api_integration/security_and_spaces/apis/spaces/delete.ts → x-pack/test/spaces_api_integration/security_and_spaces/apis/delete.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { deleteTestSuiteFactory } from '../../../common/suites/spaces/delete';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { deleteTestSuiteFactory } from '../../common/suites/spaces/delete';
 
 // tslint:disable:no-default-export
 export default function deleteSpaceTestSuite({ getService }: TestInvoker) {

x-pack/test/spaces_api_integration/security_and_spaces/apis/spaces/get.ts → x-pack/test/spaces_api_integration/security_and_spaces/apis/get.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { getTestSuiteFactory } from '../../../common/suites/spaces/get';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { getTestSuiteFactory } from '../../common/suites/spaces/get';
 
 // tslint:disable:no-default-export
 export default function getSpaceTestSuite({ getService }: TestInvoker) {

x-pack/test/spaces_api_integration/security_and_spaces/apis/spaces/get_all.ts → x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { getAllTestSuiteFactory } from '../../../common/suites/spaces/get_all';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { getAllTestSuiteFactory } from '../../common/suites/spaces/get_all';
 
 // tslint:disable:no-default-export
 export default function getAllSpacesTestSuite({ getService }: TestInvoker) {

x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { createUsersAndRoles } from '../../common/lib/create_users_and_roles';
+import { TestInvoker } from '../../common/lib/types';
+
+// tslint:disable:no-default-export
+export default function({ loadTestFile, getService }: TestInvoker) {
+  const es = getService('es');
+  const supertest = getService('supertest');
+
+  describe('apis spaces', () => {
+    before(async () => {
+      await createUsersAndRoles(es, supertest);
+    });
+
+    loadTestFile(require.resolve('./create'));
+    loadTestFile(require.resolve('./delete'));
+    loadTestFile(require.resolve('./get_all'));
+    loadTestFile(require.resolve('./get'));
+    loadTestFile(require.resolve('./select'));
+    loadTestFile(require.resolve('./update'));
+  });
+}

x-pack/test/spaces_api_integration/security_and_spaces/apis/spaces/select.ts → x-pack/test/spaces_api_integration/security_and_spaces/apis/select.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { selectTestSuiteFactory } from '../../../common/suites/spaces/select';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { selectTestSuiteFactory } from '../../common/suites/spaces/select';
 
 // tslint:disable:no-default-export
 export default function selectSpaceTestSuite({ getService }: TestInvoker) {
@@ -92,7 +92,7 @@ export default function selectSpaceTestSuite({ getService }: TestInvoker) {
       });
 
       selectTest(
-        `${scenario.userWithReadGlobally.USERNAME} selects ${scenario.otherSpaceId} from 
+        `${scenario.userWithReadGlobally.USERNAME} selects ${scenario.otherSpaceId} from
         ${scenario.spaceId}`,
         {
           currentSpaceId: scenario.spaceId,
@@ -111,7 +111,7 @@ export default function selectSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       selectTest(
-        `${scenario.userWithDualRead.USERNAME} selects ${scenario.otherSpaceId} from 
+        `${scenario.userWithDualRead.USERNAME} selects ${scenario.otherSpaceId} from
         ${scenario.spaceId}`,
         {
           currentSpaceId: scenario.spaceId,
@@ -130,7 +130,7 @@ export default function selectSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       selectTest(
-        `${scenario.userWithLegacyRead.USERNAME} can select ${scenario.otherSpaceId} 
+        `${scenario.userWithLegacyRead.USERNAME} can select ${scenario.otherSpaceId}
         from ${scenario.spaceId}`,
         {
           currentSpaceId: scenario.spaceId,
@@ -165,7 +165,7 @@ export default function selectSpaceTestSuite({ getService }: TestInvoker) {
       },
     ].forEach(scenario => {
       selectTest(
-        `${scenario.userWithAllAtSpace.USERNAME} can select ${scenario.spaceId} 
+        `${scenario.userWithAllAtSpace.USERNAME} can select ${scenario.spaceId}
         from ${scenario.spaceId}`,
         {
           currentSpaceId: scenario.spaceId,
@@ -184,7 +184,7 @@ export default function selectSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       selectTest(
-        `${scenario.userWithReadAtSpace.USERNAME} can select ${scenario.spaceId} 
+        `${scenario.userWithReadAtSpace.USERNAME} can select ${scenario.spaceId}
         from ${scenario.spaceId}`,
         {
           currentSpaceId: scenario.spaceId,
@@ -203,7 +203,7 @@ export default function selectSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       selectTest(
-        `${scenario.userWithAllAtOtherSpace.USERNAME} cannot select ${scenario.spaceId} 
+        `${scenario.userWithAllAtOtherSpace.USERNAME} cannot select ${scenario.spaceId}
         from ${scenario.spaceId}`,
         {
           currentSpaceId: scenario.spaceId,
@@ -233,7 +233,7 @@ export default function selectSpaceTestSuite({ getService }: TestInvoker) {
       },
     ].forEach(scenario => {
       selectTest(
-        `${scenario.userWithAllAtBothSpaces.USERNAME} can select ${scenario.spaceId} 
+        `${scenario.userWithAllAtBothSpaces.USERNAME} can select ${scenario.spaceId}
         from ${scenario.otherSpaceId}`,
         {
           currentSpaceId: scenario.otherSpaceId,
@@ -252,7 +252,7 @@ export default function selectSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       selectTest(
-        `${scenario.userWithAllAtOtherSpace.USERNAME} cannot select ${scenario.spaceId} 
+        `${scenario.userWithAllAtOtherSpace.USERNAME} cannot select ${scenario.spaceId}
         from ${scenario.otherSpaceId}`,
         {
           currentSpaceId: scenario.otherSpaceId,

x-pack/test/spaces_api_integration/security_and_spaces/apis/spaces/update.ts → x-pack/test/spaces_api_integration/security_and_spaces/apis/update.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AUTHENTICATION } from '../../../common/lib/authentication';
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { updateTestSuiteFactory } from '../../../common/suites/spaces/update';
+import { AUTHENTICATION } from '../../common/lib/authentication';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { updateTestSuiteFactory } from '../../common/suites/spaces/update';
 
 // tslint:disable:no-default-export
 export default function updateSpaceTestSuite({ getService }: TestInvoker) {
@@ -48,7 +48,7 @@ export default function updateSpaceTestSuite({ getService }: TestInvoker) {
       },
     ].forEach(scenario => {
       updateTest(
-        `${scenario.userWithAllGlobally.USERNAME} can update space_1 from 
+        `${scenario.userWithAllGlobally.USERNAME} can update space_1 from
         the ${scenario.spaceId} space`,
         {
           spaceId: scenario.spaceId,
@@ -88,7 +88,7 @@ export default function updateSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       updateTest(
-        `${scenario.userWithDualAll.USERNAME} can update space_1 from 
+        `${scenario.userWithDualAll.USERNAME} can update space_1 from
         the ${scenario.spaceId} space`,
         {
           spaceId: scenario.spaceId,
@@ -128,7 +128,7 @@ export default function updateSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       updateTest(
-        `${scenario.userWithLegacyAll.USERNAME} can update space_1 from 
+        `${scenario.userWithLegacyAll.USERNAME} can update space_1 from
         the ${scenario.spaceId} space`,
         {
           spaceId: scenario.spaceId,
@@ -168,7 +168,7 @@ export default function updateSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       updateTest(
-        `${scenario.userWithReadGlobally.USERNAME} cannot update space_1 
+        `${scenario.userWithReadGlobally.USERNAME} cannot update space_1
         from the ${scenario.spaceId} space`,
         {
           spaceId: scenario.spaceId,
@@ -203,7 +203,7 @@ export default function updateSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       updateTest(
-        `${scenario.userWithDualRead.USERNAME} cannot update space_1 
+        `${scenario.userWithDualRead.USERNAME} cannot update space_1
         from the ${scenario.spaceId} space`,
         {
           spaceId: scenario.spaceId,
@@ -238,7 +238,7 @@ export default function updateSpaceTestSuite({ getService }: TestInvoker) {
       );
 
       updateTest(
-        `${scenario.userWithLegacyRead.USERNAME} cannot update space_1 
+        `${scenario.userWithLegacyRead.USERNAME} cannot update space_1
         from the ${scenario.spaceId} space`,
         {
           spaceId: scenario.spaceId,

x-pack/test/spaces_api_integration/security_and_spaces/config.js → x-pack/test/spaces_api_integration/security_and_spaces/config.ts

@@ -6,4 +6,5 @@
 
 import { createTestConfig } from '../common/config';
 
+// tslint:disable:no-default-export
 export default createTestConfig('security_and_spaces', { license: 'trial' });

x-pack/test/spaces_api_integration/spaces_only/apis/spaces/create.ts → x-pack/test/spaces_api_integration/spaces_only/apis/create.ts

@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SPACES } from '../../../common/lib/spaces';
-import { TestInvoker } from '../../../common/lib/types';
-import { createTestSuiteFactory } from '../../../common/suites/spaces/create';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { createTestSuiteFactory } from '../../common/suites/spaces/create';
 
 // tslint:disable:no-default-export
 export default function createSpacesOnlySuite({ getService }: TestInvoker) {

x-pack/test/spaces_api_integration/spaces_only/apis/spaces/delete.ts → x-pack/test/spaces_api_integration/spaces_only/apis/delete.ts

@@ -4,11 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SPACES } from '../../../common/lib/spaces';
-import { deleteTestSuiteFactory } from '../../../common/suites/spaces/delete';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { deleteTestSuiteFactory } from '../../common/suites/spaces/delete';
 
 // tslint:disable:no-default-export
-export default function deleteSpaceTestSuite({ getService }) {
+export default function deleteSpaceTestSuite({ getService }: TestInvoker) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
 

x-pack/test/spaces_api_integration/spaces_only/apis/spaces/get.ts → x-pack/test/spaces_api_integration/spaces_only/apis/get.ts

@@ -4,11 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SPACES } from '../../../common/lib/spaces';
-import { getTestSuiteFactory } from '../../../common/suites/spaces/get';
+import { SPACES } from '../../common/lib/spaces';
+import { TestInvoker } from '../../common/lib/types';
+import { getTestSuiteFactory } from '../../common/suites/spaces/get';
 
 // tslint:disable:no-default-export
-export default function getSpaceTestSuite({ getService }) {
+export default function getSpaceTestSuite({ getService }: TestInvoker) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');