[kbn/test] move types/ftr into src (elastic#99555)

* [kbn/test] move types/ftr into src * Apply eslint updates * fix import of Lifecycle type Co-authored-by: spalger <[email protected]> Co-authored-by: Kibana Machine <[email protected]> # Conflicts: # x-pack/test/functional_cors/config.ts # x-pack/test/reporting_functional/reporting_and_deprecated_security.config.ts
spalger · May 17, 2021 · 3d70d14 · 3d70d14
1 parent cd0c153
commit 3d70d14
Show file tree

Hide file tree

Showing 151 changed files with 157 additions and 162 deletions.
diff --git a/packages/elastic-eslint-config-kibana/.eslintrc.js b/packages/elastic-eslint-config-kibana/.eslintrc.js
@@ -70,6 +70,11 @@ module.exports = {
           to: '@kbn/tinymath',
           disallowedMessage: `Don't use 'tinymath', use '@kbn/tinymath'`
         },
+        {
+          from: '@kbn/test/types/ftr',
+          to: '@kbn/test',
+          disallowedMessage: `import from the root of @kbn/test instead`
+        },
       ],
     ],
   },

diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json
@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "private": true,
   "license": "SSPL-1.0 OR Elastic License 2.0",
-  "main": "./target/index.js",
-  "types": "./target/types/index.d.ts",
+  "main": "./target",
+  "types": "./target/types",
   "scripts": {
     "build": "node scripts/build",
     "kbn:bootstrap": "node scripts/build --source-maps",

diff --git a/packages/kbn-test/src/functional_test_runner/index.ts b/packages/kbn-test/src/functional_test_runner/index.ts
@@ -10,3 +10,4 @@ export { FunctionalTestRunner } from './functional_test_runner';
 export { readConfigFile, Config } from './lib';
 export { runFtrCli } from './cli';
 export * from './lib/docker_servers';
+export * from './public_types';
diff --git a/packages/kbn-test/types/ftr.d.ts → ...rc/functional_test_runner/public_types.ts b/packages/kbn-test/types/ftr.d.ts → ...rc/functional_test_runner/public_types.ts
@@ -7,13 +7,9 @@
  */
 
 import { ToolingLog } from '@kbn/dev-utils';
-import {
-  Config,
-  Lifecycle,
-  FailureMetadata,
-  DockerServersService,
-} from '../src/functional_test_runner/lib';
-import { Test, Suite } from '../src/functional_test_runner/fake_mocha_types';
+
+import { Config, Lifecycle, FailureMetadata, DockerServersService } from './lib';
+import { Test, Suite } from './fake_mocha_types';
 
 export { Lifecycle, Config, FailureMetadata };
 

diff --git a/packages/kbn-test/tsconfig.json b/packages/kbn-test/tsconfig.json
@@ -8,19 +8,17 @@
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
-    "sourceRoot": "../../../../../packages/kbn-test/src",
+    "sourceRoot": "../../../../../../packages/kbn-test/src",
     "types": [
       "jest",
       "node"
     ],
   },
   "include": [
-    "types/**/*",
     "src/**/*",
     "index.d.ts"
   ],
   "exclude": [
-    "types/ftr_globals/**/*",
     "**/__fixtures__/**/*"
   ]
 }
diff --git a/packages/kbn-test/types/README.md b/packages/kbn-test/types/README.md
diff --git a/test/accessibility/config.ts b/test/accessibility/config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import { services } from './services';
 import { pageObjects } from './page_objects';
 

diff --git a/test/accessibility/ftr_provider_context.d.ts b/test/accessibility/ftr_provider_context.d.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { pageObjects } from './page_objects';
 import { services } from './services';

diff --git a/test/api_integration/ftr_provider_context.d.ts b/test/api_integration/ftr_provider_context.d.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { services } from './services';
 

diff --git a/test/common/ftr_provider_context.d.ts b/test/common/ftr_provider_context.d.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { services } from './services';
 

diff --git a/test/functional/apps/discover/ftr_provider_context.d.ts b/test/functional/apps/discover/ftr_provider_context.d.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 import { services } from '../../services';
 import { pageObjects } from '../../page_objects';
 

