summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/update_service_spec.rb
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-09-21 02:15:02 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-09-21 02:15:02 +0530
commita57c77f6c2aa79b23f9aa59e6552ffeb514607de (patch)
tree9bc489a1539e686a9d088a7fab9d3c1bca7cbd56 /spec/services/merge_requests/update_service_spec.rb
parent68e1b5bbc076398b2886fe1fe2cc440a52d7cab1 (diff)
downloadgitlab-ce-a57c77f6c2aa79b23f9aa59e6552ffeb514607de.tar.gz
Add a spec for merge request metric caching while refreshing a merge request from a forked project.
Diffstat (limited to 'spec/services/merge_requests/update_service_spec.rb')
-rw-r--r--spec/services/merge_requests/update_service_spec.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index e9c908ede78..33db34c0f62 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -274,7 +274,8 @@ describe MergeRequests::UpdateService, services: true do
allow(service).to receive(:execute_hooks)
service.execute(merge_request)
- expect(merge_request.reload.closes_issues(user)).to match_array([first_issue, second_issue])
+ issue_ids = MergeRequestsClosingIssues.where(merge_request: merge_request).pluck(:issue_id)
+ expect(issue_ids).to match_array([first_issue.id, second_issue.id])
end
it 'removes `MergeRequestsClosingIssues` records when issues are not closed anymore' do
@@ -288,13 +289,15 @@ describe MergeRequests::UpdateService, services: true do
merge_request = MergeRequests::CreateService.new(project, user, opts).execute
- expect(merge_request.reload.closes_issues(user)).to match_array([first_issue, second_issue])
+ issue_ids = MergeRequestsClosingIssues.where(merge_request: merge_request).pluck(:issue_id)
+ expect(issue_ids).to match_array([first_issue.id, second_issue.id])
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(user)).to be_empty
+ issue_ids = MergeRequestsClosingIssues.where(merge_request: merge_request).pluck(:issue_id)
+ expect(issue_ids).to be_empty
end
end
end