diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/get_action_error_log.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/get_action_error_log.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/get_action_error_log.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/get_action_error_log.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/get_alert_state.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/get_alert_state.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/get_alert_state.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/get_alert_state.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/get_alert_summary.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/get_alert_summary.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/get_alert_summary.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/get_alert_summary.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/get_execution_log.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/get_execution_log.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/get_execution_log.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/get_execution_log.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/index.ts index 94ce50aac8e86..87ef8228c7303 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/index.ts @@ -22,6 +22,11 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC loadTestFile(require.resolve('./enable')); loadTestFile(require.resolve('./find')); loadTestFile(require.resolve('./get')); + loadTestFile(require.resolve('./get_alert_state')); + loadTestFile(require.resolve('./get_alert_summary')); + loadTestFile(require.resolve('./get_execution_log')); + loadTestFile(require.resolve('./get_action_error_log')); + loadTestFile(require.resolve('./rule_types')); loadTestFile(require.resolve('./event_log')); }); } diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/rule_types.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/rule_types.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/rule_types.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/rule_types.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/alerts_default_space.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/alerts_default_space.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/alerts_default_space.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/alerts_default_space.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/alerts_space1.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/alerts_space1.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group4/alerts_space1.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/alerts_space1.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/index.ts index 9f077a0ce7134..1ccbb1c8f722d 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/index.ts @@ -14,11 +14,6 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC before(async () => await buildUp(getService)); after(async () => await tearDown(getService)); - loadTestFile(require.resolve('./get_alert_state')); - loadTestFile(require.resolve('./get_alert_summary')); - loadTestFile(require.resolve('./get_execution_log')); - loadTestFile(require.resolve('./get_action_error_log')); - loadTestFile(require.resolve('./rule_types')); loadTestFile(require.resolve('./execution_status')); loadTestFile(require.resolve('./monitoring_collection')); loadTestFile(require.resolve('./monitoring')); @@ -28,5 +23,9 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC loadTestFile(require.resolve('./unmute_instance')); loadTestFile(require.resolve('./update')); loadTestFile(require.resolve('./update_api_key')); + loadTestFile(require.resolve('./alerts_space1')); + loadTestFile(require.resolve('./alerts_default_space')); + loadTestFile(require.resolve('./transform_rule_types')); + loadTestFile(require.resolve('./ml_rule_types')); }); } diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/ml_rule_types/anomaly_detection/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/ml_rule_types/anomaly_detection/alert.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/ml_rule_types/anomaly_detection/alert.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/ml_rule_types/anomaly_detection/alert.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/ml_rule_types/anomaly_detection/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/ml_rule_types/anomaly_detection/index.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/ml_rule_types/anomaly_detection/index.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/ml_rule_types/anomaly_detection/index.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/ml_rule_types/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/ml_rule_types/index.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/ml_rule_types/index.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/ml_rule_types/index.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/transform_rule_types/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/transform_rule_types/index.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/transform_rule_types/index.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/transform_rule_types/index.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/transform_rule_types/transform_health/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/transform_rule_types/transform_health/alert.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/transform_rule_types/transform_health/alert.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/transform_rule_types/transform_health/alert.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/transform_rule_types/transform_health/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/transform_rule_types/transform_health/index.ts similarity index 100% rename from x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/transform_rule_types/transform_health/index.ts rename to x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group2/transform_rule_types/transform_health/index.ts diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/index.ts index 49c691cd86fc3..05fcb4f95d901 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group3/index.ts @@ -15,7 +15,5 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC after(async () => await tearDown(getService)); loadTestFile(require.resolve('./builtin_alert_types')); - loadTestFile(require.resolve('./transform_rule_types')); - loadTestFile(require.resolve('./ml_rule_types')); }); }