diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-29 01:48:06 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-29 01:48:06 +0000 |
commit | ce6de94652239395b2cb31984b51879555323d41 (patch) | |
tree | bef7af9a84238df5cbb0ab07fdf6064e71a8c86b /spec | |
parent | c595b41881896e0987d66d9be8b307cfed97fd7d (diff) | |
parent | 1b647486570d61d03eebdf30651136a8d53d6e40 (diff) | |
download | gitlab-ce-ce6de94652239395b2cb31984b51879555323d41.tar.gz |
Merge branch 'mentioned-but-not-closed-issues-messages' into 'master'
Fix unclear closing issue behaviour on Merge Request show page
Closes #26152
See merge request !8345
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/merge_request_spec.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 5da00a8636a..646e6c6dbb3 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -283,12 +283,16 @@ describe MergeRequest, models: true do end describe '#issues_mentioned_but_not_closing' do - it 'detects issues mentioned in description but not closed' do - mentioned_issue = create(:issue, project: subject.project) + let(:closing_issue) { create :issue, project: subject.project } + let(:mentioned_issue) { create :issue, project: subject.project } + + let(:commit) { double('commit', safe_message: "Fixes #{closing_issue.to_reference}") } + it 'detects issues mentioned in description but not closed' do subject.project.team << [subject.author, :developer] - subject.description = "Is related to #{mentioned_issue.to_reference}" + subject.description = "Is related to #{mentioned_issue.to_reference} and #{closing_issue.to_reference}" + allow(subject).to receive(:commits).and_return([commit]) allow(subject.project).to receive(:default_branch). and_return(subject.target_branch) |