diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index b2c26874552aac33f512de2021bc0450fb19e0bb..9ca60e2790003dc2c2b1220a026ebf38277c177b 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -252,7 +252,7 @@ describe MergeRequest, models: true do end end - describe 'detection of issues' do + describe '#closes_issues' do let(:issue0) { create :issue, project: subject.project } let(:issue1) { create :issue, project: subject.project } @@ -265,38 +265,28 @@ describe MergeRequest, models: true do allow(subject).to receive(:commits).and_return([commit0, commit1, commit2]) end - describe 'detection of issues to be closed' do - it 'accesses the set of issues that will be closed on acceptance' do - allow(subject.project).to receive(:default_branch). - and_return(subject.target_branch) - - closed = subject.closes_issues - - expect(closed).to include(issue0, issue1) - end - - it 'only lists issues as to be closed if it targets the default branch' do - allow(subject.project).to receive(:default_branch).and_return('master') - subject.target_branch = 'something-else' - - expect(subject.closes_issues).to be_empty - end + it 'accesses the set of issues that will be closed on acceptance' do + allow(subject.project).to receive(:default_branch). + and_return(subject.target_branch) - it 'detects issues mentioned in the description' do - issue2 = create(:issue, project: subject.project) + closed = subject.closes_issues - subject.description = "Closes #{issue2.to_reference}" + expect(closed).to include(issue0, issue1) + end - allow(subject.project).to receive(:default_branch). - and_return(subject.target_branch) + it 'only lists issues as to be closed if it targets the default branch' do + allow(subject.project).to receive(:default_branch).and_return('master') + subject.target_branch = 'something-else' - expect(subject.closes_issues).to include(issue2) - end + expect(subject.closes_issues).to be_empty end + 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) + subject.project.team << [subject.author, :developer] subject.description = "Is related to #{mentioned_issue.to_reference}" allow(subject.project).to receive(:default_branch).