github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:11:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Correct logic so hashtags are properly ignored in links

Browse Source
This commit is contained in:
Sam
2017-06-29 12:48:04 -04:00
parent 6ff7bf7505
commit c6b83f4714
2 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spec/components/pretty_text_spec.rb
View File

@ -473,7 +473,14 @@ HTML
describe "tag and category links" do
it "produces tag links" do
Fabricate(:topic, {tags: [Fabricate(:tag, name: 'known')]})
expect(PrettyText.cook(" #unknown::tag #known::tag")).to match_html("<p> <span class=\"hashtag\">#unknown::tag</span> <a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a></p>")
cooked = PrettyText.cook(" #unknown::tag #known::tag")
html = <<~HTML
<p> <span class=\"hashtag\">#unknown::tag</span> <a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a></p>
HTML
expect(cooked).to match_html(html)
end
# TODO does it make sense to generate hashtags for tags that are missing in action?
@ -527,7 +534,33 @@ HTML
it "produces tag links" do
Fabricate(:topic, {tags: [Fabricate(:tag, name: 'known')]})
expect(PrettyText.cook("x #unknown::tag #known::tag")).to match_html("<p>x <span class=\"hashtag\">#unknown::tag</span> <a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a></p>")
cooked = PrettyText.cook(" #unknown::tag #known::tag")
html = <<~HTML
<p><span class=\"hashtag\">#unknown::tag</span> <a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a></p>
HTML
expect(cooked).to eq(html.strip)
cooked = PrettyText.cook("[`a` #known::tag here](http://somesite.com)")
html = <<~HTML
<p><a href="http://somesite.com" rel="nofollow noopener"><code>a</code> #known::tag here</a></p>
HTML
expect(cooked).to eq(html.strip)
cooked = PrettyText.cook("<a href='http://somesite.com'>`a` #known::tag here</a>")
expect(cooked).to eq(html.strip)
cooked = PrettyText.cook("<A href='/a'>test</A> #known::tag")
html = <<~HTML
<p><a href="/a">test</a> <a class="hashtag" href="http://test.localhost/tags/known">#<span>known</span></a></p>
HTML
expect(cooked).to eq(html.strip)
end
it "can handle mixed lists" do
@ -680,6 +713,7 @@ HTML
end
it "supports tables" do
markdown = <<~MD
| Tables | Are | Cool |
| ------------- |:-------------:| -----:|