From 3d70d14746f10a41b22230f1f7033c946ffaabea Mon Sep 17 00:00:00 2001 From: Spencer Date: Mon, 17 May 2021 10:51:53 -0600 Subject: [PATCH] [kbn/test] move types/ftr into src (#99555) * [kbn/test] move types/ftr into src * Apply eslint updates * fix import of Lifecycle type Co-authored-by: spalger Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> # Conflicts: # x-pack/test/functional_cors/config.ts # x-pack/test/reporting_functional/reporting_and_deprecated_security.config.ts --- packages/elastic-eslint-config-kibana/.eslintrc.js | 5 +++++ packages/kbn-test/package.json | 4 ++-- packages/kbn-test/src/functional_test_runner/index.ts | 1 + .../functional_test_runner/public_types.ts} | 10 +++------- packages/kbn-test/tsconfig.json | 4 +--- packages/kbn-test/types/README.md | 5 ----- test/accessibility/config.ts | 2 +- test/accessibility/ftr_provider_context.d.ts | 2 +- test/api_integration/ftr_provider_context.d.ts | 2 +- test/common/ftr_provider_context.d.ts | 2 +- .../functional/apps/discover/ftr_provider_context.d.ts | 2 +- test/functional/config.legacy.ts | 2 +- test/functional/ftr_provider_context.d.ts | 2 +- test/functional/services/common/browser.ts | 2 +- test/functional/services/common/test_subjects.ts | 2 +- test/functional/services/remote/webdriver.ts | 2 +- test/interpreter_functional/config.ts | 2 +- test/new_visualize_flow/config.ts | 2 +- test/plugin_functional/config.ts | 2 +- test/security_functional/config.ts | 2 +- test/server_integration/http/platform/config.ts | 2 +- test/server_integration/services/types.d.ts | 2 +- test/ui_capabilities/newsfeed_err/config.ts | 2 +- test/visual_regression/config.ts | 2 +- test/visual_regression/ftr_provider_context.d.ts | 2 +- .../services/visual_testing/visual_testing.ts | 2 +- x-pack/plugins/apm/ftr_e2e/config.ts | 2 +- x-pack/plugins/apm/ftr_e2e/cypress_open.ts | 2 +- x-pack/plugins/apm/ftr_e2e/cypress_run.ts | 2 +- x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts | 2 +- x-pack/test/accessibility/config.ts | 2 +- x-pack/test/accessibility/ftr_provider_context.d.ts | 2 +- x-pack/test/alerting_api_integration/common/config.ts | 2 +- .../common/ftr_provider_context.d.ts | 2 +- x-pack/test/api_integration/config.ts | 2 +- x-pack/test/api_integration/config_security_basic.ts | 2 +- x-pack/test/api_integration/config_security_trial.ts | 2 +- x-pack/test/api_integration/ftr_provider_context.d.ts | 2 +- x-pack/test/api_integration_basic/config.ts | 2 +- .../api_integration_basic/ftr_provider_context.d.ts | 2 +- x-pack/test/apm_api_integration/common/config.ts | 2 +- .../apm_api_integration/common/ftr_provider_context.ts | 2 +- x-pack/test/banners_functional/config.ts | 2 +- x-pack/test/banners_functional/ftr_provider_context.ts | 2 +- x-pack/test/case_api_integration/common/config.ts | 2 +- .../common/ftr_provider_context.d.ts | 2 +- x-pack/test/common/ftr_provider_context.ts | 2 +- .../detection_engine_api_integration/common/config.ts | 2 +- .../common/ftr_provider_context.d.ts | 2 +- .../encrypted_saved_objects_api_integration/config.ts | 2 +- .../ftr_provider_context.d.ts | 2 +- .../test/endpoint_api_integration_no_ingest/config.ts | 2 +- .../ftr_provider_context.d.ts | 2 +- x-pack/test/examples/config.ts | 2 +- x-pack/test/fleet_api_integration/config.ts | 2 +- x-pack/test/fleet_functional/config.ts | 2 +- x-pack/test/fleet_functional/ftr_provider_context.d.ts | 2 +- x-pack/test/functional/config_security_basic.ts | 2 +- x-pack/test/functional/ftr_provider_context.d.ts | 2 +- x-pack/test/functional/services/ml/api.ts | 2 +- x-pack/test/functional/services/ml/common_api.ts | 2 +- x-pack/test/functional/services/ml/common_ui.ts | 2 +- x-pack/test/functional/services/ml/custom_urls.ts | 2 +- .../services/ml/dashboard_job_selection_table.ts | 2 +- .../functional/services/ml/data_visualizer_table.ts | 2 +- x-pack/test/functional/services/ml/security_common.ts | 2 +- x-pack/test/functional/services/ml/test_resources.ts | 2 +- .../test/functional/services/transform/management.ts | 2 +- .../functional/services/transform/security_common.ts | 2 +- x-pack/test/functional_basic/config.ts | 2 +- x-pack/test/functional_basic/ftr_provider_context.d.ts | 2 +- x-pack/test/functional_cors/config.ts | 2 +- x-pack/test/functional_cors/ftr_provider_context.d.ts | 2 +- x-pack/test/functional_embedded/config.firefox.ts | 2 +- x-pack/test/functional_embedded/config.ts | 2 +- .../test/functional_embedded/ftr_provider_context.d.ts | 2 +- .../test/functional_enterprise_search/base_config.ts | 2 +- .../ftr_provider_context.d.ts | 2 +- .../with_host_configured.config.ts | 2 +- .../without_host_configured.config.ts | 2 +- x-pack/test/functional_vis_wizard/config.ts | 2 +- .../functional_vis_wizard/ftr_provider_context.d.ts | 2 +- x-pack/test/functional_with_es_ssl/config.ts | 2 +- .../functional_with_es_ssl/ftr_provider_context.d.ts | 2 +- x-pack/test/licensing_plugin/config.public.ts | 2 +- x-pack/test/licensing_plugin/config.ts | 2 +- x-pack/test/licensing_plugin/services.ts | 2 +- x-pack/test/lists_api_integration/common/config.ts | 2 +- .../common/ftr_provider_context.d.ts | 2 +- x-pack/test/load/config.ts | 2 +- .../observability_api_integration/common/config.ts | 2 +- x-pack/test/plugin_api_integration/config.ts | 2 +- .../plugin_api_integration/ftr_provider_context.d.ts | 2 +- x-pack/test/plugin_api_perf/ftr_provider_context.d.ts | 2 +- x-pack/test/plugin_functional/config.ts | 2 +- .../test/plugin_functional/ftr_provider_context.d.ts | 2 +- .../ftr_provider_context.d.ts | 2 +- .../reporting_and_security.config.ts | 2 +- .../reporting_without_security.config.ts | 2 +- .../reporting_functional/ftr_provider_context.d.ts | 2 +- .../reporting_and_security.config.ts | 2 +- .../reporting_without_security.config.ts | 2 +- .../test/saved_object_api_integration/common/config.ts | 2 +- .../common/ftr_provider_context.d.ts | 2 +- .../api_integration/security_and_spaces/config.ts | 2 +- .../api_integration/security_and_spaces/services.ts | 2 +- .../api_integration/tagging_api/config.ts | 2 +- .../api_integration/tagging_api/services.ts | 2 +- x-pack/test/saved_object_tagging/functional/config.ts | 2 +- .../functional/ftr_provider_context.ts | 2 +- x-pack/test/saved_objects_field_count/config.ts | 2 +- x-pack/test/search_sessions_integration/config.ts | 2 +- .../ftr_provider_context.d.ts | 2 +- .../test/security_api_integration/anonymous.config.ts | 2 +- .../anonymous_es_anonymous.config.ts | 2 +- x-pack/test/security_api_integration/audit.config.ts | 2 +- .../security_api_integration/ftr_provider_context.d.ts | 2 +- .../test/security_api_integration/kerberos.config.ts | 2 +- .../kerberos_anonymous_access.config.ts | 2 +- .../security_api_integration/login_selector.config.ts | 2 +- x-pack/test/security_api_integration/oidc.config.ts | 2 +- .../oidc_implicit_flow.config.ts | 2 +- x-pack/test/security_api_integration/pki.config.ts | 2 +- x-pack/test/security_api_integration/saml.config.ts | 2 +- .../security_api_integration/session_idle.config.ts | 2 +- .../session_invalidate.config.ts | 2 +- .../session_lifespan.config.ts | 2 +- x-pack/test/security_api_integration/token.config.ts | 2 +- .../test/security_functional/ftr_provider_context.d.ts | 2 +- .../test/security_functional/login_selector.config.ts | 2 +- x-pack/test/security_functional/oidc.config.ts | 2 +- x-pack/test/security_functional/saml.config.ts | 2 +- x-pack/test/security_solution_cypress/cli_config.ts | 2 +- .../test/security_solution_cypress/config.firefox.ts | 2 +- x-pack/test/security_solution_cypress/config.ts | 2 +- .../ftr_provider_context.d.ts | 2 +- x-pack/test/security_solution_cypress/visual_config.ts | 2 +- x-pack/test/security_solution_endpoint/config.ts | 2 +- .../ftr_provider_context.d.ts | 2 +- .../test/security_solution_endpoint_api_int/config.ts | 2 +- .../ftr_provider_context.d.ts | 2 +- x-pack/test/spaces_api_integration/common/config.ts | 2 +- .../common/ftr_provider_context.d.ts | 2 +- x-pack/test/ui_capabilities/common/config.ts | 2 +- .../ui_capabilities/common/ftr_provider_context.d.ts | 2 +- x-pack/test/upgrade/config.ts | 2 +- x-pack/test/upgrade/ftr_provider_context.d.ts | 2 +- x-pack/test/usage_collection/config.ts | 2 +- x-pack/test/usage_collection/ftr_provider_context.d.ts | 2 +- x-pack/test/visual_regression/config.ts | 2 +- .../test/visual_regression/ftr_provider_context.d.ts | 2 +- 151 files changed, 157 insertions(+), 162 deletions(-) rename packages/kbn-test/{types/ftr.d.ts => src/functional_test_runner/public_types.ts} (94%) delete mode 100644 packages/kbn-test/types/README.md diff --git a/packages/elastic-eslint-config-kibana/.eslintrc.js b/packages/elastic-eslint-config-kibana/.eslintrc.js index d37f6218b251c..eaa9b845b1511 100644 --- 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 index 2afbe41e0e00e..83b95eb311d9d 100644 --- 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 index 80d257f1cfb23..268c6b2bd9a67 100644 --- 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 b/packages/kbn-test/src/functional_test_runner/public_types.ts similarity index 94% rename from packages/kbn-test/types/ftr.d.ts rename to packages/kbn-test/src/functional_test_runner/public_types.ts index 83f725d86857e..915cb34f6ffe5 100644 --- a/packages/kbn-test/types/ftr.d.ts +++ b/packages/kbn-test/src/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 index 8536ad7e0c12f..3cb68029d74cf 100644 --- 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 deleted file mode 100644 index 1298d2a4afc0a..0000000000000 --- a/packages/kbn-test/types/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# @kbn/test/types - -Shared types used by different parts of the tests - - - **`ftr.d.ts`**: These types are generic types for using the functional test runner. They are here because we plan to move the functional test runner into the `@kbn/test` package at some point and having them here makes them a lot easier to import from all over the place like we do. \ No newline at end of file diff --git a/test/accessibility/config.ts b/test/accessibility/config.ts index 7364aced7af2c..2643ed8ab2a78 100644 --- 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 index 3cf8ae3e9a1c5..4c827393e1ef3 100644 --- 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 index 56dd8965b8411..91d35a2dbc32a 100644 --- 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 index 56dd8965b8411..91d35a2dbc32a 100644 --- 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 index e0113899b0836..5bf34af1bf9f3 100644 --- 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 index 9c5064b3b376c..d38f30a32ef61 100644 --- 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 index 3cf8ae3e9a1c5..4c827393e1ef3 100644 --- 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 index 10a9fa4cbcddd..923668816c558 100644 --- 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 index 111206ec9eafe..d0050859cbb32 100644 --- 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 index ca6b52dd77f13..b501acb296b35 100644 --- 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 index 2e52c52784afd..adcac520125ad 100644 --- 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 index 612dcbbd2e1eb..a6bd97464e2d0 100644 --- 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 index d21a157975ac8..1ff55edc010da 100644 --- 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 index fd87ff9bb2ffe..f61f3bbf240ec 100644 --- 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 index 5b92d44c66485..f3cdf426e9cbb 100644 --- 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 index 5689100c671bb..2df95f0297f90 100644 --- 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 index 81448bf641ebb..e9548b41b67a0 100644 --- 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 index 0d38b067f35d9..3c11a4c2689ba 100644 --- 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 index 2dd5767f2270c..ba3eb370048b8 100644 --- 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 index d0a714d6759b5..a0d9afa90f3fe 100644 --- 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 index cbbac3a5eb6a3..cace655ad7c5b 100644 --- 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 index 77416518f113b..ec52f387a8b98 100644 --- 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 index 19ea68b817ce5..0e9efb775fc7a 100644 --- 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 index d612023be9160..aa56557c09df8 100644 --- 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 index 5b46e7de1efa4..81cfd70a23956 100644 --- 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 index ec28c00e72e47..24f5087ef7fe2 100644 --- 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 index 6a0ab54087844..ec5367aed5b2b 100644 --- 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 index d612023be9160..aa56557c09df8 100644 --- 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 index 9fd7afbfacc40..5c998a4322480 100644 --- 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 index d4ff1574fa4ad..fc32e66c63e9e 100644 --- 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 index 441305e4ce7ed..93b1eefd350e9 100644 --- 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 index d612023be9160..aa56557c09df8 100644 --- 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 index 3e24e49d620de..446f8e07679e3 100644 --- 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 index db8621db0136e..63c97af0ed22a 100644 --- 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 index 732f14d2a7bc8..68a0c6b4e9f1c 100644 --- 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 index 7ca731854152b..cac4304696431 100644 --- 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'; diff --git a/x-pack/test/banners_functional/config.ts b/x-pack/test/banners_functional/config.ts index 21cce31ca5d85..a4b2867b8d7ce 100644 --- a/x-pack/test/banners_functional/config.ts +++ b/x-pack/test/banners_functional/config.ts @@ -6,7 +6,7 @@ */ import path from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services, pageObjects } from './ftr_provider_context'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { diff --git a/x-pack/test/banners_functional/ftr_provider_context.ts b/x-pack/test/banners_functional/ftr_provider_context.ts index faac2954b00f6..c641b4efcc493 100644 --- a/x-pack/test/banners_functional/ftr_provider_context.ts +++ b/x-pack/test/banners_functional/ftr_provider_context.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@kbn/test'; import { services } from '../functional/services'; import { pageObjects } from '../functional/page_objects'; diff --git a/x-pack/test/case_api_integration/common/config.ts b/x-pack/test/case_api_integration/common/config.ts index 3c81407276453..8beabe450f66e 100644 --- a/x-pack/test/case_api_integration/common/config.ts +++ b/x-pack/test/case_api_integration/common/config.ts @@ -6,7 +6,7 @@ */ import { CA_CERT_PATH } from '@kbn/dev-utils'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import path from 'path'; import fs from 'fs'; diff --git a/x-pack/test/case_api_integration/common/ftr_provider_context.d.ts b/x-pack/test/case_api_integration/common/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/case_api_integration/common/ftr_provider_context.d.ts +++ b/x-pack/test/case_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/common/ftr_provider_context.ts b/x-pack/test/common/ftr_provider_context.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/common/ftr_provider_context.ts +++ b/x-pack/test/common/ftr_provider_context.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/detection_engine_api_integration/common/config.ts b/x-pack/test/detection_engine_api_integration/common/config.ts index 355703ae35052..659c836eb9207 100644 --- a/x-pack/test/detection_engine_api_integration/common/config.ts +++ b/x-pack/test/detection_engine_api_integration/common/config.ts @@ -6,7 +6,7 @@ */ import { CA_CERT_PATH } from '@kbn/dev-utils'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; interface CreateTestConfigOptions { diff --git a/x-pack/test/detection_engine_api_integration/common/ftr_provider_context.d.ts b/x-pack/test/detection_engine_api_integration/common/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/detection_engine_api_integration/common/ftr_provider_context.d.ts +++ b/x-pack/test/detection_engine_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/encrypted_saved_objects_api_integration/config.ts b/x-pack/test/encrypted_saved_objects_api_integration/config.ts index 71903fe6c73a8..9305431711de6 100644 --- a/x-pack/test/encrypted_saved_objects_api_integration/config.ts +++ b/x-pack/test/encrypted_saved_objects_api_integration/config.ts @@ -6,7 +6,7 @@ */ import path from 'path'; -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/x-pack/test/encrypted_saved_objects_api_integration/ftr_provider_context.d.ts b/x-pack/test/encrypted_saved_objects_api_integration/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/encrypted_saved_objects_api_integration/ftr_provider_context.d.ts +++ b/x-pack/test/encrypted_saved_objects_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/endpoint_api_integration_no_ingest/config.ts b/x-pack/test/endpoint_api_integration_no_ingest/config.ts index 9670d809699b7..c6837256cf61b 100644 --- a/x-pack/test/endpoint_api_integration_no_ingest/config.ts +++ b/x-pack/test/endpoint_api_integration_no_ingest/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 xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts')); diff --git a/x-pack/test/endpoint_api_integration_no_ingest/ftr_provider_context.d.ts b/x-pack/test/endpoint_api_integration_no_ingest/ftr_provider_context.d.ts index db8621db0136e..63c97af0ed22a 100644 --- a/x-pack/test/endpoint_api_integration_no_ingest/ftr_provider_context.d.ts +++ b/x-pack/test/endpoint_api_integration_no_ingest/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/examples/config.ts b/x-pack/test/examples/config.ts index fe1b5ce299447..491c23a33a3ef 100644 --- a/x-pack/test/examples/config.ts +++ b/x-pack/test/examples/config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { resolve } from 'path'; import fs from 'fs'; // @ts-expect-error https://github.com/elastic/kibana/issues/95679 diff --git a/x-pack/test/fleet_api_integration/config.ts b/x-pack/test/fleet_api_integration/config.ts index 2344bdc32904a..cd47da8ef5fc3 100644 --- a/x-pack/test/fleet_api_integration/config.ts +++ b/x-pack/test/fleet_api_integration/config.ts @@ -7,7 +7,7 @@ import path from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { defineDockerServersConfig } from '@kbn/test'; // Docker image to use for Fleet API integration tests. diff --git a/x-pack/test/fleet_functional/config.ts b/x-pack/test/fleet_functional/config.ts index 386f39d7ec668..15d0c72ffc603 100644 --- a/x-pack/test/fleet_functional/config.ts +++ b/x-pack/test/fleet_functional/config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { pageObjects } from './page_objects'; import { services } from './services'; diff --git a/x-pack/test/fleet_functional/ftr_provider_context.d.ts b/x-pack/test/fleet_functional/ftr_provider_context.d.ts index ec28c00e72e47..24f5087ef7fe2 100644 --- a/x-pack/test/fleet_functional/ftr_provider_context.d.ts +++ b/x-pack/test/fleet_functional/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/functional/config_security_basic.ts b/x-pack/test/functional/config_security_basic.ts index d8d008508785a..4deb598fe8769 100644 --- a/x-pack/test/functional/config_security_basic.ts +++ b/x-pack/test/functional/config_security_basic.ts @@ -9,7 +9,7 @@ import { resolve } from 'path'; -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/functional/ftr_provider_context.d.ts b/x-pack/test/functional/ftr_provider_context.d.ts index ec28c00e72e47..24f5087ef7fe2 100644 --- a/x-pack/test/functional/ftr_provider_context.d.ts +++ b/x-pack/test/functional/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/functional/services/ml/api.ts b/x-pack/test/functional/services/ml/api.ts index 7d09deff6f6b7..3a3d109f45ae7 100644 --- a/x-pack/test/functional/services/ml/api.ts +++ b/x-pack/test/functional/services/ml/api.ts @@ -7,7 +7,7 @@ import { estypes } from '@elastic/elasticsearch'; import expect from '@kbn/expect'; -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { Calendar } from '../../../../plugins/ml/server/models/calendar/index'; import { Annotation } from '../../../../plugins/ml/common/types/annotations'; import { DataFrameAnalyticsConfig } from '../../../../plugins/ml/public/application/data_frame_analytics/common'; diff --git a/x-pack/test/functional/services/ml/common_api.ts b/x-pack/test/functional/services/ml/common_api.ts index 22be24548892f..02cfecfc5208f 100644 --- a/x-pack/test/functional/services/ml/common_api.ts +++ b/x-pack/test/functional/services/ml/common_api.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/functional/services/ml/common_ui.ts b/x-pack/test/functional/services/ml/common_ui.ts index b7ed95ef76ece..21a3574eee5ad 100644 --- a/x-pack/test/functional/services/ml/common_ui.ts +++ b/x-pack/test/functional/services/ml/common_ui.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/functional/services/ml/custom_urls.ts b/x-pack/test/functional/services/ml/custom_urls.ts index 7c424c021fd6c..0b24c565b2fa8 100644 --- a/x-pack/test/functional/services/ml/custom_urls.ts +++ b/x-pack/test/functional/services/ml/custom_urls.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/functional/services/ml/dashboard_job_selection_table.ts b/x-pack/test/functional/services/ml/dashboard_job_selection_table.ts index f372928d92a50..4fc90585f1408 100644 --- a/x-pack/test/functional/services/ml/dashboard_job_selection_table.ts +++ b/x-pack/test/functional/services/ml/dashboard_job_selection_table.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { FtrProviderContext } from '../../ftr_provider_context'; export type MlDashboardJobSelectionTable = ProvidedType< diff --git a/x-pack/test/functional/services/ml/data_visualizer_table.ts b/x-pack/test/functional/services/ml/data_visualizer_table.ts index 3bd3b7e2e783a..cdd91da8ff9e6 100644 --- a/x-pack/test/functional/services/ml/data_visualizer_table.ts +++ b/x-pack/test/functional/services/ml/data_visualizer_table.ts @@ -6,7 +6,7 @@ */ import expect from '@kbn/expect'; -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { FtrProviderContext } from '../../ftr_provider_context'; import { ML_JOB_FIELD_TYPES } from '../../../../plugins/ml/common/constants/field_types'; import { MlCommonUI } from './common_ui'; diff --git a/x-pack/test/functional/services/ml/security_common.ts b/x-pack/test/functional/services/ml/security_common.ts index 28d912a756acd..847730ca73548 100644 --- a/x-pack/test/functional/services/ml/security_common.ts +++ b/x-pack/test/functional/services/ml/security_common.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/functional/services/ml/test_resources.ts b/x-pack/test/functional/services/ml/test_resources.ts index 547ff782bcbe5..f967099e10fa3 100644 --- a/x-pack/test/functional/services/ml/test_resources.ts +++ b/x-pack/test/functional/services/ml/test_resources.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { savedSearches, dashboards } from './test_resources_data'; import { COMMON_REQUEST_HEADERS } from './common_api'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/functional/services/transform/management.ts b/x-pack/test/functional/services/transform/management.ts index 807c3d49e344c..0aecc695049d1 100644 --- a/x-pack/test/functional/services/transform/management.ts +++ b/x-pack/test/functional/services/transform/management.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { FtrProviderContext } from '../../ftr_provider_context'; export type TransformManagement = ProvidedType; diff --git a/x-pack/test/functional/services/transform/security_common.ts b/x-pack/test/functional/services/transform/security_common.ts index 12b24d45f5448..bae31dffa1412 100644 --- a/x-pack/test/functional/services/transform/security_common.ts +++ b/x-pack/test/functional/services/transform/security_common.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ProvidedType } from '@kbn/test/types/ftr'; +import { ProvidedType } from '@kbn/test'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/functional_basic/config.ts b/x-pack/test/functional_basic/config.ts index ce72362076da1..e1dac88436e4c 100644 --- a/x-pack/test/functional_basic/config.ts +++ b/x-pack/test/functional_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 xpackFunctionalConfig = await readConfigFile(require.resolve('../functional/config.js')); diff --git a/x-pack/test/functional_basic/ftr_provider_context.d.ts b/x-pack/test/functional_basic/ftr_provider_context.d.ts index 0225c54768af5..66d4e37b795ca 100644 --- a/x-pack/test/functional_basic/ftr_provider_context.d.ts +++ b/x-pack/test/functional_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 { pageObjects } from '../functional/page_objects'; import { services } from '../functional/services'; diff --git a/x-pack/test/functional_cors/config.ts b/x-pack/test/functional_cors/config.ts index 42e7771b14401..e9ac4cc5c464c 100644 --- a/x-pack/test/functional_cors/config.ts +++ b/x-pack/test/functional_cors/config.ts @@ -7,7 +7,7 @@ import Url from 'url'; import Path from 'path'; -import type { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import type { FtrConfigProviderContext } from '@kbn/test'; // @ts-expect-error https://github.com/elastic/kibana/issues/95679 import { kbnTestConfig } from '@kbn/test'; import { pageObjects } from '../functional/page_objects'; diff --git a/x-pack/test/functional_cors/ftr_provider_context.d.ts b/x-pack/test/functional_cors/ftr_provider_context.d.ts index b1301d9ee8c49..d6c0afa5ceffd 100644 --- a/x-pack/test/functional_cors/ftr_provider_context.d.ts +++ b/x-pack/test/functional_cors/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 '../functional/page_objects'; import { services } from './services'; diff --git a/x-pack/test/functional_embedded/config.firefox.ts b/x-pack/test/functional_embedded/config.firefox.ts index a8a16f5c59b9e..49359d37673de 100644 --- a/x-pack/test/functional_embedded/config.firefox.ts +++ b/x-pack/test/functional_embedded/config.firefox.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 chromeConfig = await readConfigFile(require.resolve('./config')); diff --git a/x-pack/test/functional_embedded/config.ts b/x-pack/test/functional_embedded/config.ts index 33656eb857f58..868d53ee17ee9 100644 --- a/x-pack/test/functional_embedded/config.ts +++ b/x-pack/test/functional_embedded/config.ts @@ -8,7 +8,7 @@ import Fs from 'fs'; import { resolve } from 'path'; import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { pageObjects } from '../functional/page_objects'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { diff --git a/x-pack/test/functional_embedded/ftr_provider_context.d.ts b/x-pack/test/functional_embedded/ftr_provider_context.d.ts index b1301d9ee8c49..d6c0afa5ceffd 100644 --- a/x-pack/test/functional_embedded/ftr_provider_context.d.ts +++ b/x-pack/test/functional_embedded/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 '../functional/page_objects'; import { services } from './services'; diff --git a/x-pack/test/functional_enterprise_search/base_config.ts b/x-pack/test/functional_enterprise_search/base_config.ts index 5687bd48c9bad..2c21ccf5c5c39 100644 --- a/x-pack/test/functional_enterprise_search/base_config.ts +++ b/x-pack/test/functional_enterprise_search/base_config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { pageObjects } from './page_objects'; import { services } from './services'; diff --git a/x-pack/test/functional_enterprise_search/ftr_provider_context.d.ts b/x-pack/test/functional_enterprise_search/ftr_provider_context.d.ts index ec28c00e72e47..24f5087ef7fe2 100644 --- a/x-pack/test/functional_enterprise_search/ftr_provider_context.d.ts +++ b/x-pack/test/functional_enterprise_search/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/functional_enterprise_search/with_host_configured.config.ts b/x-pack/test/functional_enterprise_search/with_host_configured.config.ts index 66e638b69f5b8..1da62ffe56a5b 100644 --- a/x-pack/test/functional_enterprise_search/with_host_configured.config.ts +++ b/x-pack/test/functional_enterprise_search/with_host_configured.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const baseConfig = await readConfigFile(require.resolve('./base_config')); diff --git a/x-pack/test/functional_enterprise_search/without_host_configured.config.ts b/x-pack/test/functional_enterprise_search/without_host_configured.config.ts index 6d9fe32312d20..f5af2bddd8531 100644 --- a/x-pack/test/functional_enterprise_search/without_host_configured.config.ts +++ b/x-pack/test/functional_enterprise_search/without_host_configured.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const baseConfig = await readConfigFile(require.resolve('./base_config')); diff --git a/x-pack/test/functional_vis_wizard/config.ts b/x-pack/test/functional_vis_wizard/config.ts index 643718d78df08..523b59b6ccd1c 100644 --- a/x-pack/test/functional_vis_wizard/config.ts +++ b/x-pack/test/functional_vis_wizard/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 xPackFunctionalConfig = await readConfigFile(require.resolve('../functional/config')); diff --git a/x-pack/test/functional_vis_wizard/ftr_provider_context.d.ts b/x-pack/test/functional_vis_wizard/ftr_provider_context.d.ts index 89681747cbb55..ab1e999222808 100644 --- a/x-pack/test/functional_vis_wizard/ftr_provider_context.d.ts +++ b/x-pack/test/functional_vis_wizard/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 '../functional/page_objects'; import { services } from '../functional/services'; diff --git a/x-pack/test/functional_with_es_ssl/config.ts b/x-pack/test/functional_with_es_ssl/config.ts index 91a349e1bf44a..3ed382053f561 100644 --- a/x-pack/test/functional_with_es_ssl/config.ts +++ b/x-pack/test/functional_with_es_ssl/config.ts @@ -8,7 +8,7 @@ import Fs from 'fs'; import { resolve, join } from 'path'; import { CA_CERT_PATH } from '@kbn/dev-utils'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { pageObjects } from './page_objects'; // .server-log is specifically not enabled diff --git a/x-pack/test/functional_with_es_ssl/ftr_provider_context.d.ts b/x-pack/test/functional_with_es_ssl/ftr_provider_context.d.ts index 576d296e72e88..821731a07f457 100644 --- a/x-pack/test/functional_with_es_ssl/ftr_provider_context.d.ts +++ b/x-pack/test/functional_with_es_ssl/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 '../functional/services'; import { pageObjects } from './page_objects'; diff --git a/x-pack/test/licensing_plugin/config.public.ts b/x-pack/test/licensing_plugin/config.public.ts index 0de536d7125ca..a9df9f6ad1e96 100644 --- a/x-pack/test/licensing_plugin/config.public.ts +++ b/x-pack/test/licensing_plugin/config.public.ts @@ -8,7 +8,7 @@ import path from 'path'; // @ts-expect-error https://github.com/elastic/kibana/issues/95679 import { KIBANA_ROOT } from '@kbn/test'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const commonConfig = await readConfigFile(require.resolve('./config')); diff --git a/x-pack/test/licensing_plugin/config.ts b/x-pack/test/licensing_plugin/config.ts index ccd9494052817..155d761020b29 100644 --- a/x-pack/test/licensing_plugin/config.ts +++ b/x-pack/test/licensing_plugin/config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services, pageObjects } from './services'; const license = 'basic'; diff --git a/x-pack/test/licensing_plugin/services.ts b/x-pack/test/licensing_plugin/services.ts index eb5b22731718c..fe98c9f23d174 100644 --- a/x-pack/test/licensing_plugin/services.ts +++ b/x-pack/test/licensing_plugin/services.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@kbn/test'; import { services as functionalTestServices } from '../functional/services'; import { services as kibanaApiIntegrationServices } from '../api_integration/services'; diff --git a/x-pack/test/lists_api_integration/common/config.ts b/x-pack/test/lists_api_integration/common/config.ts index 693155d376b53..24b47472d7945 100644 --- a/x-pack/test/lists_api_integration/common/config.ts +++ b/x-pack/test/lists_api_integration/common/config.ts @@ -7,7 +7,7 @@ import path from 'path'; import { CA_CERT_PATH } from '@kbn/dev-utils'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; interface CreateTestConfigOptions { diff --git a/x-pack/test/lists_api_integration/common/ftr_provider_context.d.ts b/x-pack/test/lists_api_integration/common/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/lists_api_integration/common/ftr_provider_context.d.ts +++ b/x-pack/test/lists_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/load/config.ts b/x-pack/test/load/config.ts index f8de5c28b8a10..54789b56d9912 100644 --- a/x-pack/test/load/config.ts +++ b/x-pack/test/load/config.ts @@ -7,7 +7,7 @@ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { GatlingTestRunner } from './runner'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { diff --git a/x-pack/test/observability_api_integration/common/config.ts b/x-pack/test/observability_api_integration/common/config.ts index 748b6ef7215e6..83249182084f3 100644 --- a/x-pack/test/observability_api_integration/common/config.ts +++ b/x-pack/test/observability_api_integration/common/config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; interface Settings { license: 'basic' | 'trial'; diff --git a/x-pack/test/plugin_api_integration/config.ts b/x-pack/test/plugin_api_integration/config.ts index 87f8b77028bda..09bec3330c390 100644 --- a/x-pack/test/plugin_api_integration/config.ts +++ b/x-pack/test/plugin_api_integration/config.ts @@ -7,7 +7,7 @@ import path from 'path'; import fs from 'fs'; -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/x-pack/test/plugin_api_integration/ftr_provider_context.d.ts b/x-pack/test/plugin_api_integration/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/plugin_api_integration/ftr_provider_context.d.ts +++ b/x-pack/test/plugin_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/plugin_api_perf/ftr_provider_context.d.ts b/x-pack/test/plugin_api_perf/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/plugin_api_perf/ftr_provider_context.d.ts +++ b/x-pack/test/plugin_api_perf/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/plugin_functional/config.ts b/x-pack/test/plugin_functional/config.ts index 104d11eb87f7c..8b0ad12891dc3 100644 --- a/x-pack/test/plugin_functional/config.ts +++ b/x-pack/test/plugin_functional/config.ts @@ -9,7 +9,7 @@ import { resolve } from 'path'; import fs from 'fs'; // @ts-expect-error https://github.com/elastic/kibana/issues/95679 import { KIBANA_ROOT } from '@kbn/test'; -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/plugin_functional/ftr_provider_context.d.ts b/x-pack/test/plugin_functional/ftr_provider_context.d.ts index 2dce44a533405..13bd4b46607c4 100644 --- a/x-pack/test/plugin_functional/ftr_provider_context.d.ts +++ b/x-pack/test/plugin_functional/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'; import { pageObjects } from './page_objects'; diff --git a/x-pack/test/reporting_api_integration/ftr_provider_context.d.ts b/x-pack/test/reporting_api_integration/ftr_provider_context.d.ts index 671866cad6ff5..647664d640466 100644 --- a/x-pack/test/reporting_api_integration/ftr_provider_context.d.ts +++ b/x-pack/test/reporting_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'; export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/test/reporting_api_integration/reporting_and_security.config.ts b/x-pack/test/reporting_api_integration/reporting_and_security.config.ts index 623799c84d860..0d1839c7a138f 100644 --- a/x-pack/test/reporting_api_integration/reporting_and_security.config.ts +++ b/x-pack/test/reporting_api_integration/reporting_and_security.config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { resolve } from 'path'; import { ReportingAPIProvider } from './services'; diff --git a/x-pack/test/reporting_api_integration/reporting_without_security.config.ts b/x-pack/test/reporting_api_integration/reporting_without_security.config.ts index b962ab30876a5..dfd79916b5ce0 100644 --- a/x-pack/test/reporting_api_integration/reporting_without_security.config.ts +++ b/x-pack/test/reporting_api_integration/reporting_without_security.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 apiConfig = await readConfigFile(require.resolve('./reporting_and_security.config')); diff --git a/x-pack/test/reporting_functional/ftr_provider_context.d.ts b/x-pack/test/reporting_functional/ftr_provider_context.d.ts index 58ebd71086130..e66e69e5ab2f7 100644 --- a/x-pack/test/reporting_functional/ftr_provider_context.d.ts +++ b/x-pack/test/reporting_functional/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 '../functional/page_objects'; import { services } from './services'; diff --git a/x-pack/test/reporting_functional/reporting_and_security.config.ts b/x-pack/test/reporting_functional/reporting_and_security.config.ts index 1f9ec5754e0bd..536695b4c6dc9 100644 --- a/x-pack/test/reporting_functional/reporting_and_security.config.ts +++ b/x-pack/test/reporting_functional/reporting_and_security.config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { resolve } from 'path'; import { ReportingAPIProvider } from '../reporting_api_integration/services'; import { ReportingFunctionalProvider } from './services'; diff --git a/x-pack/test/reporting_functional/reporting_without_security.config.ts b/x-pack/test/reporting_functional/reporting_without_security.config.ts index b88c611543953..0269f57bf08cb 100644 --- a/x-pack/test/reporting_functional/reporting_without_security.config.ts +++ b/x-pack/test/reporting_functional/reporting_without_security.config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { resolve } from 'path'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { diff --git a/x-pack/test/saved_object_api_integration/common/config.ts b/x-pack/test/saved_object_api_integration/common/config.ts index ee219e9d246a7..f83afb4db2412 100644 --- a/x-pack/test/saved_object_api_integration/common/config.ts +++ b/x-pack/test/saved_object_api_integration/common/config.ts @@ -8,7 +8,7 @@ import path from 'path'; import { REPO_ROOT } from '@kbn/utils'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; diff --git a/x-pack/test/saved_object_api_integration/common/ftr_provider_context.d.ts b/x-pack/test/saved_object_api_integration/common/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/saved_object_api_integration/common/ftr_provider_context.d.ts +++ b/x-pack/test/saved_object_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/saved_object_tagging/api_integration/security_and_spaces/config.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts index e7b015ff92296..08ba10b64e579 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts @@ -6,7 +6,7 @@ */ import path from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; // eslint-disable-next-line import/no-default-export diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/services.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/services.ts index 1d26b3dd35c96..194d6ec533066 100644 --- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/services.ts +++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/services.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@kbn/test'; import { services as apiIntegrationServices } from '../../../api_integration/services'; export const services = { diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts index 11f776356df69..ebdb055bd5e89 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts @@ -6,7 +6,7 @@ */ import path from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; // eslint-disable-next-line import/no-default-export diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/services.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/services.ts index 1d26b3dd35c96..194d6ec533066 100644 --- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/services.ts +++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/services.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@kbn/test'; import { services as apiIntegrationServices } from '../../../api_integration/services'; export const services = { diff --git a/x-pack/test/saved_object_tagging/functional/config.ts b/x-pack/test/saved_object_tagging/functional/config.ts index ccb55d37f5fa0..0044063e18c69 100644 --- a/x-pack/test/saved_object_tagging/functional/config.ts +++ b/x-pack/test/saved_object_tagging/functional/config.ts @@ -6,7 +6,7 @@ */ import path from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services, pageObjects } from './ftr_provider_context'; // eslint-disable-next-line import/no-default-export diff --git a/x-pack/test/saved_object_tagging/functional/ftr_provider_context.ts b/x-pack/test/saved_object_tagging/functional/ftr_provider_context.ts index 849dca0989335..643f34a59f69c 100644 --- a/x-pack/test/saved_object_tagging/functional/ftr_provider_context.ts +++ b/x-pack/test/saved_object_tagging/functional/ftr_provider_context.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { GenericFtrProviderContext } from '@kbn/test/types/ftr'; +import { GenericFtrProviderContext } from '@kbn/test'; import { services } from '../../functional/services'; import { pageObjects } from '../../functional/page_objects'; diff --git a/x-pack/test/saved_objects_field_count/config.ts b/x-pack/test/saved_objects_field_count/config.ts index ab9c88ae86330..8144bac35ec7b 100644 --- a/x-pack/test/saved_objects_field_count/config.ts +++ b/x-pack/test/saved_objects_field_count/config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { testRunner } from './runner'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { diff --git a/x-pack/test/search_sessions_integration/config.ts b/x-pack/test/search_sessions_integration/config.ts index 831257738f64c..1e2d648712098 100644 --- a/x-pack/test/search_sessions_integration/config.ts +++ b/x-pack/test/search_sessions_integration/config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from '../functional/services'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { diff --git a/x-pack/test/search_sessions_integration/ftr_provider_context.d.ts b/x-pack/test/search_sessions_integration/ftr_provider_context.d.ts index c65eeb91fe5b9..8ce17281223e1 100644 --- a/x-pack/test/search_sessions_integration/ftr_provider_context.d.ts +++ b/x-pack/test/search_sessions_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 { pageObjects } from '../functional/page_objects'; import { services } from '../functional/services'; diff --git a/x-pack/test/security_api_integration/anonymous.config.ts b/x-pack/test/security_api_integration/anonymous.config.ts index ab2573822d440..80ac45507de73 100644 --- a/x-pack/test/security_api_integration/anonymous.config.ts +++ b/x-pack/test/security_api_integration/anonymous.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 kibanaAPITestsConfig = await readConfigFile( diff --git a/x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts b/x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts index 25fb8154dd8d4..60691769729fa 100644 --- a/x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts +++ b/x-pack/test/security_api_integration/anonymous_es_anonymous.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 anonymousAPITestsConfig = await readConfigFile(require.resolve('./anonymous.config.ts')); diff --git a/x-pack/test/security_api_integration/audit.config.ts b/x-pack/test/security_api_integration/audit.config.ts index 60b1c0bf1fa80..02b3870c18f89 100644 --- a/x-pack/test/security_api_integration/audit.config.ts +++ b/x-pack/test/security_api_integration/audit.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts')); diff --git a/x-pack/test/security_api_integration/ftr_provider_context.d.ts b/x-pack/test/security_api_integration/ftr_provider_context.d.ts index 671866cad6ff5..647664d640466 100644 --- a/x-pack/test/security_api_integration/ftr_provider_context.d.ts +++ b/x-pack/test/security_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'; export type FtrProviderContext = GenericFtrProviderContext; diff --git a/x-pack/test/security_api_integration/kerberos.config.ts b/x-pack/test/security_api_integration/kerberos.config.ts index a3722c4a3f75c..9480d734bef3b 100644 --- a/x-pack/test/security_api_integration/kerberos.config.ts +++ b/x-pack/test/security_api_integration/kerberos.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -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/x-pack/test/security_api_integration/kerberos_anonymous_access.config.ts b/x-pack/test/security_api_integration/kerberos_anonymous_access.config.ts index 40ec36e51f702..355f0e90bcd91 100644 --- a/x-pack/test/security_api_integration/kerberos_anonymous_access.config.ts +++ b/x-pack/test/security_api_integration/kerberos_anonymous_access.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 kerberosAPITestsConfig = await readConfigFile(require.resolve('./kerberos.config.ts')); diff --git a/x-pack/test/security_api_integration/login_selector.config.ts b/x-pack/test/security_api_integration/login_selector.config.ts index 9603356568011..be5f8d746b070 100644 --- a/x-pack/test/security_api_integration/login_selector.config.ts +++ b/x-pack/test/security_api_integration/login_selector.config.ts @@ -8,7 +8,7 @@ import { readFileSync } from 'fs'; import { resolve } from 'path'; import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const kibanaAPITestsConfig = await readConfigFile( diff --git a/x-pack/test/security_api_integration/oidc.config.ts b/x-pack/test/security_api_integration/oidc.config.ts index 05fbaa4122818..a475d77aa568b 100644 --- a/x-pack/test/security_api_integration/oidc.config.ts +++ b/x-pack/test/security_api_integration/oidc.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -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/x-pack/test/security_api_integration/oidc_implicit_flow.config.ts b/x-pack/test/security_api_integration/oidc_implicit_flow.config.ts index 685b71358846e..3b9edcbec6826 100644 --- a/x-pack/test/security_api_integration/oidc_implicit_flow.config.ts +++ b/x-pack/test/security_api_integration/oidc_implicit_flow.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 oidcAPITestsConfig = await readConfigFile(require.resolve('./oidc.config.ts')); diff --git a/x-pack/test/security_api_integration/pki.config.ts b/x-pack/test/security_api_integration/pki.config.ts index c284ddc800327..d920a4375753c 100644 --- a/x-pack/test/security_api_integration/pki.config.ts +++ b/x-pack/test/security_api_integration/pki.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils'; import { services } from './services'; diff --git a/x-pack/test/security_api_integration/saml.config.ts b/x-pack/test/security_api_integration/saml.config.ts index fb373844ed79c..8874dd9228c01 100644 --- a/x-pack/test/security_api_integration/saml.config.ts +++ b/x-pack/test/security_api_integration/saml.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -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/x-pack/test/security_api_integration/session_idle.config.ts b/x-pack/test/security_api_integration/session_idle.config.ts index 92549b8369365..77d91f6df3cef 100644 --- a/x-pack/test/security_api_integration/session_idle.config.ts +++ b/x-pack/test/security_api_integration/session_idle.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; // the default export of config files must be a config provider diff --git a/x-pack/test/security_api_integration/session_invalidate.config.ts b/x-pack/test/security_api_integration/session_invalidate.config.ts index 82510062035a9..7d69ca50c0320 100644 --- a/x-pack/test/security_api_integration/session_invalidate.config.ts +++ b/x-pack/test/security_api_integration/session_invalidate.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; // the default export of config files must be a config provider diff --git a/x-pack/test/security_api_integration/session_lifespan.config.ts b/x-pack/test/security_api_integration/session_lifespan.config.ts index 1dbcfbf96d551..b692f10bad5a6 100644 --- a/x-pack/test/security_api_integration/session_lifespan.config.ts +++ b/x-pack/test/security_api_integration/session_lifespan.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; // the default export of config files must be a config provider diff --git a/x-pack/test/security_api_integration/token.config.ts b/x-pack/test/security_api_integration/token.config.ts index 170d98bf5efa4..54efd77ca8ae9 100644 --- a/x-pack/test/security_api_integration/token.config.ts +++ b/x-pack/test/security_api_integration/token.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 default async function ({ readConfigFile }: FtrConfigProviderContext) { diff --git a/x-pack/test/security_functional/ftr_provider_context.d.ts b/x-pack/test/security_functional/ftr_provider_context.d.ts index 0225c54768af5..66d4e37b795ca 100644 --- a/x-pack/test/security_functional/ftr_provider_context.d.ts +++ b/x-pack/test/security_functional/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 '../functional/page_objects'; import { services } from '../functional/services'; diff --git a/x-pack/test/security_functional/login_selector.config.ts b/x-pack/test/security_functional/login_selector.config.ts index 39f797c488e00..f09df70067a0c 100644 --- a/x-pack/test/security_functional/login_selector.config.ts +++ b/x-pack/test/security_functional/login_selector.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from '../functional/services'; import { pageObjects } from '../functional/page_objects'; diff --git a/x-pack/test/security_functional/oidc.config.ts b/x-pack/test/security_functional/oidc.config.ts index dcf9177eb52b1..64945a68abe1d 100644 --- a/x-pack/test/security_functional/oidc.config.ts +++ b/x-pack/test/security_functional/oidc.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from '../functional/services'; import { pageObjects } from '../functional/page_objects'; diff --git a/x-pack/test/security_functional/saml.config.ts b/x-pack/test/security_functional/saml.config.ts index 3715b826824e1..05656071d3467 100644 --- a/x-pack/test/security_functional/saml.config.ts +++ b/x-pack/test/security_functional/saml.config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from '../functional/services'; import { pageObjects } from '../functional/page_objects'; diff --git a/x-pack/test/security_solution_cypress/cli_config.ts b/x-pack/test/security_solution_cypress/cli_config.ts index 2fc32a5210813..443c3dd423409 100644 --- a/x-pack/test/security_solution_cypress/cli_config.ts +++ b/x-pack/test/security_solution_cypress/cli_config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { SecuritySolutionCypressCliTestRunner } from './runner'; diff --git a/x-pack/test/security_solution_cypress/config.firefox.ts b/x-pack/test/security_solution_cypress/config.firefox.ts index 5d11c6d9364a1..9c9f2c2314a31 100644 --- a/x-pack/test/security_solution_cypress/config.firefox.ts +++ b/x-pack/test/security_solution_cypress/config.firefox.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'; diff --git a/x-pack/test/security_solution_cypress/config.ts b/x-pack/test/security_solution_cypress/config.ts index e096bafc9e262..95743369de0d7 100644 --- a/x-pack/test/security_solution_cypress/config.ts +++ b/x-pack/test/security_solution_cypress/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'; diff --git a/x-pack/test/security_solution_cypress/ftr_provider_context.d.ts b/x-pack/test/security_solution_cypress/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/security_solution_cypress/ftr_provider_context.d.ts +++ b/x-pack/test/security_solution_cypress/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/security_solution_cypress/visual_config.ts b/x-pack/test/security_solution_cypress/visual_config.ts index 489dd1e626221..b6808a4c35638 100644 --- a/x-pack/test/security_solution_cypress/visual_config.ts +++ b/x-pack/test/security_solution_cypress/visual_config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { SecuritySolutionCypressVisualTestRunner } from './runner'; diff --git a/x-pack/test/security_solution_endpoint/config.ts b/x-pack/test/security_solution_endpoint/config.ts index 77a63acc389e2..188cccac9301b 100644 --- a/x-pack/test/security_solution_endpoint/config.ts +++ b/x-pack/test/security_solution_endpoint/config.ts @@ -6,7 +6,7 @@ */ import { resolve } from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { pageObjects } from './page_objects'; import { services } from './services'; import { diff --git a/x-pack/test/security_solution_endpoint/ftr_provider_context.d.ts b/x-pack/test/security_solution_endpoint/ftr_provider_context.d.ts index ec28c00e72e47..24f5087ef7fe2 100644 --- a/x-pack/test/security_solution_endpoint/ftr_provider_context.d.ts +++ b/x-pack/test/security_solution_endpoint/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/security_solution_endpoint_api_int/config.ts b/x-pack/test/security_solution_endpoint_api_int/config.ts index a2eec01046161..d53365a8b6ec6 100644 --- a/x-pack/test/security_solution_endpoint_api_int/config.ts +++ b/x-pack/test/security_solution_endpoint_api_int/config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { createEndpointDockerConfig, getRegistryUrlAsArray } from './registry'; import { services } from './services'; diff --git a/x-pack/test/security_solution_endpoint_api_int/ftr_provider_context.d.ts b/x-pack/test/security_solution_endpoint_api_int/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/security_solution_endpoint_api_int/ftr_provider_context.d.ts +++ b/x-pack/test/security_solution_endpoint_api_int/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/spaces_api_integration/common/config.ts b/x-pack/test/spaces_api_integration/common/config.ts index 2daebba801200..d1e4dae76b636 100644 --- a/x-pack/test/spaces_api_integration/common/config.ts +++ b/x-pack/test/spaces_api_integration/common/config.ts @@ -7,7 +7,7 @@ import path from 'path'; import { REPO_ROOT } from '@kbn/utils'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; interface CreateTestConfigOptions { license: string; diff --git a/x-pack/test/spaces_api_integration/common/ftr_provider_context.d.ts b/x-pack/test/spaces_api_integration/common/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/spaces_api_integration/common/ftr_provider_context.d.ts +++ b/x-pack/test/spaces_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/ui_capabilities/common/config.ts b/x-pack/test/ui_capabilities/common/config.ts index 0c40df181ffdc..9c0ce92755e8e 100644 --- a/x-pack/test/ui_capabilities/common/config.ts +++ b/x-pack/test/ui_capabilities/common/config.ts @@ -6,7 +6,7 @@ */ import path from 'path'; -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; diff --git a/x-pack/test/ui_capabilities/common/ftr_provider_context.d.ts b/x-pack/test/ui_capabilities/common/ftr_provider_context.d.ts index d612023be9160..aa56557c09df8 100644 --- a/x-pack/test/ui_capabilities/common/ftr_provider_context.d.ts +++ b/x-pack/test/ui_capabilities/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/upgrade/config.ts b/x-pack/test/upgrade/config.ts index 86555335ba47b..472b83fe7a934 100644 --- a/x-pack/test/upgrade/config.ts +++ b/x-pack/test/upgrade/config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { pageObjects } from './page_objects'; import { ReportingAPIProvider } from './reporting_services'; diff --git a/x-pack/test/upgrade/ftr_provider_context.d.ts b/x-pack/test/upgrade/ftr_provider_context.d.ts index ec28c00e72e47..24f5087ef7fe2 100644 --- a/x-pack/test/upgrade/ftr_provider_context.d.ts +++ b/x-pack/test/upgrade/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/usage_collection/config.ts b/x-pack/test/usage_collection/config.ts index df1d1d9fd21f7..beb934219422a 100644 --- a/x-pack/test/usage_collection/config.ts +++ b/x-pack/test/usage_collection/config.ts @@ -7,7 +7,7 @@ import { resolve } from 'path'; import fs from 'fs'; -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/usage_collection/ftr_provider_context.d.ts b/x-pack/test/usage_collection/ftr_provider_context.d.ts index 2dce44a533405..13bd4b46607c4 100644 --- a/x-pack/test/usage_collection/ftr_provider_context.d.ts +++ b/x-pack/test/usage_collection/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'; import { pageObjects } from './page_objects'; diff --git a/x-pack/test/visual_regression/config.ts b/x-pack/test/visual_regression/config.ts index 5d36f200d149f..c211918ef8e52 100644 --- a/x-pack/test/visual_regression/config.ts +++ b/x-pack/test/visual_regression/config.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; +import { FtrConfigProviderContext } from '@kbn/test'; import { services } from './services'; diff --git a/x-pack/test/visual_regression/ftr_provider_context.d.ts b/x-pack/test/visual_regression/ftr_provider_context.d.ts index ec28c00e72e47..24f5087ef7fe2 100644 --- a/x-pack/test/visual_regression/ftr_provider_context.d.ts +++ b/x-pack/test/visual_regression/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';