diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 15:09:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 15:09:08 +0300 |
commit | 7cc6872401eb487ed20dbb9d455f8bb9c97d9e39 (patch) | |
tree | 63f6ed5d4e6c5cec31c43363626d9f5b178eddf8 /spec/lib/banzai | |
parent | 46b10c0fc884400941c17e2777b242ac54d111e5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/banzai')
4 files changed, 10 insertions, 8 deletions
diff --git a/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb b/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb index a82b890be42..5cfb0e6e6f7 100644 --- a/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/commit_range_reference_filter_spec.rb @@ -229,10 +229,10 @@ describe Banzai::Filter::CommitRangeReferenceFilter do end it 'ignores invalid commit IDs on the referenced project' do - exp = act = "Fixed #{project2.to_reference}@#{commit1.id.reverse}...#{commit2.id}" + exp = act = "Fixed #{project2.to_reference_base}@#{commit1.id.reverse}...#{commit2.id}" expect(reference_filter(act).to_html).to eq exp - exp = act = "Fixed #{project2.to_reference}@#{commit1.id}...#{commit2.id.reverse}" + exp = act = "Fixed #{project2.to_reference_base}@#{commit1.id}...#{commit2.id.reverse}" expect(reference_filter(act).to_html).to eq exp end end diff --git a/spec/lib/banzai/filter/label_reference_filter_spec.rb b/spec/lib/banzai/filter/label_reference_filter_spec.rb index 66af26bc51c..82df5064896 100644 --- a/spec/lib/banzai/filter/label_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/label_reference_filter_spec.rb @@ -369,7 +369,7 @@ describe Banzai::Filter::LabelReferenceFilter do end context 'with project reference' do - let(:reference) { "#{project.to_reference}#{group_label.to_reference(format: :name)}" } + let(:reference) { "#{project.to_reference_base}#{group_label.to_reference(format: :name)}" } it 'links to a valid reference' do doc = reference_filter("See #{reference}", project: project) @@ -385,7 +385,7 @@ describe Banzai::Filter::LabelReferenceFilter do end it 'ignores invalid label names' do - exp = act = %(Label #{project.to_reference}#{Label.reference_prefix}"#{group_label.name.reverse}") + exp = act = %(Label #{project.to_reference_base}#{Label.reference_prefix}"#{group_label.name.reverse}") expect(reference_filter(act).to_html).to eq exp end diff --git a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb index 2fe8c9074df..0c8413adcba 100644 --- a/spec/lib/banzai/filter/milestone_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/milestone_reference_filter_spec.rb @@ -367,15 +367,17 @@ describe Banzai::Filter::MilestoneReferenceFilter do expect(doc.css('a').first.text).to eq(urls.milestone_url(milestone)) end - it 'does not support cross-project references' do + it 'does not support cross-project references', :aggregate_failures do another_group = create(:group) another_project = create(:project, :public, group: group) - project_reference = another_project.to_reference(project) + project_reference = another_project.to_reference_base(project) + input_text = "See #{project_reference}#{reference}" milestone.update!(group: another_group) - doc = reference_filter("See #{project_reference}#{reference}") + doc = reference_filter(input_text) + expect(input_text).to match(Milestone.reference_pattern) expect(doc.css('a')).to be_empty end diff --git a/spec/lib/banzai/filter/project_reference_filter_spec.rb b/spec/lib/banzai/filter/project_reference_filter_spec.rb index d0b4542d503..a054b79ec03 100644 --- a/spec/lib/banzai/filter/project_reference_filter_spec.rb +++ b/spec/lib/banzai/filter/project_reference_filter_spec.rb @@ -10,7 +10,7 @@ describe Banzai::Filter::ProjectReferenceFilter do end def get_reference(project) - project.to_reference_with_postfix + project.to_reference end let(:project) { create(:project, :public) } |