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

1 files changed, 7 insertions, 7 deletions

diff --git a/spec/finders/alert_management/alerts_finder_spec.rb b/spec/finders/alert_management/alerts_finder_spec.rb
index c6d2d0ad4ef..5920d579ba6 100644
--- a/spec/finders/alert_management/alerts_finder_spec.rb
+++ b/spec/finders/alert_management/alerts_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AlertManagement::AlertsFinder, '#execute' do
+RSpec.describe AlertManagement::AlertsFinder, '#execute' do
   let_it_be(:current_user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:alert_1) { create(:alert_management_alert, :all_fields, :resolved, project: project, ended_at: 1.year.ago, events: 2, severity: :high) }
@@ -100,13 +100,13 @@ describe AlertManagement::AlertsFinder, '#execute' do
 
         context 'when sorting by start time' do
           context 'sorts alerts ascending' do
-            let(:params) { { sort: 'start_time_asc' } }
+            let(:params) { { sort: 'started_at_asc' } }
 
             it { is_expected.to eq [alert_1, alert_2] }
           end
 
           context 'sorts alerts descending' do
-            let(:params) { { sort: 'start_time_desc' } }
+            let(:params) { { sort: 'started_at_desc' } }
 
             it { is_expected.to eq [alert_2, alert_1] }
           end
@@ -114,13 +114,13 @@ describe AlertManagement::AlertsFinder, '#execute' do
 
         context 'when sorting by end time' do
           context 'sorts alerts ascending' do
-            let(:params) { { sort: 'end_time_asc' } }
+            let(:params) { { sort: 'ended_at_asc' } }
 
             it { is_expected.to eq [alert_1, alert_2] }
           end
 
           context 'sorts alerts descending' do
-            let(:params) { { sort: 'end_time_desc' } }
+            let(:params) { { sort: 'ended_at_desc' } }
 
             it { is_expected.to eq [alert_2, alert_1] }
           end
@@ -131,13 +131,13 @@ describe AlertManagement::AlertsFinder, '#execute' do
           let_it_be(:alert_count_3) { create(:alert_management_alert, project: project, events: 3) }
 
           context 'sorts alerts ascending' do
-            let(:params) { { sort: 'events_count_asc' } }
+            let(:params) { { sort: 'event_count_asc' } }
 
             it { is_expected.to eq [alert_2, alert_1, alert_count_3, alert_count_6] }
           end
 
           context 'sorts alerts descending' do
-            let(:params) { { sort: 'events_count_desc' } }
+            let(:params) { { sort: 'event_count_desc' } }
 
             it { is_expected.to eq [alert_count_6, alert_count_3, alert_1, alert_2] }
           end