Fix functional tests

elastic · May 17, 2022 · ffeb94d · ffeb94d
1 parent eb1f391
commit ffeb94d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/x-pack/plugins/alerting/server/routes/create_rule.ts b/x-pack/plugins/alerting/server/routes/create_rule.ts
@@ -67,12 +67,14 @@ const rewriteBodyRes: RewriteResponseCase<SanitizedRule<RuleTypeParams>> = ({
   notifyWhen,
   muteAll,
   mutedInstanceIds,
+  snoozeSchedule,
   executionStatus: { lastExecutionDate, lastDuration, ...executionStatus },
   ...rest
 }) => ({
   ...rest,
   rule_type_id: alertTypeId,
   scheduled_task_id: scheduledTaskId,
+  snooze_schedule: snoozeSchedule,
   created_by: createdBy,
   updated_by: updatedBy,
   created_at: createdAt,

diff --git a/x-pack/plugins/alerting/server/routes/get_rule.ts b/x-pack/plugins/alerting/server/routes/get_rule.ts
@@ -50,8 +50,7 @@ const rewriteBodyRes: RewriteResponseCase<SanitizedRule<RuleTypeParams>> = ({
   muted_alert_ids: mutedInstanceIds,
   mute_all: muteAll,
   ...(isSnoozedUntil !== undefined ? { is_snoozed_until: isSnoozedUntil } : {}),
-  // Remove this object spread boolean check after snooze props is added to the public API
-  ...(snoozeSchedule !== undefined ? { snooze_schedule: snoozeSchedule } : {}),
+  snooze_schedule: snoozeSchedule,
   scheduled_task_id: scheduledTaskId,
   execution_status: executionStatus && {
     ...omit(executionStatus, 'lastExecutionDate', 'lastDuration'),

diff --git a/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.ts b/x-pack/plugins/alerting/server/routes/lib/rewrite_rule.ts
@@ -36,8 +36,7 @@ export const rewriteRule = ({
   mute_all: muteAll,
   muted_alert_ids: mutedInstanceIds,
   scheduled_task_id: scheduledTaskId,
-  // Remove this object spread boolean check after snooze props is added to the public API
-  ...(snoozeSchedule != null ? { snooze_schedule: snoozeSchedule } : {}),
+  snooze_schedule: snoozeSchedule,
   ...(isSnoozedUntil != null ? { is_snoozed_until: isSnoozedUntil } : {}),
   execution_status: executionStatus && {
     ...omit(executionStatus, 'lastExecutionDate', 'lastDuration'),

diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group1/tests/alerting/find.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group1/tests/alerting/find.ts
@@ -73,6 +73,7 @@ const findTestUtils = (
                 params: {},
                 created_by: 'elastic',
                 scheduled_task_id: match.scheduled_task_id,
+                snooze_schedule: match.snooze_schedule,
                 created_at: match.created_at,
                 updated_at: match.updated_at,
                 throttle: '1m',

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts
@@ -64,6 +64,7 @@ const findTestUtils = (
         created_by: null,
         api_key_owner: null,
         scheduled_task_id: match.scheduled_task_id,
+        snooze_schedule: match.snooze_schedule,
         updated_by: null,
         throttle: '1m',
         notify_when: 'onThrottleInterval',