diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-21 14:07:04 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-21 14:07:04 +0300 |
commit | 60adbef4afb864bf5a19ce6e39dd8fe02ac99c0a (patch) | |
tree | 2d202dc58d13a6b65952ca20f1abfffb344c65c4 /spec/models | |
parent | e647af363706d181557e7652cacc19cd7c54dd59 (diff) | |
parent | 493367108eef14c8517c6d023ec46267c1e706cf (diff) |
Merge branch '14192-issues-closed-by-merge-requests-using-metrics-data' into 'master'
Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method
See merge request !6996
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/issue_spec.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index 3b8b743af2d..60d30eb7418 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -100,11 +100,17 @@ describe Issue, models: true do end it 'returns the merge request to close this issue' do - allow(mr).to receive(:closes_issue?).with(issue).and_return(true) + mr expect(issue.closed_by_merge_requests).to eq([mr]) end + it "returns an empty array when the merge request is closed already" do + closed_mr + + expect(issue.closed_by_merge_requests).to eq([]) + end + it "returns an empty array when the current issue is closed already" do expect(closed_issue.closed_by_merge_requests).to eq([]) end |