Add latest changes from gitlab-org/gitlab@master

2 files changed, 20 insertions, 30 deletions

diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 930766c520b..7fd09cc2779 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -106,29 +106,29 @@ RSpec.describe Issues::UpdateService, :mailer do
 
       context 'when updating milestone' do
         before do
-          update_issue({ milestone: nil })
+          update_issue({ milestone_id: nil })
         end
 
         it 'updates issue milestone when passing `milestone` param' do
-          expect { update_issue({ milestone: milestone }) }
+          expect { update_issue({ milestone_id: milestone.id }) }
             .to change(issue, :milestone).to(milestone).from(nil)
         end
 
         it "triggers 'issuableMilestoneUpdated'" do
           expect(GraphqlTriggers).to receive(:issuable_milestone_updated).with(issue).and_call_original
 
-          update_issue({ milestone: milestone })
+          update_issue({ milestone_id: milestone.id })
         end
 
         context 'when milestone remains unchanged' do
           before do
-            update_issue({ title: 'abc', milestone: milestone })
+            update_issue({ title: 'abc', milestone_id: milestone.id })
           end
 
           it "does not trigger 'issuableMilestoneUpdated'" do
             expect(GraphqlTriggers).not_to receive(:issuable_milestone_updated)
 
-            update_issue({ milestone: milestone })
+            update_issue({ milestone_id: milestone.id })
           end
         end
       end
@@ -755,14 +755,14 @@ RSpec.describe Issues::UpdateService, :mailer do
         end
 
         it 'marks todos as done' do
-          update_issue(milestone: create(:milestone, project: project))
+          update_issue(milestone_id: create(:milestone, project: project).id)
 
           expect(todo.reload.done?).to eq true
         end
 
         it 'sends notifications for subscribers of changed milestone', :sidekiq_might_not_need_inline do
           perform_enqueued_jobs do
-            update_issue(milestone: create(:milestone, project: project))
+            update_issue(milestone_id: create(:milestone, project: project).id)
           end
 
           should_email(subscriber)
@@ -779,7 +779,7 @@ RSpec.describe Issues::UpdateService, :mailer do
             expect(service).to receive(:delete_cache).and_call_original
           end
 
-          update_issue(milestone: milestone)
+          update_issue(milestone_id: milestone.id)
         end
       end
 
@@ -803,7 +803,7 @@ RSpec.describe Issues::UpdateService, :mailer do
             expect(service).to receive(:delete_cache).and_call_original
           end
 
-          update_issue(milestone: new_milestone)
+          update_issue(milestone_id: new_milestone.id)
         end
       end
 
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 344d93fc5ca..e20ebf18e7c 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -196,7 +196,7 @@ RSpec.describe MergeRequests::UpdateService, :mailer, feature_category: :code_re
           expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter)
             .to receive(:track_milestone_changed_action).once.with(user: user)
 
-          opts[:milestone] = milestone
+          opts[:milestone_id] = milestone.id
 
           MergeRequests::UpdateService.new(project: project, current_user: user, params: opts).execute(merge_request)
         end
@@ -236,27 +236,17 @@ RSpec.describe MergeRequests::UpdateService, :mailer, feature_category: :code_re
       end
 
       context 'updating milestone' do
-        RSpec.shared_examples 'updates milestone' do
+        context 'with milestone_id param' do
+          let(:opts) { { milestone_id: milestone.id } }
+
           it 'sets milestone' do
             expect(@merge_request.milestone).to eq milestone
           end
         end
 
-        context 'when milestone_id param' do
-          let(:opts) { { milestone_id: milestone.id } }
-
-          it_behaves_like 'updates milestone'
-        end
-
-        context 'when milestone param' do
-          let(:opts) { { milestone: milestone } }
-
-          it_behaves_like 'updates milestone'
-        end
-
         context 'milestone counters cache reset' do
           let(:milestone_old) { create(:milestone, project: project) }
-          let(:opts) { { milestone: milestone_old } }
+          let(:opts) { { milestone_id: milestone_old.id } }
 
           it 'deletes milestone counters' do
             expect_next_instance_of(Milestones::MergeRequestsCountService, milestone_old) do |service|
@@ -267,7 +257,7 @@ RSpec.describe MergeRequests::UpdateService, :mailer, feature_category: :code_re
               expect(service).to receive(:delete_cache).and_call_original
             end
 
-            update_merge_request(milestone: milestone)
+            update_merge_request(milestone_id: milestone.id)
           end
 
           it 'deletes milestone counters when the milestone is removed' do
@@ -275,17 +265,17 @@ RSpec.describe MergeRequests::UpdateService, :mailer, feature_category: :code_re
               expect(service).to receive(:delete_cache).and_call_original
             end
 
-            update_merge_request(milestone: nil)
+            update_merge_request(milestone_id: nil)
           end
 
           it 'deletes milestone counters when the milestone was not set' do
-            update_merge_request(milestone: nil)
+            update_merge_request(milestone_id: nil)
 
             expect_next_instance_of(Milestones::MergeRequestsCountService, milestone) do |service|
               expect(service).to receive(:delete_cache).and_call_original
             end
 
-            update_merge_request(milestone: milestone)
+            update_merge_request(milestone_id: milestone.id)
           end
         end
       end
@@ -754,12 +744,12 @@ RSpec.describe MergeRequests::UpdateService, :mailer, feature_category: :code_re
             expect(service).to receive(:async_execute)
           end
 
-          update_merge_request({ milestone: create(:milestone, project: project) })
+          update_merge_request(milestone_id: create(:milestone, project: project).id)
         end
 
         it 'sends notifications for subscribers of changed milestone', :sidekiq_might_not_need_inline do
           perform_enqueued_jobs do
-            update_merge_request(milestone: create(:milestone, project: project))
+            update_merge_request(milestone_id: create(:milestone, project: project).id)
           end
 
           should_email(subscriber)