Commit 0175769a authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'fix-markdown-truncation-removing-links' into 'master'

Fix cases where Markdown did not render links in activity feed

HTML would be stripped in `truncate_if_block` when a comment had multiple lines
and the first wasn't long enough to be truncated. The use of `node.content` would
strip all HTML tags. Using `node.inner_html` retains these tags and puts the
"..." in between paragraph tags.

Closes #2586

See merge request !1401
......@@ -5,6 +5,7 @@ v 8.1.0 (unreleased)
- Automatically enable CI when push .gitlab-ci.yml file to repository
v 8.0.1
- Fix cases where Markdown did not render links in activity feed (Stan Hu)
- Improve CI migration procedure and documentation
- Make commit graphs responsive to window width changes (Stan Hu)
......
......@@ -165,7 +165,7 @@ def truncate_visible(text, max_chars)
# and return true. Otherwise return false.
def truncate_if_block(node, truncated)
if node.element? && node.description.block? && !truncated
node.content = "#{node.content}..." if node.next_sibling
node.inner_html = "#{node.inner_html}..." if node.next_sibling
true
else
truncated
......
......@@ -146,4 +146,24 @@
expect(random_markdown_tip).to eq 'Random tip'
end
end
describe '#first_line_in_markdown' do
let(:text) { "@#{user.username}, can you look at this?\nHello world\n"}
it 'truncates Markdown properly' do
actual = first_line_in_markdown(text, 100, project: project)
doc = Nokogiri::HTML.parse(actual)
# Make sure we didn't create invalid markup
expect(doc.errors).to be_empty
# Leading user link
expect(doc.css('a').length).to eq(1)
expect(doc.css('a')[0].attr('href')).to eq user_path(user)
expect(doc.css('a')[0].text).to eq "@#{user.username}"
expect(doc.content).to eq "@#{user.username}, can you look at this?..."
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment