diff --git a/.buildkite/ftr_platform_stateful_configs.yml b/.buildkite/ftr_platform_stateful_configs.yml index 5487b51ca1229..e1cabf919fef7 100644 --- a/.buildkite/ftr_platform_stateful_configs.yml +++ b/.buildkite/ftr_platform_stateful_configs.yml @@ -23,7 +23,7 @@ disabled: # QA suites that are run out-of-band - x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js - - x-pack/test/upgrade/config.ts + - x-pack/platform/test/upgrade/config.ts - src/platform/test/functional/config.edge.js - x-pack/platform/test/functional/config.edge.ts - x-pack/test/functional/config.edge.js @@ -59,6 +59,7 @@ enabled: - src/platform/test/accessibility/config.ts - src/platform/test/analytics/config.ts - src/platform/test/api_integration/config.js + - src/platform/test/api_integration/apis/unused_urls_task/config.ts - src/platform/test/examples/config.js - src/platform/test/functional/apps/bundles/config.ts - src/platform/test/functional/apps/console/config.ts @@ -277,8 +278,8 @@ enabled: - x-pack/platform/test/functional_cloud/config.ts - x-pack/platform/test/functional_cloud/saml.config.ts - x-pack/test/functional_solution_sidenav/config.ts - - x-pack/test/licensing_plugin/config.public.ts - - x-pack/test/licensing_plugin/config.ts + - x-pack/platform/test/licensing_plugin/config.public.ts + - x-pack/platform/test/licensing_plugin/config.ts - x-pack/test/plugin_functional/config.ts - x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts - x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts @@ -293,7 +294,7 @@ enabled: - x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts - x-pack/test/saved_object_tagging/functional/config.ts - x-pack/test/saved_objects_field_count/config.ts - - x-pack/test/search_sessions_integration/config.ts + - x-pack/platform/test/search_sessions_integration/config.ts - x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts - x-pack/test/security_api_integration/anonymous.config.ts - x-pack/test/security_api_integration/api_keys.config.ts @@ -336,7 +337,7 @@ enabled: - x-pack/platform/test/ui_capabilities/security_and_spaces/config.ts - x-pack/platform/test/ui_capabilities/spaces_only/config.ts - x-pack/test/upgrade_assistant_integration/config.ts - - x-pack/test/usage_collection/config.ts + - x-pack/platform/test/usage_collection/config.ts - x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts - x-pack/performance/journeys_e2e/ecommerce_dashboard.ts - x-pack/performance/journeys_e2e/ecommerce_dashboard_http2.ts @@ -409,4 +410,3 @@ enabled: - x-pack/platform/test/saved_object_api_integration/spaces_only/config.ts - x-pack/platform/test/saved_object_api_integration/low-level/config.ts - x-pack/platform/test/saved_object_api_integration/user_profiles/config.ts - - src/platform/test/api_integration/apis/unused_urls_task/config.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c380a768cdd58..6b2c0e522fb10 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -995,6 +995,7 @@ x-pack/platform/test/encrypted_saved_objects_api_integration/plugins/api_consume x-pack/platform/test/functional_cors/plugins/kibana_cors_test @elastic/kibana-security x-pack/platform/test/functional_embedded/plugins/iframe_embedded @elastic/kibana-core x-pack/platform/test/functional_execution_context/plugins/alerts @elastic/kibana-core +x-pack/platform/test/licensing_plugin/plugins/test_feature_usage @elastic/kibana-security x-pack/platform/test/plugin_api_integration/plugins/elasticsearch_client @elastic/kibana-core x-pack/platform/test/plugin_api_integration/plugins/event_log @elastic/response-ops x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security @@ -1004,6 +1005,8 @@ x-pack/platform/test/saved_object_api_integration/common/plugins/saved_object_te x-pack/platform/test/spaces_api_integration/common/plugins/spaces_test_plugin @elastic/kibana-security x-pack/platform/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget @elastic/response-ops x-pack/platform/test/ui_capabilities/common/plugins/foo_plugin @elastic/kibana-security +x-pack/platform/test/usage_collection/plugins/application_usage_test @elastic/kibana-core +x-pack/platform/test/usage_collection/plugins/stack_management_usage_test @elastic/kibana-management x-pack/solutions/chat/packages/wc-framework-types-browser @elastic/search-kibana @elastic/workchat-eng x-pack/solutions/chat/packages/wc-framework-types-common @elastic/search-kibana @elastic/workchat-eng x-pack/solutions/chat/packages/wc-framework-types-server @elastic/search-kibana @elastic/workchat-eng @@ -1117,7 +1120,6 @@ x-pack/test_serverless x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core x-pack/test/functional_with_es_ssl/plugins/alerts @elastic/response-ops x-pack/test/functional_with_es_ssl/plugins/cases @elastic/response-ops -x-pack/test/licensing_plugin/plugins/test_feature_usage @elastic/kibana-security x-pack/test/plugin_functional/plugins/global_search_test @elastic/kibana-core x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution x-pack/test/security_api_integration/packages/helpers @elastic/kibana-security @@ -1127,8 +1129,6 @@ x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-secur x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security x-pack/test/security_api_integration/plugins/user_profiles_consumer @elastic/kibana-security x-pack/test/security_functional/plugins/test_endpoints @elastic/kibana-security -x-pack/test/usage_collection/plugins/application_usage_test @elastic/kibana-core -x-pack/test/usage_collection/plugins/stack_management_usage_test @elastic/kibana-management #### ## Everything below this line overrides the default assignments for each package. ## Items lower in the file have higher precedence: @@ -1211,10 +1211,10 @@ x-pack/test_serverless/api_integration/test_suites/common/platform_security @ela /x-pack/test/functional/apps/discover @elastic/kibana-data-discovery /x-pack/platform/test/functional/apps/saved_query_management @elastic/kibana-data-discovery /x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover @elastic/kibana-data-discovery -/x-pack/test/search_sessions_integration @elastic/kibana-data-discovery +/x-pack/platform/test/search_sessions_integration @elastic/kibana-data-discovery /x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js @elastic/kibana-data-discovery /x-pack/test/stack_functional_integration/apps/management/_index_pattern_create.js @elastic/kibana-data-discovery -/x-pack/test/upgrade/apps/discover @elastic/kibana-data-discovery +/x-pack/platform/test/upgrade/apps/discover @elastic/kibana-data-discovery /x-pack/test_serverless/api_integration/test_suites/common/data_views @elastic/kibana-data-discovery /x-pack/test_serverless/api_integration/test_suites/common/data_view_field_editor @elastic/kibana-data-discovery /x-pack/test_serverless/api_integration/test_suites/common/kql_telemetry @elastic/kibana-data-discovery @@ -1258,9 +1258,9 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /src/platform/test/functional/fixtures/kbn_archiver/managed_content.json @elastic/kibana-visualizations # Assigned per only use: https://github.com/elastic/kibana/blob/main/x-pack/test/functional/apps/managed_content/managed_content.ts#L38 /src/platform/test/api_integration/fixtures/kbn_archiver/event_annotations/event_annotations.json @elastic/kibana-visualizations /src/platform/test/functional/apps/getting_started/*.ts @elastic/kibana-visualizations # Assigned per https://github.com/elastic/kibana/pull/199767#discussion_r1840485031 -/x-pack/test/upgrade/apps/graph @elastic/kibana-visualizations +/x-pack/platform/test/upgrade/apps/graph @elastic/kibana-visualizations /x-pack/platform/test/functional/page_objects/log_wrapper.ts @elastic/kibana-visualizations # Assigned per https://github.com/elastic/kibana/pull/36437 -/x-pack/test/functional/page_objects/graph_page.ts @elastic/kibana-visualizations +/x-pack/platform/test/functional/page_objects/graph_page.ts @elastic/kibana-visualizations /x-pack/test/functional/apps/managed_content @elastic/kibana-visualizations /src/platform/test/functional/services/visualizations @elastic/kibana-visualizations /src/platform/test/functional/services/renderable.ts @elastic/kibana-visualizations @@ -1321,7 +1321,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions /x-pack/test_serverless/**/test_suites/common/reporting/ @elastic/response-ops /x-pack/test/accessibility/apps/group3/reporting.ts @elastic/response-ops /x-pack/platform/test/functional/page_objects/reporting_page.ts @elastic/response-ops -/x-pack/test/upgrade/apps/reporting @elastic/response-ops +/x-pack/platform/test/upgrade/apps/reporting @elastic/response-ops /x-pack/test_serverless/functional/fixtures/kbn_archiver/reporting @elastic/response-ops ### Global Experience Tagging @@ -1583,7 +1583,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions /src/platform/test/functional/page_objects/unified_search_page.ts @elastic/kibana-presentation /src/platform/test/functional/fixtures/kbn_archiver/dashboard_error_cases.json @elastic/kibana-presentation # Assigned per https://github.com/elastic/kibana/pull/201648#discussion_r1859020986 /x-pack/test/functional/es_archives/getting_started/shakespeare @elastic/kibana-presentation # Assigned per https://github.com/elastic/kibana/pull/201648#discussion_r1860319853 -/x-pack/test/upgrade/screenshots @elastic/kibana-presentation +/x-pack/platform/test/upgrade/screenshots @elastic/kibana-presentation /x-pack/test/functional/screenshots @elastic/kibana-presentation /src/platform/test/functional/fixtures/kbn_archiver/legacy.json @elastic/kibana-presentation # Assigned per https://github.com/elastic/kibana/pull/200934#discussion_r1856407606 /x-pack/test/functional/fixtures/kbn_archiver/maps.json @elastic/kibana-presentation @@ -1597,8 +1597,8 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions /x-pack/test/functional/services/canvas_element.ts @elastic/kibana-presentation /x-pack/platform/test/functional/page_objects/canvas_page.ts @elastic/kibana-presentation /x-pack/test/accessibility/apps/group3/canvas.ts @elastic/kibana-presentation -/x-pack/test/upgrade/apps/canvas @elastic/kibana-presentation -/x-pack/test/upgrade/apps/dashboard @elastic/kibana-presentation +/x-pack/platform/test/upgrade/apps/canvas @elastic/kibana-presentation +/x-pack/platform/test/upgrade/apps/dashboard @elastic/kibana-presentation /src/platform/test/functional/screenshots/baseline/tsvb_dashboard.png @elastic/kibana-presentation /src/platform/test/functional/screenshots/baseline/dashboard_*.png @elastic/kibana-presentation /src/platform/test/functional/screenshots/baseline/area_chart.png @elastic/kibana-presentation @@ -1622,11 +1622,11 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions /src/platform/test/plugin_functional/test_suites/panel_actions @elastic/kibana-presentation /x-pack/test/functional/es_archives/canvas/logstash_lens @elastic/kibana-presentation #CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-presentation -/x-pack/test/upgrade/services/maps_upgrade_services.ts @elastic/kibana-presentation +/x-pack/platform/test/upgrade/services/maps_upgrade_services.ts @elastic/kibana-presentation /x-pack/test/stack_functional_integration/apps/maps @elastic/kibana-presentation /x-pack/test/functional/page_objects/geo_file_upload.ts @elastic/kibana-presentation /x-pack/platform/test/functional/page_objects/gis_page.ts @elastic/kibana-presentation -/x-pack/test/upgrade/apps/maps @elastic/kibana-presentation +/x-pack/platform/test/upgrade/apps/maps @elastic/kibana-presentation /x-pack/platform/test/api_integration/apis/maps/ @elastic/kibana-presentation /x-pack/test/functional/apps/maps/ @elastic/kibana-presentation /x-pack/test/functional/es_archives/maps/ @elastic/kibana-presentation @@ -1753,9 +1753,9 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security /x-pack/test/plugin_functional/config.ts @elastic/appex-qa /x-pack/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa /x-pack/test/plugin_functional/page_objects.ts @elastic/appex-qa -/x-pack/test/upgrade/services/index.ts @elastic/appex-qa -/x-pack/test/upgrade/ftr_provider_context.d.ts @elastic/appex-qa -/x-pack/test/upgrade/config.ts @elastic/appex-qa +/x-pack/platform/test/upgrade/services/index.ts @elastic/appex-qa +/x-pack/platform/test/upgrade/ftr_provider_context.d.ts @elastic/appex-qa +/x-pack/platform/test/upgrade/config.ts @elastic/appex-qa /x-pack/test/functional_basic/ftr_provider_context.d.ts @elastic/appex-qa /x-pack/test/functional/services/remote_es/remote_es.ts @elastic/appex-qa /x-pack/test/functional/services/random.js @elastic/appex-qa @@ -1968,8 +1968,8 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security /src/platform/test/api_integration/apis/saved_objects* @elastic/kibana-core /src/platform/test/api_integration/apis/core/*.ts @elastic/kibana-core /x-pack/platform/test/functional/apps/saved_objects_management @elastic/kibana-core -/x-pack/test/usage_collection @elastic/kibana-core -/x-pack/test/licensing_plugin @elastic/kibana-core +/x-pack/platform/test/usage_collection @elastic/kibana-core +/x-pack/platform/test/licensing_plugin @elastic/kibana-core /x-pack/platform/test/functional_execution_context @elastic/kibana-core /x-pack/platform/test/api_integration/apis/telemetry @elastic/kibana-core /x-pack/platform/test/api_integration/apis/status @elastic/kibana-core @@ -2128,8 +2128,8 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi /x-pack/test/functional/services/actions @elastic/response-ops /x-pack/solutions/security/test/api_integration_basic/apis/security_solution/index.ts @elastic/response-ops @elastic/kibana-cases /x-pack/solutions/security/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/response-ops @elastic/kibana-cases -/x-pack/test/upgrade/services/rules_upgrade_services.ts @elastic/response-ops -/x-pack/test/upgrade/apps/rules @elastic/response-ops +/x-pack/platform/test/upgrade/services/rules_upgrade_services.ts @elastic/response-ops +/x-pack/platform/test/upgrade/apps/rules @elastic/response-ops /x-pack/platform/test/examples/triggers_actions_ui_examples @elastic/response-ops # Assigned per https://github.com/elastic/kibana/blob/main/x-pack/examples/triggers_actions_ui_example/kibana.jsonc#L4 /x-pack/test/functional/services/rules @elastic/response-ops /x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops @@ -2187,6 +2187,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi /src/platform/test/functional/fixtures/es_archiver/search/downsampled @elastic/search-kibana /x-pack/test/functional_solution_sidenav/tests/search_sidenav.ts @elastic/search-kibana /x-pack/platform/test/functional/services/search_sessions.ts @elastic/search-kibana +/x-pack/platform/test/functional/page_objects/search_sessions_management_page.ts @elastic/search-kibana /x-pack/test/functional/page_objects/search_* @elastic/search-kibana x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/search-kibana /x-pack/test/functional/apps/search_playground @elastic/search-kibana diff --git a/package.json b/package.json index 323ed9b7dd0d9..ed41f63607861 100644 --- a/package.json +++ b/package.json @@ -210,7 +210,7 @@ "@kbn/apm-ui-shared": "link:src/platform/packages/shared/kbn-apm-ui-shared", "@kbn/apm-utils": "link:src/platform/packages/shared/kbn-apm-utils", "@kbn/app-link-test-plugin": "link:src/platform/test/plugin_functional/plugins/app_link_test", - "@kbn/application-usage-test-plugin": "link:x-pack/test/usage_collection/plugins/application_usage_test", + "@kbn/application-usage-test-plugin": "link:x-pack/platform/test/usage_collection/plugins/application_usage_test", "@kbn/audit-log-plugin": "link:x-pack/test/security_api_integration/plugins/audit_log", "@kbn/automatic-import-plugin": "link:x-pack/platform/plugins/shared/automatic_import", "@kbn/avc-banner": "link:src/platform/packages/shared/kbn-avc-banner", @@ -974,7 +974,7 @@ "@kbn/sse-utils-server": "link:src/platform/packages/shared/kbn-sse-utils-server", "@kbn/stack-alerts-plugin": "link:x-pack/platform/plugins/shared/stack_alerts", "@kbn/stack-connectors-plugin": "link:x-pack/platform/plugins/shared/stack_connectors", - "@kbn/stack-management-usage-test-plugin": "link:x-pack/test/usage_collection/plugins/stack_management_usage_test", + "@kbn/stack-management-usage-test-plugin": "link:x-pack/platform/test/usage_collection/plugins/stack_management_usage_test", "@kbn/state-containers-examples-plugin": "link:examples/state_containers_examples", "@kbn/status-plugin-a-plugin": "link:src/platform/test/server_integration/plugins/status_plugin_a", "@kbn/status-plugin-b-plugin": "link:src/platform/test/server_integration/plugins/status_plugin_b", @@ -997,7 +997,7 @@ "@kbn/telemetry-management-section-plugin": "link:src/platform/plugins/shared/telemetry_management_section", "@kbn/telemetry-plugin": "link:src/platform/plugins/shared/telemetry", "@kbn/telemetry-test-plugin": "link:src/platform/test/plugin_functional/plugins/telemetry", - "@kbn/test-feature-usage-plugin": "link:x-pack/test/licensing_plugin/plugins/test_feature_usage", + "@kbn/test-feature-usage-plugin": "link:x-pack/platform/test/licensing_plugin/plugins/test_feature_usage", "@kbn/testing-embedded-lens-plugin": "link:x-pack/examples/testing_embedded_lens", "@kbn/third-party-lens-navigation-prompt-plugin": "link:x-pack/examples/third_party_lens_navigation_prompt", "@kbn/third-party-vis-lens-example-plugin": "link:x-pack/examples/third_party_vis_lens_example", diff --git a/src/platform/plugins/private/kibana_usage_collection/server/collectors/application_usage/schema.ts b/src/platform/plugins/private/kibana_usage_collection/server/collectors/application_usage/schema.ts index f85925c55a460..014b3d31a887c 100644 --- a/src/platform/plugins/private/kibana_usage_collection/server/collectors/application_usage/schema.ts +++ b/src/platform/plugins/private/kibana_usage_collection/server/collectors/application_usage/schema.ts @@ -115,7 +115,7 @@ const commonSchema: MakeSchemaFrom = { }, }; -// There is a test in x-pack/test/usage_collection that validates that the keys in here match all the registered apps +// There is a test in x-pack/platform/test/usage_collection that validates that the keys in here match all the registered apps export const applicationUsageSchema = { // OSS dashboards: commonSchema, diff --git a/tsconfig.base.json b/tsconfig.base.json index 31ff13e04824f..46692441ab7ce 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -112,8 +112,8 @@ "@kbn/apm-utils/*": ["src/platform/packages/shared/kbn-apm-utils/*"], "@kbn/app-link-test-plugin": ["src/platform/test/plugin_functional/plugins/app_link_test"], "@kbn/app-link-test-plugin/*": ["src/platform/test/plugin_functional/plugins/app_link_test/*"], - "@kbn/application-usage-test-plugin": ["x-pack/test/usage_collection/plugins/application_usage_test"], - "@kbn/application-usage-test-plugin/*": ["x-pack/test/usage_collection/plugins/application_usage_test/*"], + "@kbn/application-usage-test-plugin": ["x-pack/platform/test/usage_collection/plugins/application_usage_test"], + "@kbn/application-usage-test-plugin/*": ["x-pack/platform/test/usage_collection/plugins/application_usage_test/*"], "@kbn/audit-log-plugin": ["x-pack/test/security_api_integration/plugins/audit_log"], "@kbn/audit-log-plugin/*": ["x-pack/test/security_api_integration/plugins/audit_log/*"], "@kbn/automatic-import-plugin": ["x-pack/platform/plugins/shared/automatic_import"], @@ -1974,8 +1974,8 @@ "@kbn/stack-alerts-plugin/*": ["x-pack/platform/plugins/shared/stack_alerts/*"], "@kbn/stack-connectors-plugin": ["x-pack/platform/plugins/shared/stack_connectors"], "@kbn/stack-connectors-plugin/*": ["x-pack/platform/plugins/shared/stack_connectors/*"], - "@kbn/stack-management-usage-test-plugin": ["x-pack/test/usage_collection/plugins/stack_management_usage_test"], - "@kbn/stack-management-usage-test-plugin/*": ["x-pack/test/usage_collection/plugins/stack_management_usage_test/*"], + "@kbn/stack-management-usage-test-plugin": ["x-pack/platform/test/usage_collection/plugins/stack_management_usage_test"], + "@kbn/stack-management-usage-test-plugin/*": ["x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/*"], "@kbn/state-containers-examples-plugin": ["examples/state_containers_examples"], "@kbn/state-containers-examples-plugin/*": ["examples/state_containers_examples/*"], "@kbn/status-plugin-a-plugin": ["src/platform/test/server_integration/plugins/status_plugin_a"], @@ -2036,8 +2036,8 @@ "@kbn/test/*": ["src/platform/packages/shared/kbn-test/*"], "@kbn/test-eui-helpers": ["src/platform/packages/private/kbn-test-eui-helpers"], "@kbn/test-eui-helpers/*": ["src/platform/packages/private/kbn-test-eui-helpers/*"], - "@kbn/test-feature-usage-plugin": ["x-pack/test/licensing_plugin/plugins/test_feature_usage"], - "@kbn/test-feature-usage-plugin/*": ["x-pack/test/licensing_plugin/plugins/test_feature_usage/*"], + "@kbn/test-feature-usage-plugin": ["x-pack/platform/test/licensing_plugin/plugins/test_feature_usage"], + "@kbn/test-feature-usage-plugin/*": ["x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/*"], "@kbn/test-jest-helpers": ["src/platform/packages/shared/kbn-test-jest-helpers"], "@kbn/test-jest-helpers/*": ["src/platform/packages/shared/kbn-test-jest-helpers/*"], "@kbn/test-subj-selector": ["src/platform/packages/shared/kbn-test-subj-selector"], diff --git a/x-pack/test/functional/page_objects/graph_page.ts b/x-pack/platform/test/functional/page_objects/graph_page.ts similarity index 100% rename from x-pack/test/functional/page_objects/graph_page.ts rename to x-pack/platform/test/functional/page_objects/graph_page.ts diff --git a/x-pack/platform/test/functional/page_objects/index.ts b/x-pack/platform/test/functional/page_objects/index.ts index 4afbe10f0822b..c603e104dd631 100644 --- a/x-pack/platform/test/functional/page_objects/index.ts +++ b/x-pack/platform/test/functional/page_objects/index.ts @@ -21,6 +21,8 @@ import { SearchProfilerPageProvider } from './search_profiler_page'; import { UpgradeAssistantFlyoutObject } from './upgrade_assistant_page'; import { UserProfilePageProvider } from './user_profile_page'; import { SnapshotRestorePageProvider } from './snapshot_restore_page'; +import { SearchSessionsPageProvider } from './search_sessions_management_page'; +import { GraphPageObject } from './graph_page'; // just like services, PageObjects are defined as a map of // names to Providers. Merge in Kibana's or pick specific ones @@ -33,11 +35,13 @@ export const pageObjects = { monitoring: MonitoringPageObject, accountSetting: AccountSettingsPageObject, canvas: CanvasPageProvider, + graph: GraphPageObject, lens: LensPageProvider, maps: GisPageObject, reporting: ReportingPageObject, watcher: WatcherPageObject, searchProfiler: SearchProfilerPageProvider, + searchSessionsManagement: SearchSessionsPageProvider, snapshotRestore: SnapshotRestorePageProvider, upgradeAssistant: UpgradeAssistantFlyoutObject, userProfiles: UserProfilePageProvider, diff --git a/x-pack/test/functional/page_objects/search_sessions_management_page.ts b/x-pack/platform/test/functional/page_objects/search_sessions_management_page.ts similarity index 100% rename from x-pack/test/functional/page_objects/search_sessions_management_page.ts rename to x-pack/platform/test/functional/page_objects/search_sessions_management_page.ts diff --git a/x-pack/test/licensing_plugin/config.public.ts b/x-pack/platform/test/licensing_plugin/config.public.ts similarity index 100% rename from x-pack/test/licensing_plugin/config.public.ts rename to x-pack/platform/test/licensing_plugin/config.public.ts diff --git a/x-pack/test/licensing_plugin/config.ts b/x-pack/platform/test/licensing_plugin/config.ts similarity index 96% rename from x-pack/test/licensing_plugin/config.ts rename to x-pack/platform/test/licensing_plugin/config.ts index 754d1a044c72d..4c199222a40ea 100644 --- a/x-pack/test/licensing_plugin/config.ts +++ b/x-pack/platform/test/licensing_plugin/config.ts @@ -13,7 +13,7 @@ const license = 'basic'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const functionalTestsConfig = await readConfigFile( - require.resolve('../functional/config.base.js') + require.resolve('../functional/config.base.ts') ); const servers = { diff --git a/x-pack/test/licensing_plugin/plugins/test_feature_usage/kibana.jsonc b/x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/kibana.jsonc similarity index 100% rename from x-pack/test/licensing_plugin/plugins/test_feature_usage/kibana.jsonc rename to x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/kibana.jsonc diff --git a/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/index.ts b/x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/public/index.ts similarity index 100% rename from x-pack/test/licensing_plugin/plugins/test_feature_usage/public/index.ts rename to x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/public/index.ts diff --git a/x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts b/x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts similarity index 100% rename from x-pack/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts rename to x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/public/plugin.ts diff --git a/x-pack/test/licensing_plugin/plugins/test_feature_usage/tsconfig.json b/x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/tsconfig.json similarity index 80% rename from x-pack/test/licensing_plugin/plugins/test_feature_usage/tsconfig.json rename to x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/tsconfig.json index 1685a89d40697..50681507982d6 100644 --- a/x-pack/test/licensing_plugin/plugins/test_feature_usage/tsconfig.json +++ b/x-pack/platform/test/licensing_plugin/plugins/test_feature_usage/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../tsconfig.base.json", + "extends": "../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types" }, diff --git a/x-pack/test/licensing_plugin/public/feature_usage.ts b/x-pack/platform/test/licensing_plugin/public/feature_usage.ts similarity index 100% rename from x-pack/test/licensing_plugin/public/feature_usage.ts rename to x-pack/platform/test/licensing_plugin/public/feature_usage.ts diff --git a/x-pack/test/licensing_plugin/public/index.ts b/x-pack/platform/test/licensing_plugin/public/index.ts similarity index 100% rename from x-pack/test/licensing_plugin/public/index.ts rename to x-pack/platform/test/licensing_plugin/public/index.ts diff --git a/x-pack/test/licensing_plugin/public/updates.ts b/x-pack/platform/test/licensing_plugin/public/updates.ts similarity index 100% rename from x-pack/test/licensing_plugin/public/updates.ts rename to x-pack/platform/test/licensing_plugin/public/updates.ts diff --git a/x-pack/test/licensing_plugin/scenario.ts b/x-pack/platform/test/licensing_plugin/scenario.ts similarity index 100% rename from x-pack/test/licensing_plugin/scenario.ts rename to x-pack/platform/test/licensing_plugin/scenario.ts diff --git a/x-pack/test/licensing_plugin/server/header.ts b/x-pack/platform/test/licensing_plugin/server/header.ts similarity index 100% rename from x-pack/test/licensing_plugin/server/header.ts rename to x-pack/platform/test/licensing_plugin/server/header.ts diff --git a/x-pack/test/licensing_plugin/server/index.ts b/x-pack/platform/test/licensing_plugin/server/index.ts similarity index 100% rename from x-pack/test/licensing_plugin/server/index.ts rename to x-pack/platform/test/licensing_plugin/server/index.ts diff --git a/x-pack/test/licensing_plugin/server/info.ts b/x-pack/platform/test/licensing_plugin/server/info.ts similarity index 100% rename from x-pack/test/licensing_plugin/server/info.ts rename to x-pack/platform/test/licensing_plugin/server/info.ts diff --git a/x-pack/test/licensing_plugin/server/updates.ts b/x-pack/platform/test/licensing_plugin/server/updates.ts similarity index 100% rename from x-pack/test/licensing_plugin/server/updates.ts rename to x-pack/platform/test/licensing_plugin/server/updates.ts diff --git a/x-pack/test/licensing_plugin/services.ts b/x-pack/platform/test/licensing_plugin/services.ts similarity index 100% rename from x-pack/test/licensing_plugin/services.ts rename to x-pack/platform/test/licensing_plugin/services.ts diff --git a/x-pack/test/search_sessions_integration/config.ts b/x-pack/platform/test/search_sessions_integration/config.ts similarity index 96% rename from x-pack/test/search_sessions_integration/config.ts rename to x-pack/platform/test/search_sessions_integration/config.ts index bfb6700e43f9d..27a259e6b2dc5 100644 --- a/x-pack/test/search_sessions_integration/config.ts +++ b/x-pack/platform/test/search_sessions_integration/config.ts @@ -11,7 +11,7 @@ import { services } from '../functional/services'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const xpackFunctionalConfig = await readConfigFile( - require.resolve('../functional/config.base.js') + require.resolve('../functional/config.base.ts') ); return { diff --git a/x-pack/test/search_sessions_integration/ftr_provider_context.d.ts b/x-pack/platform/test/search_sessions_integration/ftr_provider_context.d.ts similarity index 100% rename from x-pack/test/search_sessions_integration/ftr_provider_context.d.ts rename to x-pack/platform/test/search_sessions_integration/ftr_provider_context.d.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/async_search.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/async_search.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/async_search.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/async_search.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/index.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/search_sessions_tour.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/search_sessions_tour.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/search_sessions_tour.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/search_sessions_tour.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/session_searches_integration.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/session_searches_integration.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/session_searches_integration.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/session_searches_integration.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/session_sharing/index.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/lens.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/session_sharing/lens.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/dashboard/session_sharing/lens.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/dashboard/session_sharing/lens.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/discover/async_search.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/discover/async_search.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/index.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/discover/index.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/discover/index.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/discover/index.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/lens/index.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/lens/index.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/lens/index.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/lens/index.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/lens/search_sessions.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/lens/search_sessions.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/management/search_sessions/index.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts diff --git a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management_permissions.ts b/x-pack/platform/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management_permissions.ts similarity index 100% rename from x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management_permissions.ts rename to x-pack/platform/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management_permissions.ts diff --git a/x-pack/platform/test/tsconfig.json b/x-pack/platform/test/tsconfig.json index 72aa6ce80eed7..f7df02f8d7ada 100644 --- a/x-pack/platform/test/tsconfig.json +++ b/x-pack/platform/test/tsconfig.json @@ -118,5 +118,9 @@ "@kbn/lens-plugin", "@kbn/mock-idp-utils", "@kbn/es", + "@kbn/licensing-plugin", + "@kbn/core-provider-plugin", + "@kbn/reporting-plugin", + "@kbn/kibana-usage-collection-plugin", ] } diff --git a/x-pack/test/upgrade/apps/canvas/canvas_smoke_tests.ts b/x-pack/platform/test/upgrade/apps/canvas/canvas_smoke_tests.ts similarity index 100% rename from x-pack/test/upgrade/apps/canvas/canvas_smoke_tests.ts rename to x-pack/platform/test/upgrade/apps/canvas/canvas_smoke_tests.ts diff --git a/x-pack/test/upgrade/apps/canvas/index.ts b/x-pack/platform/test/upgrade/apps/canvas/index.ts similarity index 100% rename from x-pack/test/upgrade/apps/canvas/index.ts rename to x-pack/platform/test/upgrade/apps/canvas/index.ts diff --git a/x-pack/test/upgrade/apps/dashboard/dashboard_smoke_tests.ts b/x-pack/platform/test/upgrade/apps/dashboard/dashboard_smoke_tests.ts similarity index 100% rename from x-pack/test/upgrade/apps/dashboard/dashboard_smoke_tests.ts rename to x-pack/platform/test/upgrade/apps/dashboard/dashboard_smoke_tests.ts diff --git a/x-pack/test/upgrade/apps/dashboard/index.ts b/x-pack/platform/test/upgrade/apps/dashboard/index.ts similarity index 100% rename from x-pack/test/upgrade/apps/dashboard/index.ts rename to x-pack/platform/test/upgrade/apps/dashboard/index.ts diff --git a/x-pack/test/upgrade/apps/discover/discover_smoke_tests.ts b/x-pack/platform/test/upgrade/apps/discover/discover_smoke_tests.ts similarity index 100% rename from x-pack/test/upgrade/apps/discover/discover_smoke_tests.ts rename to x-pack/platform/test/upgrade/apps/discover/discover_smoke_tests.ts diff --git a/x-pack/test/upgrade/apps/discover/index.ts b/x-pack/platform/test/upgrade/apps/discover/index.ts similarity index 100% rename from x-pack/test/upgrade/apps/discover/index.ts rename to x-pack/platform/test/upgrade/apps/discover/index.ts diff --git a/x-pack/test/upgrade/apps/graph/graph_smoke_tests.ts b/x-pack/platform/test/upgrade/apps/graph/graph_smoke_tests.ts similarity index 100% rename from x-pack/test/upgrade/apps/graph/graph_smoke_tests.ts rename to x-pack/platform/test/upgrade/apps/graph/graph_smoke_tests.ts diff --git a/x-pack/test/upgrade/apps/graph/index.ts b/x-pack/platform/test/upgrade/apps/graph/index.ts similarity index 100% rename from x-pack/test/upgrade/apps/graph/index.ts rename to x-pack/platform/test/upgrade/apps/graph/index.ts diff --git a/x-pack/test/upgrade/apps/maps/index.ts b/x-pack/platform/test/upgrade/apps/maps/index.ts similarity index 100% rename from x-pack/test/upgrade/apps/maps/index.ts rename to x-pack/platform/test/upgrade/apps/maps/index.ts diff --git a/x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts b/x-pack/platform/test/upgrade/apps/maps/maps_smoke_tests.ts similarity index 100% rename from x-pack/test/upgrade/apps/maps/maps_smoke_tests.ts rename to x-pack/platform/test/upgrade/apps/maps/maps_smoke_tests.ts diff --git a/x-pack/test/upgrade/apps/reporting/index.ts b/x-pack/platform/test/upgrade/apps/reporting/index.ts similarity index 100% rename from x-pack/test/upgrade/apps/reporting/index.ts rename to x-pack/platform/test/upgrade/apps/reporting/index.ts diff --git a/x-pack/test/upgrade/apps/reporting/reporting_smoke_tests.ts b/x-pack/platform/test/upgrade/apps/reporting/reporting_smoke_tests.ts similarity index 100% rename from x-pack/test/upgrade/apps/reporting/reporting_smoke_tests.ts rename to x-pack/platform/test/upgrade/apps/reporting/reporting_smoke_tests.ts diff --git a/x-pack/test/upgrade/apps/rules/index.ts b/x-pack/platform/test/upgrade/apps/rules/index.ts similarity index 100% rename from x-pack/test/upgrade/apps/rules/index.ts rename to x-pack/platform/test/upgrade/apps/rules/index.ts diff --git a/x-pack/test/upgrade/apps/rules/rules_smoke_tests.ts b/x-pack/platform/test/upgrade/apps/rules/rules_smoke_tests.ts similarity index 100% rename from x-pack/test/upgrade/apps/rules/rules_smoke_tests.ts rename to x-pack/platform/test/upgrade/apps/rules/rules_smoke_tests.ts diff --git a/x-pack/test/upgrade/config.ts b/x-pack/platform/test/upgrade/config.ts similarity index 97% rename from x-pack/test/upgrade/config.ts rename to x-pack/platform/test/upgrade/config.ts index 732b9004e2abd..00b662f22a217 100644 --- a/x-pack/test/upgrade/config.ts +++ b/x-pack/platform/test/upgrade/config.ts @@ -14,7 +14,7 @@ import { RulesHelper } from './services/rules_upgrade_services'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const apiConfig = await readConfigFile(require.resolve('../api_integration/config')); - const functionalConfig = await readConfigFile(require.resolve('../functional/config.base.js')); + const functionalConfig = await readConfigFile(require.resolve('../functional/config.base.ts')); return { ...functionalConfig.getAll(), diff --git a/x-pack/test/upgrade/ftr_provider_context.d.ts b/x-pack/platform/test/upgrade/ftr_provider_context.d.ts similarity index 100% rename from x-pack/test/upgrade/ftr_provider_context.d.ts rename to x-pack/platform/test/upgrade/ftr_provider_context.d.ts diff --git a/x-pack/test/upgrade/screenshots/baseline/upgrade_ecommerce_map.png b/x-pack/platform/test/upgrade/screenshots/baseline/upgrade_ecommerce_map.png similarity index 100% rename from x-pack/test/upgrade/screenshots/baseline/upgrade_ecommerce_map.png rename to x-pack/platform/test/upgrade/screenshots/baseline/upgrade_ecommerce_map.png diff --git a/x-pack/test/upgrade/screenshots/baseline/upgrade_flights_map.png b/x-pack/platform/test/upgrade/screenshots/baseline/upgrade_flights_map.png similarity index 100% rename from x-pack/test/upgrade/screenshots/baseline/upgrade_flights_map.png rename to x-pack/platform/test/upgrade/screenshots/baseline/upgrade_flights_map.png diff --git a/x-pack/test/upgrade/screenshots/baseline/upgrade_web_logs_map.png b/x-pack/platform/test/upgrade/screenshots/baseline/upgrade_web_logs_map.png similarity index 100% rename from x-pack/test/upgrade/screenshots/baseline/upgrade_web_logs_map.png rename to x-pack/platform/test/upgrade/screenshots/baseline/upgrade_web_logs_map.png diff --git a/x-pack/test/upgrade/services/index.ts b/x-pack/platform/test/upgrade/services/index.ts similarity index 100% rename from x-pack/test/upgrade/services/index.ts rename to x-pack/platform/test/upgrade/services/index.ts diff --git a/x-pack/test/upgrade/services/maps_upgrade_services.ts b/x-pack/platform/test/upgrade/services/maps_upgrade_services.ts similarity index 100% rename from x-pack/test/upgrade/services/maps_upgrade_services.ts rename to x-pack/platform/test/upgrade/services/maps_upgrade_services.ts diff --git a/x-pack/test/upgrade/services/rules_upgrade_services.ts b/x-pack/platform/test/upgrade/services/rules_upgrade_services.ts similarity index 100% rename from x-pack/test/upgrade/services/rules_upgrade_services.ts rename to x-pack/platform/test/upgrade/services/rules_upgrade_services.ts diff --git a/x-pack/test/usage_collection/config.ts b/x-pack/platform/test/usage_collection/config.ts similarity index 96% rename from x-pack/test/usage_collection/config.ts rename to x-pack/platform/test/usage_collection/config.ts index ef40fb27b16c2..f45d84a06d86d 100644 --- a/x-pack/test/usage_collection/config.ts +++ b/x-pack/platform/test/usage_collection/config.ts @@ -15,7 +15,7 @@ import { pageObjects } from './page_objects'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const xpackFunctionalConfig = await readConfigFile( - require.resolve('../functional/config.base.js') + require.resolve('../functional/config.base.ts') ); return { diff --git a/x-pack/test/usage_collection/ftr_provider_context.d.ts b/x-pack/platform/test/usage_collection/ftr_provider_context.d.ts similarity index 100% rename from x-pack/test/usage_collection/ftr_provider_context.d.ts rename to x-pack/platform/test/usage_collection/ftr_provider_context.d.ts diff --git a/x-pack/test/usage_collection/page_objects.ts b/x-pack/platform/test/usage_collection/page_objects.ts similarity index 100% rename from x-pack/test/usage_collection/page_objects.ts rename to x-pack/platform/test/usage_collection/page_objects.ts diff --git a/x-pack/test/usage_collection/plugins/application_usage_test/kibana.jsonc b/x-pack/platform/test/usage_collection/plugins/application_usage_test/kibana.jsonc similarity index 100% rename from x-pack/test/usage_collection/plugins/application_usage_test/kibana.jsonc rename to x-pack/platform/test/usage_collection/plugins/application_usage_test/kibana.jsonc diff --git a/x-pack/test/usage_collection/plugins/application_usage_test/public/index.ts b/x-pack/platform/test/usage_collection/plugins/application_usage_test/public/index.ts similarity index 100% rename from x-pack/test/usage_collection/plugins/application_usage_test/public/index.ts rename to x-pack/platform/test/usage_collection/plugins/application_usage_test/public/index.ts diff --git a/x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts b/x-pack/platform/test/usage_collection/plugins/application_usage_test/public/plugin.ts similarity index 100% rename from x-pack/test/usage_collection/plugins/application_usage_test/public/plugin.ts rename to x-pack/platform/test/usage_collection/plugins/application_usage_test/public/plugin.ts diff --git a/x-pack/test/usage_collection/plugins/application_usage_test/public/types.ts b/x-pack/platform/test/usage_collection/plugins/application_usage_test/public/types.ts similarity index 100% rename from x-pack/test/usage_collection/plugins/application_usage_test/public/types.ts rename to x-pack/platform/test/usage_collection/plugins/application_usage_test/public/types.ts diff --git a/x-pack/test/usage_collection/plugins/application_usage_test/tsconfig.json b/x-pack/platform/test/usage_collection/plugins/application_usage_test/tsconfig.json similarity index 79% rename from x-pack/test/usage_collection/plugins/application_usage_test/tsconfig.json rename to x-pack/platform/test/usage_collection/plugins/application_usage_test/tsconfig.json index cb4b5e34dcf89..9971a1c34bc37 100644 --- a/x-pack/test/usage_collection/plugins/application_usage_test/tsconfig.json +++ b/x-pack/platform/test/usage_collection/plugins/application_usage_test/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../tsconfig.base.json", + "extends": "../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types" }, diff --git a/x-pack/test/usage_collection/plugins/stack_management_usage_test/kibana.jsonc b/x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/kibana.jsonc similarity index 100% rename from x-pack/test/usage_collection/plugins/stack_management_usage_test/kibana.jsonc rename to x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/kibana.jsonc diff --git a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/index.ts b/x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/public/index.ts similarity index 100% rename from x-pack/test/usage_collection/plugins/stack_management_usage_test/public/index.ts rename to x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/public/index.ts diff --git a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts b/x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts similarity index 100% rename from x-pack/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts rename to x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/public/plugin.ts diff --git a/x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts b/x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/public/types.ts similarity index 100% rename from x-pack/test/usage_collection/plugins/stack_management_usage_test/public/types.ts rename to x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/public/types.ts diff --git a/x-pack/test/usage_collection/plugins/stack_management_usage_test/tsconfig.json b/x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/tsconfig.json similarity index 79% rename from x-pack/test/usage_collection/plugins/stack_management_usage_test/tsconfig.json rename to x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/tsconfig.json index c5a738ee176c1..631a629af0e5e 100644 --- a/x-pack/test/usage_collection/plugins/stack_management_usage_test/tsconfig.json +++ b/x-pack/platform/test/usage_collection/plugins/stack_management_usage_test/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../tsconfig.base.json", + "extends": "../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types" }, diff --git a/x-pack/test/usage_collection/services.ts b/x-pack/platform/test/usage_collection/services.ts similarity index 100% rename from x-pack/test/usage_collection/services.ts rename to x-pack/platform/test/usage_collection/services.ts diff --git a/x-pack/test/usage_collection/test_suites/application_usage/index.ts b/x-pack/platform/test/usage_collection/test_suites/application_usage/index.ts similarity index 100% rename from x-pack/test/usage_collection/test_suites/application_usage/index.ts rename to x-pack/platform/test/usage_collection/test_suites/application_usage/index.ts diff --git a/x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts b/x-pack/platform/test/usage_collection/test_suites/stack_management_usage/index.ts similarity index 100% rename from x-pack/test/usage_collection/test_suites/stack_management_usage/index.ts rename to x-pack/platform/test/usage_collection/test_suites/stack_management_usage/index.ts diff --git a/x-pack/test/functional/page_objects/index.ts b/x-pack/test/functional/page_objects/index.ts index c82aa38dbbabe..bc953738b1d23 100644 --- a/x-pack/test/functional/page_objects/index.ts +++ b/x-pack/test/functional/page_objects/index.ts @@ -21,6 +21,8 @@ import { LensPageProvider } from '@kbn/test-suites-xpack-platform/functional/pag import { UpgradeAssistantFlyoutObject } from '@kbn/test-suites-xpack-platform/functional/page_objects/upgrade_assistant_page'; import { SnapshotRestorePageProvider } from '@kbn/test-suites-xpack-platform/functional/page_objects/snapshot_restore_page'; import { UserProfilePageProvider } from '@kbn/test-suites-xpack-platform/functional/page_objects/user_profile_page'; +import { SearchSessionsPageProvider } from '@kbn/test-suites-xpack-platform/functional/page_objects/search_sessions_management_page'; +import { GraphPageObject } from '@kbn/test-suites-xpack-platform/functional/page_objects/graph_page'; import { ApiKeysPageProvider } from './api_keys_page'; import { AssetDetailsProvider } from './asset_details'; import { BannersPageObject } from './banners_page'; @@ -28,7 +30,6 @@ import { CrossClusterReplicationPageProvider } from './cross_cluster_replication import { DetectionsPageObject } from '../../security_solution_ftr/page_objects/detections'; import { EmbeddedConsoleProvider } from './embedded_console'; import { GeoFileUploadPageObject } from './geo_file_upload'; -import { GraphPageObject } from './graph_page'; import { GrokDebuggerPageObject } from './grok_debugger_page'; import { IndexLifecycleManagementPageProvider } from './index_lifecycle_management_page'; import { IndexManagementPageProvider } from './index_management_page'; @@ -48,7 +49,6 @@ import { ObservabilityPageProvider } from './observability_page'; import { AlertControlsProvider } from './alert_controls'; import { RemoteClustersPageProvider } from './remote_clusters_page'; import { RollupPageObject } from './rollup_page'; -import { SearchSessionsPageProvider } from './search_sessions_management_page'; import { ShareSavedObjectsToSpacePageProvider } from './share_saved_objects_to_space_page'; import { StatusPageObject } from './status_page'; import { TagManagementPageObject } from './tag_management_page'; diff --git a/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts b/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts index 2f197d0a8162c..543a72a29ed88 100644 --- a/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts +++ b/x-pack/test/plugin_functional/test_suites/global_search/global_search_providers.ts @@ -6,6 +6,7 @@ */ import expect from '@kbn/expect'; +import '@kbn/core-provider-plugin/types'; import { GlobalSearchResult } from '@kbn/global-search-plugin/common/types'; import { GlobalSearchTestApi } from '@kbn/global-search-test-plugin/public/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index 4095f9a7b5d9c..9ddf1e50b696a 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -30,7 +30,6 @@ "@kbn/test-suites-src", "@kbn/core", "@kbn/data-plugin", - "@kbn/kibana-usage-collection-plugin", "@kbn/share-plugin", "@kbn/telemetry-collection-manager-plugin", "@kbn/alerting-plugin", @@ -42,7 +41,6 @@ "@kbn/features-plugin", "@kbn/global-search-plugin", "@kbn/infra-plugin", - "@kbn/licensing-plugin", "@kbn/ml-plugin", "@kbn/observability-plugin", "@kbn/security-plugin", @@ -68,7 +66,6 @@ "@kbn/maps-plugin", "@kbn/test-subj-selector", "@kbn/rison", - "@kbn/reporting-plugin", "@kbn/aiops-plugin", "@kbn/logging", "@kbn/utility-types", @@ -85,7 +82,6 @@ "@kbn/rule-registry-plugin", "@kbn/controls-plugin", "@kbn/core-saved-objects-server", - "@kbn/core-provider-plugin", "@kbn/user-profile-components", "@kbn/apm-synthtrace-client", "@kbn/cloud-integration-saml-provider-plugin", @@ -157,5 +153,6 @@ "@kbn/event-log-plugin", "@kbn/management-settings-ids", "@kbn/intercepts-plugin", + "@kbn/core-provider-plugin", ] } diff --git a/yarn.lock b/yarn.lock index 2d9156336d6ee..883e0a515b271 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4005,7 +4005,7 @@ version "0.0.0" uid "" -"@kbn/application-usage-test-plugin@link:x-pack/test/usage_collection/plugins/application_usage_test": +"@kbn/application-usage-test-plugin@link:x-pack/platform/test/usage_collection/plugins/application_usage_test": version "0.0.0" uid "" @@ -7729,7 +7729,7 @@ version "0.0.0" uid "" -"@kbn/stack-management-usage-test-plugin@link:x-pack/test/usage_collection/plugins/stack_management_usage_test": +"@kbn/stack-management-usage-test-plugin@link:x-pack/platform/test/usage_collection/plugins/stack_management_usage_test": version "0.0.0" uid "" @@ -7849,7 +7849,7 @@ version "0.0.0" uid "" -"@kbn/test-feature-usage-plugin@link:x-pack/test/licensing_plugin/plugins/test_feature_usage": +"@kbn/test-feature-usage-plugin@link:x-pack/platform/test/licensing_plugin/plugins/test_feature_usage": version "0.0.0" uid ""