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
9 changes: 5 additions & 4 deletions .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ disabled:
- x-pack/test/functional_basic/apps/ml/config.base.ts
- x-pack/test/functional_basic/apps/transform/config.base.ts
- x-pack/platform/test/api_integration_basic/config.basic_license.ts
- x-pack/platform/test/ui_capabilities/common/config.ts

# QA suites that are run out-of-band
- x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
Expand Down Expand Up @@ -161,7 +162,7 @@ enabled:
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial.ts
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
- x-pack/platform/test/cases_api_integration/spaces_only/config.ts
- x-pack/test/disable_ems/config.ts
- x-pack/platform/test/disable_ems/config.ts
- x-pack/platform/test/examples/config.ts
- x-pack/test/fleet_api_integration/config.agent.ts
- x-pack/test/fleet_api_integration/config.agent_policy.ts
Expand All @@ -183,7 +184,7 @@ enabled:
- x-pack/test/functional_basic/apps/transform/feature_controls/config.ts
- x-pack/platform/test/functional_cors/config.ts
- x-pack/platform/test/functional_embedded/config.ts
- x-pack/test/functional_execution_context/config.ts
- x-pack/platform/test/functional_execution_context/config.ts
- x-pack/test/functional_with_es_ssl/apps/cases/group1/config.ts
- x-pack/test/functional_with_es_ssl/apps/cases/group2/config.ts
- x-pack/test/functional_with_es_ssl/apps/cases/basic/config.ts
Expand Down Expand Up @@ -327,8 +328,8 @@ enabled:
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
- x-pack/test/spaces_api_integration/spaces_only/config.ts
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
- x-pack/test/ui_capabilities/spaces_only/config.ts
- 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/platform/test/usage_collection/config.ts
- x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ module.exports = {
'x-pack/test/*/{tests,test_suites,apis,apps,deployment_agnostic}/**/*',
'x-pack/test/*/*config.*ts',
'x-pack/platform/test/saved_object_api_integration/*/apis/**/*',
'x-pack/test/ui_capabilities/*/tests/**/*',
'x-pack/platform/test/ui_capabilities/*/tests/**/*',
'x-pack/test/upgrade_assistant_integration/**/*',
'x-pack/test/performance/**/*.ts',
'**/cypress.config.{js,ts}',
Expand Down
10 changes: 5 additions & 5 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ examples/feature_flags_example @elastic/kibana-core
x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security
x-pack/platform/plugins/shared/features @elastic/kibana-core
x-pack/test/security_api_integration/plugins/features_provider @elastic/kibana-security
x-pack/test/functional_execution_context/plugins/alerts @elastic/kibana-core
x-pack/platform/test/functional_execution_context/plugins/alerts @elastic/kibana-core
examples/field_formats_example @elastic/kibana-data-discovery
src/platform/plugins/shared/field_formats @elastic/kibana-data-discovery
src/platform/packages/shared/kbn-field-types @elastic/kibana-data-discovery
Expand All @@ -508,7 +508,7 @@ src/platform/plugins/shared/files @elastic/appex-sharedux
packages/kbn-find-used-node-modules @elastic/kibana-operations
x-pack/platform/plugins/shared/fleet @elastic/fleet
src/platform/packages/shared/kbn-flot-charts @elastic/kibana-operations
x-pack/test/ui_capabilities/common/plugins/foo_plugin @elastic/kibana-security
x-pack/platform/test/ui_capabilities/common/plugins/foo_plugin @elastic/kibana-security
src/platform/plugins/private/ftr_apis @elastic/kibana-core
src/platform/packages/shared/kbn-ftr-common-functional-services @elastic/kibana-operations @elastic/appex-qa
src/platform/packages/shared/kbn-ftr-common-functional-ui-services @elastic/appex-qa
Expand Down Expand Up @@ -1508,7 +1508,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
^/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
/x-pack/test/disable_ems @elastic/kibana-presentation # Assigned per https://github.com/elastic/kibana/pull/165986
/x-pack/platform/test/disable_ems @elastic/kibana-presentation # Assigned per https://github.com/elastic/kibana/pull/165986
/x-pack/test/functional/fixtures/kbn_archiver/dashboard* @elastic/kibana-presentation
^/src/platform/test/functional/page_objects/dashboard_page* @elastic/kibana-presentation
^/src/platform/test/functional/firefox/dashboard.config.ts @elastic/kibana-presentation # Assigned per: https://github.com/elastic/kibana/issues/15023
Expand Down Expand Up @@ -1870,7 +1870,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
/x-pack/test/functional/apps/saved_objects_management @elastic/kibana-core
/x-pack/platform/test/usage_collection @elastic/kibana-core
/x-pack/platform/test/licensing_plugin @elastic/kibana-core
/x-pack/test/functional_execution_context @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
/x-pack/platform/test/api_integration/apis/stats @elastic/kibana-core
Expand Down Expand Up @@ -1982,7 +1982,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi
/x-pack/platform/test/api_integration/apis/security/ @elastic/kibana-security
/x-pack/platform/test/api_integration/apis/spaces/ @elastic/kibana-security
/x-pack/platform/test/api_integration_basic/apis/security/ @elastic/kibana-security
/x-pack/test/ui_capabilities/ @elastic/kibana-security
/x-pack/platform/test/ui_capabilities/ @elastic/kibana-security
/x-pack/platform/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
/x-pack/platform/test/functional/apps/security/ @elastic/kibana-security
/x-pack/platform/test/functional/apps/spaces/ @elastic/kibana-security
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@
"@kbn/feature-usage-test-plugin": "link:x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test",
"@kbn/features-plugin": "link:x-pack/platform/plugins/shared/features",
"@kbn/features-provider-plugin": "link:x-pack/test/security_api_integration/plugins/features_provider",
"@kbn/fec-alerts-test-plugin": "link:x-pack/test/functional_execution_context/plugins/alerts",
"@kbn/fec-alerts-test-plugin": "link:x-pack/platform/test/functional_execution_context/plugins/alerts",
"@kbn/field-formats-example-plugin": "link:examples/field_formats_example",
"@kbn/field-formats-plugin": "link:src/platform/plugins/shared/field_formats",
"@kbn/field-types": "link:src/platform/packages/shared/kbn-field-types",
Expand All @@ -561,7 +561,7 @@
"@kbn/files-plugin": "link:src/platform/plugins/shared/files",
"@kbn/fleet-plugin": "link:x-pack/platform/plugins/shared/fleet",
"@kbn/flot-charts": "link:src/platform/packages/shared/kbn-flot-charts",
"@kbn/foo-plugin": "link:x-pack/test/ui_capabilities/common/plugins/foo_plugin",
"@kbn/foo-plugin": "link:x-pack/platform/test/ui_capabilities/common/plugins/foo_plugin",
"@kbn/ftr-apis-plugin": "link:src/platform/plugins/private/ftr_apis",
"@kbn/functional-with-es-ssl-cases-test-plugin": "link:x-pack/test/functional_with_es_ssl/plugins/cases",
"@kbn/gen-ai-streaming-response-example-plugin": "link:x-pack/examples/gen_ai_streaming_response_example",
Expand Down
8 changes: 4 additions & 4 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -980,8 +980,8 @@
"@kbn/features-plugin/*": ["x-pack/platform/plugins/shared/features/*"],
"@kbn/features-provider-plugin": ["x-pack/test/security_api_integration/plugins/features_provider"],
"@kbn/features-provider-plugin/*": ["x-pack/test/security_api_integration/plugins/features_provider/*"],
"@kbn/fec-alerts-test-plugin": ["x-pack/test/functional_execution_context/plugins/alerts"],
"@kbn/fec-alerts-test-plugin/*": ["x-pack/test/functional_execution_context/plugins/alerts/*"],
"@kbn/fec-alerts-test-plugin": ["x-pack/platform/test/functional_execution_context/plugins/alerts"],
"@kbn/fec-alerts-test-plugin/*": ["x-pack/platform/test/functional_execution_context/plugins/alerts/*"],
"@kbn/field-formats-example-plugin": ["examples/field_formats_example"],
"@kbn/field-formats-example-plugin/*": ["examples/field_formats_example/*"],
"@kbn/field-formats-plugin": ["src/platform/plugins/shared/field_formats"],
Expand Down Expand Up @@ -1010,8 +1010,8 @@
"@kbn/fleet-plugin/*": ["x-pack/platform/plugins/shared/fleet/*"],
"@kbn/flot-charts": ["src/platform/packages/shared/kbn-flot-charts"],
"@kbn/flot-charts/*": ["src/platform/packages/shared/kbn-flot-charts/*"],
"@kbn/foo-plugin": ["x-pack/test/ui_capabilities/common/plugins/foo_plugin"],
"@kbn/foo-plugin/*": ["x-pack/test/ui_capabilities/common/plugins/foo_plugin/*"],
"@kbn/foo-plugin": ["x-pack/platform/test/ui_capabilities/common/plugins/foo_plugin"],
"@kbn/foo-plugin/*": ["x-pack/platform/test/ui_capabilities/common/plugins/foo_plugin/*"],
"@kbn/ftr-apis-plugin": ["src/platform/plugins/private/ftr_apis"],
"@kbn/ftr-apis-plugin/*": ["src/platform/plugins/private/ftr_apis/*"],
"@kbn/ftr-common-functional-services": ["src/platform/packages/shared/kbn-ftr-common-functional-services"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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
Expand Up @@ -15,13 +15,13 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
describe('disable Elastic Maps Service', () => {
before(async () => {
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
await kibanaServer.importExport.load('x-pack/test/disable_ems/kbn_archive.json');
await kibanaServer.importExport.load('x-pack/platform/test/disable_ems/kbn_archive.json');
await browser.setWindowSize(1600, 1000);
});

after(async () => {
await esArchiver.unload('x-pack/test/functional/es_archives/maps/data');
await kibanaServer.importExport.unload('x-pack/test/disable_ems/kbn_archive.json');
await kibanaServer.importExport.unload('x-pack/platform/test/disable_ems/kbn_archive.json');
});

loadTestFile(require.resolve('./fonts'));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FtrConfigProviderContext, getKibanaCliLoggers, findTestPluginPaths } fr
import { logFilePath } from './test_utils';

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

const servers = {
...functionalConfig.get('servers'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"templateVersion": "1.0.0"
},
"scripts": {
"kbn": "node ../../../../../../scripts/kbn.js",
"build": "rm -rf './target' && ../../../../../../node_modules/.bin/tsc"
"kbn": "node ../../../../../../../scripts/kbn.js",
"build": "rm -rf './target' && ../../../../../../../node_modules/.bin/tsc"
},
"license": "Elastic License 2.0"
}
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 @@ -21,7 +21,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)

return async ({ readConfigFile }: FtrConfigProviderContext) => {
const xPackFunctionalTestsConfig = await readConfigFile(
require.resolve('../../functional/config.base.js')
require.resolve('../../functional/config.base.ts')
);

return {
Expand Down Expand Up @@ -50,7 +50,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
`--plugin-path=${path.resolve(__dirname, 'plugins/foo_plugin')}`,
`--plugin-path=${path.resolve(
__dirname,
'../../security_api_integration/plugins/features_provider'
'../../../../test/security_api_integration/plugins/features_provider'
)}`,
],
},
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",
"isolatedModules": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { FeaturesProvider } from './features';
import { UICapabilitiesProvider } from './ui_capabilities';
import { services as commonServices } from '../../../common/services';
import { services as commonServices } from '../../../api_integration/services';

export const services = {
...commonServices,
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5651,7 +5651,7 @@
version "0.0.0"
uid ""

"@kbn/fec-alerts-test-plugin@link:x-pack/test/functional_execution_context/plugins/alerts":
"@kbn/fec-alerts-test-plugin@link:x-pack/platform/test/functional_execution_context/plugins/alerts":
version "0.0.0"
uid ""

Expand Down Expand Up @@ -5711,7 +5711,7 @@
version "0.0.0"
uid ""

"@kbn/foo-plugin@link:x-pack/test/ui_capabilities/common/plugins/foo_plugin":
"@kbn/foo-plugin@link:x-pack/platform/test/ui_capabilities/common/plugins/foo_plugin":
version "0.0.0"
uid ""

Expand Down