diff options
author | Robert Speicher <robert@gitlab.com> | 2016-03-10 04:06:52 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-03-10 04:06:52 +0000 |
commit | 491ac7ce4b79c901e23799d2062f9f013f08c6c3 (patch) | |
tree | cb41e1a5f2c1aaa31d6ed04714c82be9d5e461e9 /spec | |
parent | 60d0a20b3a0077df6404ad9ef02f1a2963ed4c02 (diff) | |
parent | e32726c63661a9f1ea0578da3b029943bae4df3b (diff) | |
download | gitlab-ce-491ac7ce4b79c901e23799d2062f9f013f08c6c3.tar.gz |
Merge branch 'issue-referenced-merge-requests-specs' into 'master'
Added specs for Issue#referenced_merge_requests
Added these while looking into https://gitlab.com/gitlab-org/gitlab-ce/issues/13651.
See merge request !3125
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/issue_spec.rb | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index 52271c7c8c6..7f44ca2f7db 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -105,6 +105,31 @@ describe Issue, models: true do end end + describe '#referenced_merge_requests' do + it 'returns the referenced merge requests' do + project = create(:project, :public) + + mr1 = create(:merge_request, + source_project: project, + source_branch: 'master', + target_branch: 'feature') + + mr2 = create(:merge_request, + source_project: project, + source_branch: 'feature', + target_branch: 'master') + + issue = create(:issue, description: mr1.to_reference, project: project) + + create(:note_on_issue, + noteable: issue, + note: mr2.to_reference, + project_id: project.id) + + expect(issue.referenced_merge_requests).to eq([mr1, mr2]) + end + end + it_behaves_like 'an editable mentionable' do subject { create(:issue) } |