diff --git a/test/functional/config.legacy.ts b/test/functional/config.legacy.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 
 // eslint-disable-next-line import/no-default-export
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {

diff --git a/test/functional/ftr_provider_context.d.ts b/test/functional/ftr_provider_context.d.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { pageObjects } from './page_objects';
 import { services } from './services';

diff --git a/test/functional/services/common/browser.ts b/test/functional/services/common/browser.ts
@@ -11,7 +11,7 @@ import { cloneDeepWith } from 'lodash';
 import { Key, Origin } from 'selenium-webdriver';
 // @ts-ignore internal modules are not typed
 import { LegacyActionSequence } from 'selenium-webdriver/lib/actions';
-import { ProvidedType } from '@kbn/test/types/ftr';
+import { ProvidedType } from '@kbn/test';
 import { modifyUrl } from '@kbn/std';
 
 import Jimp from 'jimp';

diff --git a/test/functional/services/common/test_subjects.ts b/test/functional/services/common/test_subjects.ts
@@ -8,7 +8,7 @@
 
 import testSubjSelector from '@kbn/test-subj-selector';
 import { map as mapAsync } from 'bluebird';
-import { ProvidedType } from '@kbn/test/types/ftr';
+import { ProvidedType } from '@kbn/test';
 import { WebElementWrapper } from '../lib/web_element_wrapper';
 import { FtrProviderContext } from '../../ftr_provider_context';
 

diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
@@ -11,7 +11,7 @@ import Fs from 'fs';
 
 import * as Rx from 'rxjs';
 import { mergeMap, map, takeUntil, catchError } from 'rxjs/operators';
-import { Lifecycle } from '@kbn/test/src/functional_test_runner/lib/lifecycle';
+import { Lifecycle } from '@kbn/test';
 import { ToolingLog } from '@kbn/dev-utils';
 import chromeDriver from 'chromedriver';
 // @ts-ignore types not available

diff --git a/test/interpreter_functional/config.ts b/test/interpreter_functional/config.ts
@@ -8,7 +8,7 @@
 
 import path from 'path';
 import fs from 'fs';
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const functionalConfig = await readConfigFile(require.resolve('../functional/config'));

diff --git a/test/new_visualize_flow/config.ts b/test/new_visualize_flow/config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const commonConfig = await readConfigFile(require.resolve('../functional/config.js'));

diff --git a/test/plugin_functional/config.ts b/test/plugin_functional/config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import path from 'path';
 import fs from 'fs';
 

diff --git a/test/security_functional/config.ts b/test/security_functional/config.ts
@@ -7,7 +7,7 @@
  */
 
 import path from 'path';
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const functionalConfig = await readConfigFile(require.resolve('../functional/config'));

diff --git a/test/server_integration/http/platform/config.ts b/test/server_integration/http/platform/config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 
 // eslint-disable-next-line import/no-default-export
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {

diff --git a/test/server_integration/services/types.d.ts b/test/server_integration/services/types.d.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 import { services as kibanaCommonServices } from '../../common/services';
 import { services as kibanaApiIntegrationServices } from '../../api_integration/services';
 

diff --git a/test/ui_capabilities/newsfeed_err/config.ts b/test/ui_capabilities/newsfeed_err/config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 // @ts-ignore untyped module
 import getFunctionalConfig from '../../functional/config';
 

diff --git a/test/visual_regression/config.ts b/test/visual_regression/config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import { services } from './services';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {

diff --git a/test/visual_regression/ftr_provider_context.d.ts b/test/visual_regression/ftr_provider_context.d.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { pageObjects } from '../functional/page_objects';
 import { services } from './services';

diff --git a/test/visual_regression/services/visual_testing/visual_testing.ts b/test/visual_regression/services/visual_testing/visual_testing.ts
@@ -8,7 +8,7 @@
 
 import { postSnapshot } from '@percy/agent/dist/utils/sdk-utils';
 import testSubjSelector from '@kbn/test-subj-selector';
-import { Test } from '@kbn/test/types/ftr';
+import { Test } from '@kbn/test';
 import { kibanaPackageJson as pkg } from '@kbn/utils';
 import { FtrProviderContext } from '../../ftr_provider_context';
 

diff --git a/x-pack/plugins/apm/ftr_e2e/config.ts b/x-pack/plugins/apm/ftr_e2e/config.ts
@@ -7,7 +7,7 @@
 
 import { resolve } from 'path';
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 
 import { CA_CERT_PATH } from '@kbn/dev-utils';
 async function config({ readConfigFile }: FtrConfigProviderContext) {

diff --git a/x-pack/plugins/apm/ftr_e2e/cypress_open.ts b/x-pack/plugins/apm/ftr_e2e/cypress_open.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import { cypressOpenTests } from './cypress_start';
 
 async function openE2ETests({ readConfigFile }: FtrConfigProviderContext) {

diff --git a/x-pack/plugins/apm/ftr_e2e/cypress_run.ts b/x-pack/plugins/apm/ftr_e2e/cypress_run.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import { cypressRunTests } from './cypress_start';
 
 async function runE2ETests({ readConfigFile }: FtrConfigProviderContext) {

diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts b/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { services } from './services';
 

diff --git a/x-pack/test/accessibility/config.ts b/x-pack/test/accessibility/config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import { services } from './services';
 import { pageObjects } from './page_objects';
 

diff --git a/x-pack/test/accessibility/ftr_provider_context.d.ts b/x-pack/test/accessibility/ftr_provider_context.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { pageObjects } from './page_objects';
 import { services } from './services';

diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
@@ -9,7 +9,7 @@ import path from 'path';
 import getPort from 'get-port';
 import fs from 'fs';
 import { CA_CERT_PATH } from '@kbn/dev-utils';
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import { services } from './services';
 import { getAllExternalServiceSimulatorPaths } from './fixtures/plugins/actions_simulators/server/plugin';
 

diff --git a/x-pack/test/alerting_api_integration/common/ftr_provider_context.d.ts b/x-pack/test/alerting_api_integration/common/ftr_provider_context.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { services } from './services';
 

diff --git a/x-pack/test/api_integration/config.ts b/x-pack/test/api_integration/config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import { services } from './services';
 
 export async function getApiIntegrationConfig({ readConfigFile }: FtrConfigProviderContext) {

diff --git a/x-pack/test/api_integration/config_security_basic.ts b/x-pack/test/api_integration/config_security_basic.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable import/no-default-export */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import { default as createTestConfig } from './config';
 
 export default async function (context: FtrConfigProviderContext) {

diff --git a/x-pack/test/api_integration/config_security_trial.ts b/x-pack/test/api_integration/config_security_trial.ts
@@ -7,7 +7,7 @@
 
 /* eslint-disable import/no-default-export */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import { default as createTestConfig } from './config';
 
 export default async function (context: FtrConfigProviderContext) {

diff --git a/x-pack/test/api_integration/ftr_provider_context.d.ts b/x-pack/test/api_integration/ftr_provider_context.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { services } from './services';
 

diff --git a/x-pack/test/api_integration_basic/config.ts b/x-pack/test/api_integration_basic/config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const xpackApiIntegrationConfig = await readConfigFile(

diff --git a/x-pack/test/api_integration_basic/ftr_provider_context.d.ts b/x-pack/test/api_integration_basic/ftr_provider_context.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 
 import { services } from '../api_integration/services';
 

diff --git a/x-pack/test/apm_api_integration/common/config.ts b/x-pack/test/apm_api_integration/common/config.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { FtrConfigProviderContext } from '@kbn/test';
 import supertest from 'supertest';
 import { format, UrlObject } from 'url';
 import path from 'path';

diff --git a/x-pack/test/apm_api_integration/common/ftr_provider_context.ts b/x-pack/test/apm_api_integration/common/ftr_provider_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { GenericFtrProviderContext } from '@kbn/test';
 import { FtrProviderContext as InheritedFtrProviderContext } from '../../api_integration/ftr_provider_context';
 import { ApmServices } from './config';
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
      * 2.0.
      */
-    import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+    import { GenericFtrProviderContext } from '@kbn/test';
     import { services } from './services';
@@ Expand Down @@