Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 1 deletions

diff --git a/spec/helpers/admin/abuse_reports_helper_spec.rb b/spec/helpers/admin/abuse_reports_helper_spec.rb
index 496b7361b6e..6a7630dc76a 100644
--- a/spec/helpers/admin/abuse_reports_helper_spec.rb
+++ b/spec/helpers/admin/abuse_reports_helper_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Admin::AbuseReportsHelper, feature_category: :insider_threat do
     subject(:data) { helper.abuse_report_data(report)[:abuse_report_data] }
 
     it 'has the expected attributes' do
-      expect(data).to include('user', 'reporter', 'report', 'actions')
+      expect(data).to include('user', 'reporter', 'report')
     end
   end
 end
diff --git a/spec/helpers/resource_events/abuse_report_events_helper_spec.rb b/spec/helpers/resource_events/abuse_report_events_helper_spec.rb
new file mode 100644
index 00000000000..f711fb6773c
--- /dev/null
+++ b/spec/helpers/resource_events/abuse_report_events_helper_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ResourceEvents::AbuseReportEventsHelper, feature_category: :instance_resiliency do
+  describe '#success_message_for_action' do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:action, :action_value) do
+      ResourceEvents::AbuseReportEvent.actions.to_a
+    end
+
+    with_them do
+      it { expect(helper.success_message_for_action(action)).not_to be_nil }
+    end
+  end
+end