Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 2 deletions

diff --git a/spec/requests/api/graphql/project/alert_management/alerts_spec.rb b/spec/requests/api/graphql/project/alert_management/alerts_spec.rb
index 6722357f76d..5d60f054bf2 100644
--- a/spec/requests/api/graphql/project/alert_management/alerts_spec.rb
+++ b/spec/requests/api/graphql/project/alert_management/alerts_spec.rb
@@ -4,10 +4,11 @@ require 'spec_helper'
 describe 'getting Alert Management Alerts' do
   include GraphqlHelpers
 
+  let_it_be(:payload) { { 'custom' => { 'alert' => 'payload' } } }
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:current_user) { create(:user) }
   let_it_be(:alert_1) { create(:alert_management_alert, :all_fields, project: project) }
-  let_it_be(:alert_2) { create(:alert_management_alert, :all_fields, project: project) }
+  let_it_be(:alert_2) { create(:alert_management_alert, :all_fields, project: project, payload: payload) }
 
   let(:fields) do
     <<~QUERY
@@ -55,13 +56,18 @@ describe 'getting Alert Management Alerts' do
         expect(first_alert).to include(
           'iid' => alert_2.iid.to_s,
           'title' => alert_2.title,
+          'description' => alert_2.description,
           'severity' => alert_2.severity.upcase,
           'status' => alert_2.status.upcase,
           'monitoringTool' => alert_2.monitoring_tool,
           'service' => alert_2.service,
+          'hosts' => alert_2.hosts,
           'eventCount' => alert_2.events,
           'startedAt' => alert_2.started_at.strftime('%Y-%m-%dT%H:%M:%SZ'),
-          'endedAt' => alert_2.ended_at.strftime('%Y-%m-%dT%H:%M:%SZ')
+          'endedAt' => alert_2.ended_at.strftime('%Y-%m-%dT%H:%M:%SZ'),
+          'details' => { 'custom.alert' => 'payload' },
+          'createdAt' => alert_2.created_at.strftime('%Y-%m-%dT%H:%M:%SZ'),
+          'updatedAt' => alert_2.updated_at.strftime('%Y-%m-%dT%H:%M:%SZ')
         )
       end