Add latest changes from gitlab-org/gitlab@masterHEADmaster

1 files changed, 6 insertions, 6 deletions

diff --git a/spec/requests/abuse_reports_controller_spec.rb b/spec/requests/abuse_reports_controller_spec.rb
index 4b81394aea3..69b0fb41330 100644
--- a/spec/requests/abuse_reports_controller_spec.rb
+++ b/spec/requests/abuse_reports_controller_spec.rb
@@ -44,14 +44,14 @@ RSpec.describe AbuseReportsController, feature_category: :insider_threat do
       end
     end
 
-    context 'when the user has already been blocked' do
+    context 'when the user has already been banned' do
       it 'redirects the reporter to the user\'s profile' do
-        user.block
+        user.ban
 
         get new_abuse_report_path(user_id: user.id)
 
         expect(response).to redirect_to user
-        expect(flash[:alert]).to eq(_('Cannot create the abuse report. This user has been blocked.'))
+        expect(flash[:alert]).to eq(_('Cannot create the abuse report. This user has been banned.'))
       end
     end
   end
@@ -127,16 +127,16 @@ RSpec.describe AbuseReportsController, feature_category: :insider_threat do
       end
     end
 
-    context 'when the user has already been blocked' do
+    context 'when the user has already been banned' do
       let(:request_params) { { user_id: user.id, abuse_report: { category: abuse_category } } }
 
       it 'redirects the reporter to the user\'s profile' do
-        user.block
+        user.ban
 
         subject
 
         expect(response).to redirect_to user
-        expect(flash[:alert]).to eq(_('Cannot create the abuse report. This user has been blocked.'))
+        expect(flash[:alert]).to eq(_('Cannot create the abuse report. This user has been banned.'))
       end
     end
   end