1 files changed, 41 insertions, 28 deletions

diff --git a/spec/graphql/graphql_triggers_spec.rb b/spec/graphql/graphql_triggers_spec.rb
index a4a643582f5..a54cb8a7988 100644
--- a/spec/graphql/graphql_triggers_spec.rb
+++ b/spec/graphql/graphql_triggers_spec.rb
@@ -3,76 +3,89 @@
 require 'spec_helper'
 
 RSpec.describe GraphqlTriggers do
+  let_it_be(:issuable, refind: true) { create(:work_item) }
+
   describe '.issuable_assignees_updated' do
-    it 'triggers the issuableAssigneesUpdated subscription' do
-      assignees = create_list(:user, 2)
-      issue = create(:issue, assignees: assignees)
+    let(:assignees) { create_list(:user, 2) }
 
+    before do
+      issuable.update!(assignees: assignees)
+    end
+
+    it 'triggers the issuableAssigneesUpdated subscription' do
       expect(GitlabSchema.subscriptions).to receive(:trigger).with(
         'issuableAssigneesUpdated',
-        { issuable_id: issue.to_gid },
-        issue
+        { issuable_id: issuable.to_gid },
+        issuable
       )
 
-      GraphqlTriggers.issuable_assignees_updated(issue)
+      GraphqlTriggers.issuable_assignees_updated(issuable)
     end
   end
 
   describe '.issuable_title_updated' do
     it 'triggers the issuableTitleUpdated subscription' do
-      work_item = create(:work_item)
-
       expect(GitlabSchema.subscriptions).to receive(:trigger).with(
         'issuableTitleUpdated',
-        { issuable_id: work_item.to_gid },
-        work_item
+        { issuable_id: issuable.to_gid },
+        issuable
       ).and_call_original
 
-      GraphqlTriggers.issuable_title_updated(work_item)
+      GraphqlTriggers.issuable_title_updated(issuable)
     end
   end
 
   describe '.issuable_description_updated' do
     it 'triggers the issuableDescriptionUpdated subscription' do
-      work_item = create(:work_item)
-
       expect(GitlabSchema.subscriptions).to receive(:trigger).with(
         'issuableDescriptionUpdated',
-        { issuable_id: work_item.to_gid },
-        work_item
+        { issuable_id: issuable.to_gid },
+        issuable
       ).and_call_original
 
-      GraphqlTriggers.issuable_description_updated(work_item)
+      GraphqlTriggers.issuable_description_updated(issuable)
     end
   end
 
   describe '.issuable_labels_updated' do
-    it 'triggers the issuableLabelsUpdated subscription' do
-      project = create(:project)
-      labels = create_list(:label, 3, project: project)
-      issue = create(:issue, labels: labels)
+    let(:labels) { create_list(:label, 3, project: create(:project)) }
+
+    before do
+      issuable.update!(labels: labels)
+    end
 
+    it 'triggers the issuableLabelsUpdated subscription' do
       expect(GitlabSchema.subscriptions).to receive(:trigger).with(
         'issuableLabelsUpdated',
-        { issuable_id: issue.to_gid },
-        issue
+        { issuable_id: issuable.to_gid },
+        issuable
       )
 
-      GraphqlTriggers.issuable_labels_updated(issue)
+      GraphqlTriggers.issuable_labels_updated(issuable)
     end
   end
 
   describe '.issuable_dates_updated' do
     it 'triggers the issuableDatesUpdated subscription' do
-      work_item = create(:work_item)
-
       expect(GitlabSchema.subscriptions).to receive(:trigger).with(
         'issuableDatesUpdated',
-        { issuable_id: work_item.to_gid },
-        work_item
+        { issuable_id: issuable.to_gid },
+        issuable
+      ).and_call_original
+
+      GraphqlTriggers.issuable_dates_updated(issuable)
+    end
+  end
+
+  describe '.issuable_milestone_updated' do
+    it 'triggers the issuableMilestoneUpdated subscription' do
+      expect(GitlabSchema.subscriptions).to receive(:trigger).with(
+        'issuableMilestoneUpdated',
+        { issuable_id: issuable.to_gid },
+        issuable
       ).and_call_original
 
-      GraphqlTriggers.issuable_dates_updated(work_item)
+      GraphqlTriggers.issuable_milestone_updated(issuable)
     end
   end