diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-22 21:40:17 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-22 21:40:17 +0000 |
| commit | 69479d3615df62c0c6c22fe20263413505b2ef8f (patch) | |
| tree | 08530ceb3e728e6b0117ead6d35e431d0ccf0a75 /spec | |
| parent | 9487dd3a40b99c9e42a46885ecc60ebedc34f637 (diff) | |
| parent | ceeba75c7650cebc582fc3c04c42d2665a47e511 (diff) | |
| download | gitlab-ce-69479d3615df62c0c6c22fe20263413505b2ef8f.tar.gz | |
Merge branch 'fix-external-issue-links' into 'master'
Handle external issues in IssueReferenceFilter
Handling of external issues was broken when I refactored
`IssueReferenceFilter` to use fewer SQL queries.
Fixes #18827
See merge request !4789
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/banzai/filter/issue_reference_filter_spec.rb | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/spec/lib/banzai/filter/issue_reference_filter_spec.rb b/spec/lib/banzai/filter/issue_reference_filter_spec.rb index 5b63c946114..8d6ce114aa9 100644 --- a/spec/lib/banzai/filter/issue_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/issue_reference_filter_spec.rb @@ -198,4 +198,40 @@ describe Banzai::Filter::IssueReferenceFilter, lib: true do expect(doc.to_html).to match(/\(<a.+>Reference<\/a>\.\)/) end end + + describe '#issues_per_Project' do + context 'using an internal issue tracker' do + it 'returns a Hash containing the issues per project' do + doc = Nokogiri::HTML.fragment('') + filter = described_class.new(doc, project: project) + + expect(filter).to receive(:projects_per_reference). + and_return({ project.path_with_namespace => project }) + + expect(filter).to receive(:references_per_project). + and_return({ project.path_with_namespace => Set.new([issue.iid]) }) + + expect(filter.issues_per_project). + to eq({ project => { issue.iid => issue } }) + end + end + + context 'using an external issue tracker' do + it 'returns a Hash containing the issues per project' do + doc = Nokogiri::HTML.fragment('') + filter = described_class.new(doc, project: project) + + expect(project).to receive(:default_issues_tracker?).and_return(false) + + expect(filter).to receive(:projects_per_reference). + and_return({ project.path_with_namespace => project }) + + expect(filter).to receive(:references_per_project). + and_return({ project.path_with_namespace => Set.new([1]) }) + + expect(filter.issues_per_project[project][1]). + to be_an_instance_of(ExternalIssue) + end + end + end end |
