Add latest changes from gitlab-org/gitlab@13-3-stable-ee

2 files changed, 6 insertions, 4 deletions

diff --git a/spec/lib/gitlab/alert_management/alert_params_spec.rb b/spec/lib/gitlab/alert_management/alert_params_spec.rb
index 393838ab042..1fe27365c83 100644
--- a/spec/lib/gitlab/alert_management/alert_params_spec.rb
+++ b/spec/lib/gitlab/alert_management/alert_params_spec.rb
@@ -18,6 +18,7 @@ RSpec.describe Gitlab::AlertManagement::AlertParams do
         'some' => { 'extra' => { 'payload' => 'here' } }
       }
     end
+
     let(:payload) { default_payload }
 
     subject { described_class.from_generic_alert(project: project, payload: payload) }
@@ -75,6 +76,7 @@ RSpec.describe Gitlab::AlertManagement::AlertParams do
         'fingerprint' => 'b6ac4d42057c43c1'
       }
     end
+
     let(:parsed_alert) { Gitlab::Alerting::Alert.new(project: project, payload: payload) }
 
     subject { described_class.from_prometheus_alert(project: project, parsed_alert: parsed_alert) }
diff --git a/spec/lib/gitlab/alert_management/alert_status_counts_spec.rb b/spec/lib/gitlab/alert_management/alert_status_counts_spec.rb
index 4e471a8eac0..a2b8f0aa8d4 100644
--- a/spec/lib/gitlab/alert_management/alert_status_counts_spec.rb
+++ b/spec/lib/gitlab/alert_management/alert_status_counts_spec.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 RSpec.describe Gitlab::AlertManagement::AlertStatusCounts do
   let_it_be(:current_user) { create(:user) }
   let_it_be(:project) { create(:project) }
-  let_it_be(:alert_1) { create(:alert_management_alert, :resolved, project: project) }
-  let_it_be(:alert_2) { create(:alert_management_alert, :ignored, project: project) }
-  let_it_be(:alert_3) { create(:alert_management_alert) }
+  let_it_be(:alert_resolved) { create(:alert_management_alert, :resolved, project: project) }
+  let_it_be(:alert_ignored) { create(:alert_management_alert, :ignored, project: project) }
+  let_it_be(:alert_triggered) { create(:alert_management_alert) }
   let(:params) { {} }
 
   describe '#execute' do
@@ -52,7 +52,7 @@ RSpec.describe Gitlab::AlertManagement::AlertStatusCounts do
       end
 
       context 'when search param is included' do
-        let(:params) { { search: alert_1.title } }
+        let(:params) { { search: alert_resolved.title } }
 
         it 'returns the correct countss' do
           expect(counts.open).to eq(0)