diff --git a/.buildkite/ftr_security_serverless_configs.yml b/.buildkite/ftr_security_serverless_configs.yml index e1271601de41f..c3d6c0b8306f0 100644 --- a/.buildkite/ftr_security_serverless_configs.yml +++ b/.buildkite/ftr_security_serverless_configs.yml @@ -87,7 +87,9 @@ enabled: - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/configs/serverless.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/serverless_essentials_tier.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_disabled/configs/serverless_essentials_tier.config.ts - - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/serverless.config.ts + - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/serverless.config.ts + - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/serverless.config.ts + - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/serverless.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/serverless.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/type_specific_fields/configs/serverless.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/configs/serverless_essentials_tier.config.ts diff --git a/.buildkite/ftr_security_stateful_configs.yml b/.buildkite/ftr_security_stateful_configs.yml index daa7bc713583e..3e0b306155414 100644 --- a/.buildkite/ftr_security_stateful_configs.yml +++ b/.buildkite/ftr_security_stateful_configs.yml @@ -73,7 +73,9 @@ enabled: - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/edge_cases/ess_air_gapped_with_bundled_large_package.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_disabled/configs/ess_basic_license.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/edge_cases/ess_trial_license.config.ts - - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/ess.config.ts + - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/ess.config.ts + - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/ess.config.ts + - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/ess.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/ess.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/type_specific_fields/configs/ess.config.ts - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/configs/ess_basic_license.config.ts diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/jest.integration.config.js b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/jest.integration.config.js deleted file mode 100644 index d360ced5fd560..0000000000000 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/jest.integration.config.js +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -module.exports = { - preset: '@kbn/test/jest_integration', - rootDir: '../../../../../../../../../../../../../..', - roots: [ - '/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management', - ], - testMatch: ['**/common_fields/*.test.[jt]s?(x)'], - openHandlesTimeout: 0, - forceExit: true, -}; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/base.jest.integration.config.js b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/base.jest.integration.config.js new file mode 100644 index 0000000000000..85e1b79dda315 --- /dev/null +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/base.jest.integration.config.js @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +/* eslint-disable import/no-nodejs-modules */ +import fs from 'fs'; + +// Discover all test files +const allTestFiles = fs + .readdirSync(__dirname, { recursive: true }) + .filter((f) => f.endsWith('.test.ts')); + +/** + * Distributes all field test files evenly using round-robin across available configs. + */ +function getTestsForConfig({ testsDirectory, groupNumber, totalGroups }) { + const groupIndex = groupNumber - 1; + + const testFiles = allTestFiles.filter((file) => file.includes(testsDirectory)); + const testFilesForConfig = testFiles.filter((file, index) => index % totalGroups === groupIndex); + + console.log( + `Rule Upgrade - Fields integration tests. ${testsDirectory}, config_${groupNumber}: Running ${testFilesForConfig.length} test files:`, + testFilesForConfig + ); + + return testFilesForConfig; +} + +/** + * Base Jest configuration shared by all field test configs + */ +export function createFieldTestingConfig({ testsDirectory, groupNumber, totalGroups }) { + const testFiles = getTestsForConfig({ + testsDirectory, + groupNumber, + totalGroups, + }); + + return { + preset: '@kbn/test/jest_integration', + rootDir: '../../../../../../../../../../../../../../../..', + roots: [ + '/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management', + ], + testMatch: testFiles.map((file) => `**/${file}`), + openHandlesTimeout: 0, + forceExit: true, + }; +} diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/alert_suppression.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/alert_suppression.test.ts similarity index 81% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/alert_suppression.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/alert_suppression.test.ts index 4db78184ead8c..69f451d90d310 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/alert_suppression.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/alert_suppression.test.ts @@ -5,11 +5,11 @@ * 2.0. */ -import { mockAvailableDataViews } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { mockAvailableDataViews } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "alert_suppression" (query rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/building_block.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/building_block.test.ts similarity index 78% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/building_block.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/building_block.test.ts index 69122708d56c5..4e95b1de523bc 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/building_block.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/building_block.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "building_block" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/config_1/jest.integration.config.js b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/config_1/jest.integration.config.js new file mode 100644 index 0000000000000..62ef348e246a2 --- /dev/null +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/config_1/jest.integration.config.js @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { createFieldTestingConfig } from '../../base.jest.integration.config'; + +export default createFieldTestingConfig({ + testsDirectory: 'common', + groupNumber: 1, + totalGroups: 2, +}); diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/config_2/jest.integration.config.js b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/config_2/jest.integration.config.js new file mode 100644 index 0000000000000..5858a4433b506 --- /dev/null +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/config_2/jest.integration.config.js @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { createFieldTestingConfig } from '../../base.jest.integration.config'; + +export default createFieldTestingConfig({ + testsDirectory: 'common', + groupNumber: 2, + totalGroups: 2, +}); diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/data_source.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/data_source.test.ts similarity index 82% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/data_source.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/data_source.test.ts index 05aa6ad4baf2b..3e99cfbad1a1c 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/data_source.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/data_source.test.ts @@ -5,12 +5,12 @@ * 2.0. */ -import { DataSourceType } from '../../../../../../../../../common/api/detection_engine'; -import { mockAvailableDataViews } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { DataSourceType } from '../../../../../../../../../../common/api/detection_engine'; +import { mockAvailableDataViews } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "data_source" (query rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/description.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/description.test.ts similarity index 76% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/description.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/description.test.ts index 11a1eed278b34..290abc688f254 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/description.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/description.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "description" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/false_positives.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/false_positives.test.ts similarity index 78% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/false_positives.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/false_positives.test.ts index 5abbe426923ef..2a96df551862c 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/false_positives.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/false_positives.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "false_positives" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/investigation_fields.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/investigation_fields.test.ts similarity index 78% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/investigation_fields.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/investigation_fields.test.ts index 1751895f1a92d..c19b8dff80bba 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/investigation_fields.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/investigation_fields.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { mockAvailableDataViews } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { mockAvailableDataViews } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "investigation_fields" (query rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/max_signals.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/max_signals.test.ts similarity index 75% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/max_signals.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/max_signals.test.ts index 8425f5947a58c..abb95b90f254b 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/max_signals.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/max_signals.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "max_signals" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/name.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/name.test.ts similarity index 75% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/name.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/name.test.ts index 4948abc443c0a..ed7797de6e348 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/name.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/name.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "name" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/note.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/note.test.ts similarity index 78% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/note.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/note.test.ts index 5d0ab3e425265..e15b3f92604ea 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/note.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/note.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "note" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/references.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/references.test.ts similarity index 76% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/references.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/references.test.ts index ae9487b156beb..6b7004e921d51 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/references.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/references.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "references" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/related_integrations.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/related_integrations.test.ts similarity index 78% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/related_integrations.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/related_integrations.test.ts index 4f965ec38c9b0..7b196aa872bee 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/related_integrations.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/related_integrations.test.ts @@ -5,11 +5,11 @@ * 2.0. */ -import { mockRelatedIntegrations } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { mockRelatedIntegrations } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "related_integrations" (query rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/required_fields.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/required_fields.test.ts similarity index 81% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/required_fields.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/required_fields.test.ts index 0f3ceceb3f94f..6d42dab388ebe 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/required_fields.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/required_fields.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "required_fields" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/risk_score.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/risk_score.test.ts similarity index 75% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/risk_score.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/risk_score.test.ts index 7adfbc2c15833..80d521509eb9b 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/risk_score.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/risk_score.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "risk_score" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/risk_score_mapping.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/risk_score_mapping.test.ts similarity index 81% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/risk_score_mapping.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/risk_score_mapping.test.ts index e9fbf9507979a..dd5ffe0a18e89 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/risk_score_mapping.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/risk_score_mapping.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { mockAvailableDataViews } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { mockAvailableDataViews } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "risk_score_mapping" (query rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/rule_name_override.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/rule_name_override.test.ts similarity index 77% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/rule_name_override.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/rule_name_override.test.ts index 89ddb0f4335a6..9fc1e2a4fb66f 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/rule_name_override.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/rule_name_override.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { mockAvailableDataViews } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { mockAvailableDataViews } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "rule_name_override" (query rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/rule_schedule.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/rule_schedule.test.ts similarity index 80% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/rule_schedule.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/rule_schedule.test.ts index e0c32d797c77c..85419c52abb89 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/rule_schedule.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/rule_schedule.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "rule_schedule" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/setup.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/setup.test.ts similarity index 77% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/setup.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/setup.test.ts index c9ba9db4aee32..411227528880e 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/setup.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/setup.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "setup" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/severity.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/severity.test.ts similarity index 77% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/severity.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/severity.test.ts index 7ab840fe0a6e4..e1a8de712aff4 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/severity.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/severity.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "severity" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/severity_mapping.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/severity_mapping.test.ts similarity index 81% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/severity_mapping.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/severity_mapping.test.ts index 8d3b9a6eacb5b..5135848f03375 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/severity_mapping.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/severity_mapping.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { mockAvailableDataViews } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { mockAvailableDataViews } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "severity_mapping" (query rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/threat.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/threat.test.ts similarity index 89% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/threat.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/threat.test.ts index 60baf71a4387d..0d2dbabb6f7e1 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/threat.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/threat.test.ts @@ -5,8 +5,8 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; describe('Upgrade diffable rule "threat" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/timeline_template.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/timeline_template.test.ts similarity index 78% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/timeline_template.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/timeline_template.test.ts index b7f34b20bcfab..95fb7e5e18848 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/timeline_template.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/timeline_template.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { mockTimelines } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { mockTimelines } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "timeline_template" (query rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/timestamp_override.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/timestamp_override.test.ts similarity index 79% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/timestamp_override.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/timestamp_override.test.ts index ed21b1fe2dd06..bf25e104303cd 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/common_fields/timestamp_override.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/common/timestamp_override.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { mockAvailableDataViews } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { mockAvailableDataViews } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "timestamp_override" (query rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/anomaly_threshold.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/anomaly_threshold.test.ts similarity index 76% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/anomaly_threshold.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/anomaly_threshold.test.ts index dcdd7471c621e..cf1e5240116d2 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/anomaly_threshold.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/anomaly_threshold.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "anomaly_threshold" (machine_learning rule type) after preview in flyout', () => { const ruleType = 'machine_learning'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/config_1/jest.integration.config.js b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/config_1/jest.integration.config.js new file mode 100644 index 0000000000000..68c6e451ce4c0 --- /dev/null +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/config_1/jest.integration.config.js @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { createFieldTestingConfig } from '../../base.jest.integration.config'; + +export default createFieldTestingConfig({ + testsDirectory: 'type_specific', + groupNumber: 1, + totalGroups: 2, +}); diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/config_2/jest.integration.config.js b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/config_2/jest.integration.config.js new file mode 100644 index 0000000000000..1ffdb327a0208 --- /dev/null +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/config_2/jest.integration.config.js @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { createFieldTestingConfig } from '../../base.jest.integration.config'; + +export default createFieldTestingConfig({ + testsDirectory: 'type_specific', + groupNumber: 2, + totalGroups: 2, +}); diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/eql_query.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/eql_query.test.ts similarity index 79% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/eql_query.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/eql_query.test.ts index fec71e89a1103..985d6f757a0ad 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/eql_query.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/eql_query.test.ts @@ -6,11 +6,11 @@ */ import { of } from 'rxjs'; -import { KibanaServices } from '../../../../../../../../common/lib/kibana'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { KibanaServices } from '../../../../../../../../../common/lib/kibana'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "eql_query" (eql rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/history_window_start.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/history_window_start.test.ts similarity index 78% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/history_window_start.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/history_window_start.test.ts index 1574745eade25..ec6b84fac9a13 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/history_window_start.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/history_window_start.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "history_window_start" (new_terms rule type) after preview in flyout', () => { const ruleType = 'new_terms'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/kql_query.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/kql_query.test.ts similarity index 76% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/kql_query.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/kql_query.test.ts index 819728fcfef6b..dd8b6486731c5 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/kql_query.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/kql_query.test.ts @@ -5,11 +5,11 @@ * 2.0. */ -import { KqlQueryType } from '../../../../../../../../../common/api/detection_engine'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { KqlQueryType } from '../../../../../../../../../../common/api/detection_engine'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "kql_query" (query rule type) after preview in flyout', () => { const ruleType = 'query'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/machine_learning_job_id.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/machine_learning_job_id.test.ts similarity index 92% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/machine_learning_job_id.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/machine_learning_job_id.test.ts index 54dd9b2599d17..b8fca89576de4 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/machine_learning_job_id.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/machine_learning_job_id.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { mockKibanaFetchResponse } from '../../test_utils/rule_upgrade_flyout'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { mockKibanaFetchResponse } from '../../../test_utils/rule_upgrade_flyout'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "machine_learning_job_id" (machine_learning rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/new_terms_fields.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/new_terms_fields.test.ts similarity index 77% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/new_terms_fields.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/new_terms_fields.test.ts index 4589e0962d566..e7c3f2aab6430 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/new_terms_fields.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/new_terms_fields.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { mockAvailableDataViews } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { mockAvailableDataViews } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "new_terms_fields" (new_terms rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threat_index.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threat_index.test.ts similarity index 76% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threat_index.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threat_index.test.ts index 9402d6fc4afe3..920e39531c400 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threat_index.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threat_index.test.ts @@ -5,10 +5,10 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "threat_index" (threat_match rule type) after preview in flyout', () => { const ruleType = 'threat_match'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threat_indicator_path.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threat_indicator_path.test.ts similarity index 78% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threat_indicator_path.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threat_indicator_path.test.ts index 8ed72ef928a2d..0aa19e36844b6 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threat_indicator_path.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threat_indicator_path.test.ts @@ -5,9 +5,9 @@ * 2.0. */ -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; describe('Upgrade diffable rule "threat_indicator_path" (threat_match rule type) after preview in flyout', () => { const ruleType = 'threat_match'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threat_query.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threat_query.test.ts similarity index 78% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threat_query.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threat_query.test.ts index 6cee8d1802efe..c5cfedd0789ea 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threat_query.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threat_query.test.ts @@ -5,11 +5,11 @@ * 2.0. */ -import { KqlQueryType } from '../../../../../../../../../common/api/detection_engine'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { KqlQueryType } from '../../../../../../../../../../common/api/detection_engine'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "threat_query" (threat_match rule type) after preview in flyout', () => { const ruleType = 'threat_match'; diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threshold.test.ts b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threshold.test.ts similarity index 76% rename from x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threshold.test.ts rename to x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threshold.test.ts index ba8c0ae395c6f..c202c73b6b675 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/threshold.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/fields/type_specific/threshold.test.ts @@ -5,11 +5,11 @@ * 2.0. */ -import { mockAvailableDataViews } from '../../test_utils/rule_upgrade_flyout'; -import { assertRuleUpgradePreview } from '../../test_utils/assert_rule_upgrade_preview'; -import { assertRuleUpgradeAfterReview } from '../../test_utils/assert_rule_upgrade_after_review'; -import { assertDiffAfterSavingUnchangedValue } from '../../test_utils/assert_diff_after_saving_unchanged_value'; -import { assertFieldValidation } from '../../test_utils/assert_field_validation'; +import { mockAvailableDataViews } from '../../../test_utils/rule_upgrade_flyout'; +import { assertRuleUpgradePreview } from '../../../test_utils/assert_rule_upgrade_preview'; +import { assertRuleUpgradeAfterReview } from '../../../test_utils/assert_rule_upgrade_after_review'; +import { assertDiffAfterSavingUnchangedValue } from '../../../test_utils/assert_diff_after_saving_unchanged_value'; +import { assertFieldValidation } from '../../../test_utils/assert_field_validation'; describe('Upgrade diffable rule "threshold" (threshold rule type) after preview in flyout', () => { beforeAll(() => { diff --git a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/jest.integration.config.js b/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/jest.integration.config.js deleted file mode 100644 index fb689b70c63c2..0000000000000 --- a/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management/__integration_tests__/rules_upgrade/upgrade_rule_after_preview/type_specific_fields/jest.integration.config.js +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -module.exports = { - preset: '@kbn/test/jest_integration', - rootDir: '../../../../../../../../../../../../../..', - roots: [ - '/x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/rule_management', - ], - testMatch: ['**/type_specific_fields/*.test.[jt]s?(x)'], - openHandlesTimeout: 0, - forceExit: true, -}; diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/ess.config.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/ess.config.ts similarity index 78% rename from x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/ess.config.ts rename to x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/ess.config.ts index e7271d4a7ac07..1a6b1f44e1bb1 100644 --- a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/ess.config.ts +++ b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/ess.config.ts @@ -9,7 +9,7 @@ import type { FtrConfigProviderContext } from '@kbn/test'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const functionalConfig = await readConfigFile( - require.resolve('../../../configs/ess/rules_management.trial.config') + require.resolve('../../../../configs/ess/rules_management.trial.config') ); const testConfig = { @@ -17,7 +17,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { testFiles: [require.resolve('..')], junit: { reportName: - 'Rules Management - Prebuilt Rules (Customization Enabled) Integration Tests - ESS Env', + 'Rules Management - Prebuilt Rules Customization (Customization Enabled) - ESS Env', }, }; diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/serverless.config.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/serverless.config.ts similarity index 63% rename from x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/serverless.config.ts rename to x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/serverless.config.ts index 0c44da3059ce7..291573e187707 100644 --- a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/serverless.config.ts +++ b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/configs/serverless.config.ts @@ -5,12 +5,12 @@ * 2.0. */ -import { createCompleteTierTestConfig } from '../../../configs/serverless/rules_management.complete.config'; +import { createCompleteTierTestConfig } from '../../../../configs/serverless/rules_management.complete.config'; export default createCompleteTierTestConfig({ testFiles: [require.resolve('..')], junit: { reportName: - 'Rules Management - Prebuilt Rules (Customization Enabled) Integration Tests - Serverless Env', + 'Rules Management - Prebuilt Rules Customization (Customization Enabled) - Serverless Env', }, }); diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/index.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/index.ts index 68f0f8e802ca0..5db12b3fea80b 100644 --- a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/index.ts +++ b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/customization/index.ts @@ -8,8 +8,10 @@ import type { FtrProviderContext } from '../../../../../../ftr_provider_context'; export default ({ loadTestFile }: FtrProviderContext): void => { - loadTestFile(require.resolve('./detect_customization_with_base_version')); - loadTestFile(require.resolve('./detect_customization_without_base_version')); - loadTestFile(require.resolve('./customize_via_bulk_editing')); - loadTestFile(require.resolve('./unaffected_fields')); + describe('Rules Management - Prebuilt Rules Customization (Customization Enabled)', function () { + loadTestFile(require.resolve('./detect_customization_with_base_version')); + loadTestFile(require.resolve('./detect_customization_without_base_version')); + loadTestFile(require.resolve('./customize_via_bulk_editing')); + loadTestFile(require.resolve('./unaffected_fields')); + }); }; diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/index.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/index.ts deleted file mode 100644 index efd42549287ae..0000000000000 --- a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import type { FtrProviderContext } from '../../../../../ftr_provider_context'; - -export default ({ loadTestFile }: FtrProviderContext): void => { - describe('Rules Management - Prebuilt Rules (Customization Enabled)', function () { - loadTestFile(require.resolve('./customization')); - loadTestFile(require.resolve('./upgrade_prebuilt_rules')); - loadTestFile(require.resolve('./upgrade_notifications')); - }); -}; diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/ess.config.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/ess.config.ts new file mode 100644 index 0000000000000..e1c0dd5e6a3af --- /dev/null +++ b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/ess.config.ts @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import type { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const functionalConfig = await readConfigFile( + require.resolve('../../../../configs/ess/rules_management.trial.config') + ); + + const testConfig = { + ...functionalConfig.getAll(), + testFiles: [require.resolve('..')], + junit: { + reportName: + 'Rules Management - Prebuilt Rules Upgrade Notifications (Customization Enabled) - ESS Env', + }, + }; + + return testConfig; +} diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/serverless.config.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/serverless.config.ts new file mode 100644 index 0000000000000..8adeeb5696eb2 --- /dev/null +++ b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/configs/serverless.config.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { createCompleteTierTestConfig } from '../../../../configs/serverless/rules_management.complete.config'; + +export default createCompleteTierTestConfig({ + testFiles: [require.resolve('..')], + junit: { + reportName: + 'Rules Management - Prebuilt Rules Upgrade Notifications (Customization Enabled) - Serverless Env', + }, +}); diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/index.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/index.ts index 45691988015df..0c5ddf70c229a 100644 --- a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/index.ts +++ b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_notifications/index.ts @@ -8,5 +8,7 @@ import type { FtrProviderContext } from '../../../../../../ftr_provider_context'; export default ({ loadTestFile }: FtrProviderContext): void => { - loadTestFile(require.resolve('./get_prebuilt_rules_status')); + describe('Rules Management - Prebuilt Rules Upgrade Notifications (Customization Enabled)', function () { + loadTestFile(require.resolve('./get_prebuilt_rules_status')); + }); }; diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/ess.config.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/ess.config.ts new file mode 100644 index 0000000000000..4776ea7423bb6 --- /dev/null +++ b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/ess.config.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import type { FtrConfigProviderContext } from '@kbn/test'; + +export default async function ({ readConfigFile }: FtrConfigProviderContext) { + const functionalConfig = await readConfigFile( + require.resolve('../../../../configs/ess/rules_management.trial.config') + ); + + const testConfig = { + ...functionalConfig.getAll(), + testFiles: [require.resolve('..')], + junit: { + reportName: 'Rules Management - Prebuilt Rules Upgrade (Customization Enabled) - ESS Env', + }, + }; + + return testConfig; +} diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/serverless.config.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/serverless.config.ts new file mode 100644 index 0000000000000..4b0c700ec329d --- /dev/null +++ b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/configs/serverless.config.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { createCompleteTierTestConfig } from '../../../../configs/serverless/rules_management.complete.config'; + +export default createCompleteTierTestConfig({ + testFiles: [require.resolve('..')], + junit: { + reportName: + 'Rules Management - Prebuilt Rules Upgrade (Customization Enabled) - Serverless Env', + }, +}); diff --git a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/index.ts b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/index.ts index af29adaf7b1a4..924f777ae149e 100644 --- a/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/index.ts +++ b/x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/index.ts @@ -8,7 +8,7 @@ import type { FtrProviderContext } from '../../../../../../ftr_provider_context'; export default ({ loadTestFile }: FtrProviderContext): void => { - describe('Upgrade prebuilt rules', function () { + describe('Rules Management - Prebuilt Rules Upgrade (Customization Enabled)', function () { loadTestFile(require.resolve('./review_prebuilt_rules_upgrade')); loadTestFile(require.resolve('./bulk_upgrade_all_prebuilt_rules')); loadTestFile(require.resolve('./bulk_upgrade_selected_prebuilt_rules'));