kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Using project path_with_namespace in milestone's cross project references link text

Browse source
This commit is contained in:
Alejandro Rodríguez 2016-04-06 21:37:56 -03:00
parent 0f925714d0
commit 30d1d47d1d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/banzai/filter/milestone_reference_filter.rb
View file

@ -39,7 +39,7 @@ module Banzai
if context[:project] == object.project if context[:project] == object.project
super super
else else
"#{escape_once(super)} <i>in #{escape_once(object.project.name_with_namespace)}</i>". "#{escape_once(super)} <i>in #{escape_once(object.project.path_with_namespace)}</i>".
html_safe html_safe
end end
end end

6
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
View file

@ -160,7 +160,7 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
describe 'cross project milestone references' do describe 'cross project milestone references' do
let(:another_project) { create(:empty_project, :public) } let(:another_project) { create(:empty_project, :public) }
let(:project_name) { another_project.name_with_namespace } let(:project_path) { another_project.path_with_namespace }
let(:milestone) { create(:milestone, project: another_project) } let(:milestone) { create(:milestone, project: another_project) }
let(:reference) { milestone.to_reference(project) } let(:reference) { milestone.to_reference(project) }
@ -174,13 +174,13 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
end end
it 'contains cross project content' do it 'contains cross project content' do
expect(result.css('a').first.text).to eq "#{milestone.name} in #{project_name}" expect(result.css('a').first.text).to eq "#{milestone.name} in #{project_path}"
end end
it 'escapes the name attribute' do it 'escapes the name attribute' do
allow_any_instance_of(Milestone).to receive(:title).and_return(%{"></a>whatever<a title="}) allow_any_instance_of(Milestone).to receive(:title).and_return(%{"></a>whatever<a title="})
doc = reference_filter("See #{reference}") doc = reference_filter("See #{reference}")
expect(doc.css('a').first.text).to eq "#{milestone.name} in #{project_name}" expect(doc.css('a').first.text).to eq "#{milestone.name} in #{project_path}"
end end
end end
end end