Use the `IssuableBaseService` lifecycle hooks to cache `MergeRequestsClosingIssues`

- Instead of overriding `create` and `update` in `MergeRequests::BaseService`
- Get all merge request service specs passing

3 files changed, 5 insertions, 5 deletions

diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index ff6bad6aaba..d400655617a 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -108,7 +108,7 @@ describe MergeRequests::CreateService, services: true do
         allow(service).to receive(:execute_hooks)
         merge_request = service.execute
 
-        expect(merge_request.reload.closes_issues).to match_array([first_issue, second_issue])
+        expect(merge_request.reload.closes_issues(user)).to match_array([first_issue, second_issue])
       end
     end
   end
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 22cb122526c..dac4ba060c9 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -200,7 +200,7 @@ describe MergeRequests::RefreshService, services: true do
         allow(refresh_service).to receive(:execute_hooks)
         refresh_service.execute(@oldrev, @newrev, 'refs/heads/feature')
 
-        expect(merge_request.reload.closes_issues).to eq([issue])
+        expect(merge_request.reload.closes_issues(@user)).to eq([issue])
       end
     end
 
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index 68dd0382a3d..e9c908ede78 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -274,7 +274,7 @@ describe MergeRequests::UpdateService, services: true do
         allow(service).to receive(:execute_hooks)
         service.execute(merge_request)
 
-        expect(merge_request.reload.closes_issues).to match_array([first_issue, second_issue])
+        expect(merge_request.reload.closes_issues(user)).to match_array([first_issue, second_issue])
       end
 
       it 'removes `MergeRequestsClosingIssues` records when issues are not closed anymore' do
@@ -288,13 +288,13 @@ describe MergeRequests::UpdateService, services: true do
 
         merge_request = MergeRequests::CreateService.new(project, user, opts).execute
 
-        expect(merge_request.reload.closes_issues).to match_array([first_issue, second_issue])
+        expect(merge_request.reload.closes_issues(user)).to match_array([first_issue, second_issue])
 
         service = described_class.new(project, user, description: "not closing any issues")
         allow(service).to receive(:execute_hooks)
         service.execute(merge_request.reload)
 
-        expect(merge_request.reload.closes_issues).to be_empty
+        expect(merge_request.reload.closes_issues(user)).to be_empty
       end
     end
   end