Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 5 deletions

diff --git a/spec/workers/integrations/group_mention_worker_spec.rb b/spec/workers/integrations/group_mention_worker_spec.rb
index 111e3f5a107..e79b654184d 100644
--- a/spec/workers/integrations/group_mention_worker_spec.rb
+++ b/spec/workers/integrations/group_mention_worker_spec.rb
@@ -37,12 +37,10 @@ RSpec.describe Integrations::GroupMentionWorker, :clean_gitlab_redis_shared_stat
 
     context 'when mentionable_type is not supported' do
       let(:args) do
-        {
+        super().merge(
           mentionable_type: 'Unsupported',
-          mentionable_id: 23,
-          hook_data: {},
-          is_confidential: false
-        }
+          mentionable_id: 23
+        )
       end
 
       it 'does not execute the service' do
@@ -61,5 +59,15 @@ RSpec.describe Integrations::GroupMentionWorker, :clean_gitlab_redis_shared_stat
         worker.perform(args)
       end
     end
+
+    context 'when mentionable cannot be found' do
+      let(:args) { super().merge(mentionable_id: non_existing_record_id) }
+
+      it 'does not execute the service' do
+        expect(service_class).not_to receive(:new)
+
+        worker.perform(args)
+      end
+    end
   end
 end