Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ disabled:
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts
- x-pack/platform/test/alerting_api_integration/spaces_only_legacy/config.ts
- x-pack/test/cloud_integration/config.ts
- x-pack/platform/test/cloud_integration/config.ts
- x-pack/platform/test/load/config.ts
- x-pack/platform/test/plugin_api_perf/config.ts
- x-pack/test/screenshot_creation/config.ts
Expand Down Expand Up @@ -159,7 +159,7 @@ enabled:
- x-pack/platform/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts
- x-pack/test/api_integration/apis/cases/config.ts
- x-pack/test/api_integration/apis/security/config.ts
- x-pack/test/banners_functional/config.ts
- x-pack/platform/test/banners_functional/config.ts
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_basic.ts
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial.ts
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial_common.ts
Expand Down Expand Up @@ -292,7 +292,7 @@ enabled:
- x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
- 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/platform/test/saved_objects_field_count/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
Expand Down Expand Up @@ -361,7 +361,7 @@ enabled:
- x-pack/performance/journeys_e2e/cloud_security_dashboard.ts
- x-pack/performance/journeys_e2e/apm_service_inventory.ts
- x-pack/performance/journeys_e2e/infra_hosts_view.ts
- x-pack/test/custom_branding/config.ts
- x-pack/platform/test/custom_branding/config.ts
# configs migrated to the new Kibana architecture
- x-pack/platform/test/api_integration/apis/aiops/config.ts
- x-pack/platform/test/api_integration/apis/cloud/config.ts
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/saved_object_field_metrics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ echo '--- Default Saved Object Field Metrics'
node scripts/functional_tests \
--debug --bail \
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
--config x-pack/test/saved_objects_field_count/config.ts
--config x-pack/platform/test/saved_objects_field_count/config.ts
14 changes: 7 additions & 7 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,7 @@ x-pack/platform/test/api_integration/apis/entity_manager/fixture_plugin @elastic
x-pack/platform/test/cases_api_integration/common/plugins/cases @elastic/response-ops
x-pack/platform/test/cases_api_integration/common/plugins/observability @elastic/response-ops
x-pack/platform/test/cases_api_integration/common/plugins/security_solution @elastic/response-ops
x-pack/platform/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
x-pack/platform/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin @elastic/kibana-security
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
Expand Down Expand Up @@ -1123,7 +1124,6 @@ x-pack/solutions/security/plugins/session_view @elastic/kibana-cloud-security-po
x-pack/solutions/security/test
x-pack/test
x-pack/test_serverless
x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
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
Expand Down Expand Up @@ -1952,7 +1952,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
/x-pack/test/stack_functional_integration/apps/savedobjects_upgrade_testing @elastic/kibana-core
/x-pack/test/functional/page_objects/status_page.ts @elastic/kibana-core
/x-pack/test/functional/page_objects/share_saved_objects_to_space_page.ts @elastic/kibana-core
/x-pack/test/functional/page_objects/banners_page.ts @elastic/kibana-core
/x-pack/platform/test/functional/page_objects/banners_page.ts @elastic/kibana-core
/x-pack/test/common/lib/test_data_loader.ts @elastic/kibana-core
/x-pack/test/api_integration/services/usage_api.ts @elastic/kibana-core
/x-pack/platform/test/api_integration/apis/kibana @elastic/kibana-core
Expand All @@ -1967,8 +1967,8 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
/src/platform/test/api_integration/fixtures/import_managed.ndjson @elastic/kibana-core
/src/platform/test/functional/services/apps_menu.ts @elastic/kibana-core
/x-pack/test/functional/apps/status_page @elastic/kibana-core
/x-pack/test/cloud_integration @elastic/kibana-core
/x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
/x-pack/platform/test/cloud_integration @elastic/kibana-core
/x-pack/platform/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
/src/platform/test/server_integration @elastic/kibana-core
/x-pack/platform/test/functional_cors @elastic/kibana-core
/x-pack/test/stack_functional_integration/apps/telemetry @elastic/kibana-core
Expand Down Expand Up @@ -2036,7 +2036,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
/typings/ @elastic/kibana-core
/src/platform/test/analytics @elastic/kibana-core
/src/platform/packages/shared/kbn-test/src/jest/setup/mocks.kbn_i18n_react.js @elastic/kibana-core
/x-pack/test/saved_objects_field_count/ @elastic/kibana-core
/x-pack/platform/test/saved_objects_field_count/ @elastic/kibana-core
/x-pack/test_serverless/**/test_suites/common/saved_objects_management/ @elastic/kibana-core
/x-pack/test_serverless/api_integration/test_suites/common/core/ @elastic/kibana-core
/x-pack/test_serverless/api_integration/test_suites/**/telemetry/ @elastic/kibana-core
Expand Down Expand Up @@ -2897,8 +2897,8 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr
/src/platform/test/examples/content_management/*.ts @elastic/appex-sharedux
/src/platform/test/api_integration/apis/guided_onboarding @elastic/appex-sharedux
/x-pack/solutions/search/test/api_integration/apis/guided_onboarding @elastic/appex-sharedux
/x-pack/test/banners_functional @elastic/appex-sharedux
/x-pack/test/custom_branding @elastic/appex-sharedux
/x-pack/platform/test/banners_functional @elastic/appex-sharedux
/x-pack/platform/test/custom_branding @elastic/appex-sharedux
/x-pack/platform/test/api_integration/apis/content_management @elastic/appex-sharedux
/x-pack/test/accessibility/apps/group3/tags.ts @elastic/appex-sharedux
/x-pack/test/accessibility/apps/group3/snapshot_and_restore.ts @elastic/appex-sharedux
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
"@kbn/cloud-data-migration-plugin": "link:x-pack/platform/plugins/private/cloud_integrations/cloud_data_migration",
"@kbn/cloud-experiments-plugin": "link:x-pack/platform/plugins/private/cloud_integrations/cloud_experiments",
"@kbn/cloud-full-story-plugin": "link:x-pack/platform/plugins/private/cloud_integrations/cloud_full_story",
"@kbn/cloud-integration-saml-provider-plugin": "link:x-pack/test/cloud_integration/plugins/saml_provider",
"@kbn/cloud-integration-saml-provider-plugin": "link:x-pack/platform/test/cloud_integration/plugins/saml_provider",
"@kbn/cloud-links-plugin": "link:x-pack/platform/plugins/private/cloud_integrations/cloud_links",
"@kbn/cloud-plugin": "link:x-pack/platform/plugins/shared/cloud",
"@kbn/cloud-security-posture": "link:x-pack/solutions/security/packages/kbn-cloud-security-posture/public",
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@
"@kbn/cloud-experiments-plugin/*": ["x-pack/platform/plugins/private/cloud_integrations/cloud_experiments/*"],
"@kbn/cloud-full-story-plugin": ["x-pack/platform/plugins/private/cloud_integrations/cloud_full_story"],
"@kbn/cloud-full-story-plugin/*": ["x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/*"],
"@kbn/cloud-integration-saml-provider-plugin": ["x-pack/test/cloud_integration/plugins/saml_provider"],
"@kbn/cloud-integration-saml-provider-plugin/*": ["x-pack/test/cloud_integration/plugins/saml_provider/*"],
"@kbn/cloud-integration-saml-provider-plugin": ["x-pack/platform/test/cloud_integration/plugins/saml_provider"],
"@kbn/cloud-integration-saml-provider-plugin/*": ["x-pack/platform/test/cloud_integration/plugins/saml_provider/*"],
"@kbn/cloud-links-plugin": ["x-pack/platform/plugins/private/cloud_integrations/cloud_links"],
"@kbn/cloud-links-plugin/*": ["x-pack/platform/plugins/private/cloud_integrations/cloud_links/*"],
"@kbn/cloud-plugin": ["x-pack/platform/plugins/shared/cloud"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { services, pageObjects } from './ftr_provider_context';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const kibanaFunctionalConfig = await readConfigFile(
require.resolve('../functional/config.base.js')
require.resolve('../functional/config.base.ts')
);

return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../../../tsconfig.base.json",
"extends": "../../../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { services, pageObjects } from './ftr_provider_context';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const kibanaFunctionalConfig = await readConfigFile(
require.resolve('../functional/config.base.js')
require.resolve('../functional/config.base.ts')
);

return {
Expand Down
2 changes: 2 additions & 0 deletions x-pack/platform/test/functional/page_objects/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { SnapshotRestorePageProvider } from './snapshot_restore_page';
import { SearchSessionsPageProvider } from './search_sessions_management_page';
import { GraphPageObject } from './graph_page';
import { MaintenanceWindowsPageProvider } from './maintenance_windows_page';
import { BannersPageObject } from './banners_page';

// just like services, PageObjects are defined as a map of
// names to Providers. Merge in Kibana's or pick specific ones
Expand All @@ -47,4 +48,5 @@ export const pageObjects = {
upgradeAssistant: UpgradeAssistantFlyoutObject,
userProfiles: UserProfilePageProvider,
maintenanceWindows: MaintenanceWindowsPageProvider,
banners: BannersPageObject,
};
2 changes: 2 additions & 0 deletions x-pack/platform/test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,5 +134,7 @@
"@kbn/embeddable-alerts-table-plugin",
"@kbn/apm-synthtrace-client",
"@kbn/apm-synthtrace",
"@kbn/cloud-integration-saml-provider-plugin",
"@kbn/ci-stats-reporter",
]
}
2 changes: 1 addition & 1 deletion x-pack/test/functional/page_objects/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import { UserProfilePageProvider } from '@kbn/test-suites-xpack-platform/functio
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 { MaintenanceWindowsPageProvider } from '@kbn/test-suites-xpack-platform/functional/page_objects/maintenance_windows_page';
import { BannersPageObject } from '@kbn/test-suites-xpack-platform/functional/page_objects/banners_page';
import { ApiKeysPageProvider } from './api_keys_page';
import { AssetDetailsProvider } from './asset_details';
import { BannersPageObject } from './banners_page';
import { CrossClusterReplicationPageProvider } from './cross_cluster_replication_page';
import { DetectionsPageObject } from '../../security_solution_ftr/page_objects/detections';
import { EmbeddedConsoleProvider } from './embedded_console';
Expand Down
2 changes: 0 additions & 2 deletions x-pack/test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"@kbn/dev-utils",
"@kbn/ftr-common-functional-services",
"@kbn/expect",
"@kbn/ci-stats-reporter",
"@kbn/std",
"@kbn/apm-synthtrace",
"@kbn/core-saved-objects-base-server-internal",
Expand All @@ -79,7 +78,6 @@
"@kbn/controls-plugin",
"@kbn/core-saved-objects-server",
"@kbn/apm-synthtrace-client",
"@kbn/cloud-integration-saml-provider-plugin",
"@kbn/security-api-integration-helpers",
"@kbn/discover-plugin",
"@kbn/shared-ux-file-types",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4145,7 +4145,7 @@
version "0.0.0"
uid ""

"@kbn/cloud-integration-saml-provider-plugin@link:x-pack/test/cloud_integration/plugins/saml_provider":
"@kbn/cloud-integration-saml-provider-plugin@link:x-pack/platform/test/cloud_integration/plugins/saml_provider":
version "0.0.0"
uid ""

Expand Down