mirror of
https://github.com/discourse/discourse.git
synced 2024-11-30 07:13:44 +08:00
9e241e82e9
https://meta.discourse.org/t/markdown-preview-and-result-differ/263878 The result of this markdown had different results in the composer preview and the post. This is solved by updating Loofah to the latest version and using html5 fragments like our user had reported. While the change was only needed in cooked_post_processor.rb for this fix, other areas also had to be updated due to various side effects.
248 lines
11 KiB
Ruby
248 lines
11 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
describe "chat bbcode quoting in posts" do
|
|
fab!(:post) { Fabricate(:post) }
|
|
|
|
before { SiteSetting.chat_enabled = true }
|
|
|
|
it "can render the simplest version" do
|
|
post.update!(
|
|
raw: "[chat quote=\"martin;2321;2022-01-25T05:40:39Z\"]\nThis is a chat message.\n[/chat]",
|
|
)
|
|
expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
|
|
<div class="chat-transcript" data-message-id="2321" data-username="martin" data-datetime="2022-01-25T05:40:39Z">
|
|
<div class="chat-transcript-user">
|
|
<div class="chat-transcript-user-avatar"></div>
|
|
<div class="chat-transcript-username">
|
|
martin</div>
|
|
<div class="chat-transcript-datetime">
|
|
<span title="2022-01-25T05:40:39Z"></span></div>
|
|
</div>
|
|
<div class="chat-transcript-messages">
|
|
<p>This is a chat message.</p></div>
|
|
</div>
|
|
COOKED
|
|
end
|
|
|
|
it "renders the channel name if provided with multiQuote" do
|
|
post.update!(
|
|
raw:
|
|
"[chat quote=\"martin;2321;2022-01-25T05:40:39Z\" channel=\"Cool Cats Club\" channelId=\"1234\" multiQuote=\"true\"]\nThis is a chat message.\n[/chat]",
|
|
)
|
|
expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
|
|
<div class="chat-transcript" data-message-id="2321" data-username="martin" data-datetime="2022-01-25T05:40:39Z" data-channel-name="Cool Cats Club" data-channel-id="1234">
|
|
<div class="chat-transcript-meta">
|
|
Originally sent in <a href="/chat/c/-/1234">Cool Cats Club</a></div>
|
|
<div class="chat-transcript-user">
|
|
<div class="chat-transcript-user-avatar"></div>
|
|
<div class="chat-transcript-username">
|
|
martin</div>
|
|
<div class="chat-transcript-datetime">
|
|
<a href="/chat/c/-/1234/2321" title="2022-01-25T05:40:39Z"></a></div>
|
|
</div>
|
|
<div class="chat-transcript-messages">
|
|
<p>This is a chat message.</p></div>
|
|
</div>
|
|
COOKED
|
|
end
|
|
|
|
it "renders the channel name if provided without multiQuote" do
|
|
post.update!(
|
|
raw:
|
|
"[chat quote=\"martin;2321;2022-01-25T05:40:39Z\" channel=\"Cool Cats Club\" channelId=\"1234\"]\nThis is a chat message.\n[/chat]",
|
|
)
|
|
expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
|
|
<div class="chat-transcript" data-message-id="2321" data-username="martin" data-datetime="2022-01-25T05:40:39Z" data-channel-name="Cool Cats Club" data-channel-id="1234">
|
|
<div class="chat-transcript-user">
|
|
<div class="chat-transcript-user-avatar"></div>
|
|
<div class="chat-transcript-username">
|
|
martin</div>
|
|
<div class="chat-transcript-datetime">
|
|
<a href="/chat/c/-/1234/2321" title="2022-01-25T05:40:39Z"></a></div>
|
|
<a class="chat-transcript-channel" href="/chat/c/-/1234">
|
|
#Cool Cats Club</a></div>
|
|
<div class="chat-transcript-messages">
|
|
<p>This is a chat message.</p></div>
|
|
</div>
|
|
COOKED
|
|
end
|
|
|
|
it "renders with the chained attribute for more compact quotes" do
|
|
post.update!(
|
|
raw:
|
|
"[chat quote=\"martin;2321;2022-01-25T05:40:39Z\" channel=\"Cool Cats Club\" channelId=\"1234\" chained=\"true\"]\nThis is a chat message.\n[/chat]",
|
|
)
|
|
expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
|
|
<div class="chat-transcript chat-transcript-chained" data-message-id="2321" data-username="martin" data-datetime="2022-01-25T05:40:39Z" data-channel-name="Cool Cats Club" data-channel-id="1234">
|
|
<div class="chat-transcript-user">
|
|
<div class="chat-transcript-user-avatar"></div>
|
|
<div class="chat-transcript-username">
|
|
martin</div>
|
|
<div class="chat-transcript-datetime">
|
|
<a href="/chat/c/-/1234/2321" title="2022-01-25T05:40:39Z"></a></div>
|
|
<a class="chat-transcript-channel" href="/chat/c/-/1234">
|
|
#Cool Cats Club</a></div>
|
|
<div class="chat-transcript-messages">
|
|
<p>This is a chat message.</p></div>
|
|
</div>
|
|
COOKED
|
|
end
|
|
|
|
it "renders with the noLink attribute to remove the links to the individual messages from the datetimes" do
|
|
post.update!(
|
|
raw:
|
|
"[chat quote=\"martin;2321;2022-01-25T05:40:39Z\" channel=\"Cool Cats Club\" channelId=\"1234\" multiQuote=\"true\" noLink=\"true\"]\nThis is a chat message.\n[/chat]",
|
|
)
|
|
expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
|
|
<div class="chat-transcript" data-message-id="2321" data-username="martin" data-datetime="2022-01-25T05:40:39Z" data-channel-name="Cool Cats Club" data-channel-id="1234">
|
|
<div class="chat-transcript-meta">
|
|
Originally sent in <a href="/chat/c/-/1234">Cool Cats Club</a></div>
|
|
<div class="chat-transcript-user">
|
|
<div class="chat-transcript-user-avatar"></div>
|
|
<div class="chat-transcript-username">
|
|
martin</div>
|
|
<div class="chat-transcript-datetime">
|
|
<span title="2022-01-25T05:40:39Z"></span></div>
|
|
</div>
|
|
<div class="chat-transcript-messages">
|
|
<p>This is a chat message.</p></div>
|
|
</div>
|
|
COOKED
|
|
end
|
|
|
|
it "renders with the reactions attribute" do
|
|
reactions_attr = "+1:martin;heart:martin,eviltrout"
|
|
post.update!(
|
|
raw:
|
|
"[chat quote=\"martin;2321;2022-01-25T05:40:39Z\" channel=\"Cool Cats Club\" channelId=\"1234\" reactions=\"#{reactions_attr}\"]\nThis is a chat message.\n[/chat]",
|
|
)
|
|
expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
|
|
<div class="chat-transcript" data-message-id="2321" data-username="martin" data-datetime="2022-01-25T05:40:39Z" data-reactions="+1:martin;heart:martin,eviltrout" data-channel-name="Cool Cats Club" data-channel-id="1234">
|
|
<div class="chat-transcript-user">
|
|
<div class="chat-transcript-user-avatar"></div>
|
|
<div class="chat-transcript-username">
|
|
martin</div>
|
|
<div class="chat-transcript-datetime">
|
|
<a href="/chat/c/-/1234/2321" title="2022-01-25T05:40:39Z"></a></div>
|
|
<a class="chat-transcript-channel" href="/chat/c/-/1234">
|
|
#Cool Cats Club</a></div>
|
|
<div class="chat-transcript-messages">
|
|
<p>This is a chat message.</p><div class="chat-transcript-reactions">
|
|
<div class="chat-transcript-reaction">
|
|
<img width="20" height="20" src="/images/emoji/twitter/+1.png?v=12" title="+1" loading="lazy" alt="+1" class="emoji"> 1</div>
|
|
<div class="chat-transcript-reaction">
|
|
<img width="20" height="20" src="/images/emoji/twitter/heart.png?v=12" title="heart" loading="lazy" alt="heart" class="emoji"> 2</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
COOKED
|
|
end
|
|
|
|
it "correctly renders inline and non-inline oneboxes combined with chat quotes" do
|
|
full_onebox_html = <<~HTML.chomp
|
|
<aside class="onebox wikipedia" data-onebox-src="https://en.wikipedia.org/wiki/Hyperlink" dir="ltr">
|
|
<article class="onebox-body">
|
|
<h3>
|
|
<a href="https://en.wikipedia.org/wiki/Hyperlink" target="_blank" rel="nofollow ugc noopener" tabindex="-1">Hyperlink</a>
|
|
</h3>
|
|
<p>This is a test</p>
|
|
</article>
|
|
<div class="onebox-metadata"></div>
|
|
<div style="clear: both"></div>
|
|
</aside>
|
|
HTML
|
|
SiteSetting.enable_inline_onebox_on_all_domains = true
|
|
Oneboxer
|
|
.stubs(:cached_onebox)
|
|
.with("https://en.wikipedia.org/wiki/Hyperlink")
|
|
.returns(full_onebox_html)
|
|
stub_request(:get, "https://en.wikipedia.org/wiki/Hyperlink").to_return(
|
|
status: 200,
|
|
body: "<html><head><title>Hyperlink - Wikipedia</title></head></html>",
|
|
)
|
|
|
|
post.update!(raw: <<~MD)
|
|
https://en.wikipedia.org/wiki/Hyperlink
|
|
|
|
[chat quote=\"martin;2321;2022-01-25T05:40:39Z\"]
|
|
This is a chat message.
|
|
[/chat]
|
|
|
|
https://en.wikipedia.org/wiki/Hyperlink
|
|
|
|
This is an inline onebox https://en.wikipedia.org/wiki/Hyperlink.
|
|
MD
|
|
|
|
expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
|
|
#{full_onebox_html}
|
|
<div class="chat-transcript" data-message-id="2321" data-username="martin" data-datetime="2022-01-25T05:40:39Z">
|
|
<div class="chat-transcript-user">
|
|
<div class="chat-transcript-user-avatar"></div>
|
|
<div class="chat-transcript-username">
|
|
martin</div>
|
|
<div class="chat-transcript-datetime">
|
|
<span title="2022-01-25T05:40:39Z"></span>
|
|
</div>
|
|
</div>
|
|
<div class="chat-transcript-messages">
|
|
<p>This is a chat message.</p>
|
|
</div>
|
|
</div>
|
|
#{full_onebox_html}
|
|
<p>This is an inline onebox <a href="https://en.wikipedia.org/wiki/Hyperlink" class="inline-onebox-loading" rel="noopener nofollow ugc">https://en.wikipedia.org/wiki/Hyperlink</a>.</p>
|
|
COOKED
|
|
ensure
|
|
InlineOneboxer.invalidate("https://en.wikipedia.org/wiki/Hyperlink")
|
|
end
|
|
|
|
it "handles nested chat transcripts in posts" do
|
|
SiteSetting.external_system_avatars_enabled = false
|
|
freeze_time
|
|
|
|
channel = Fabricate(:chat_channel)
|
|
message1 = Fabricate(:chat_message, chat_channel: channel, user: post.user)
|
|
message2 = Fabricate(:chat_message, chat_channel: channel, user: post.user)
|
|
md =
|
|
Chat::TranscriptService.new(
|
|
channel,
|
|
message2.user,
|
|
messages_or_ids: [message2.id],
|
|
).generate_markdown
|
|
message1.update!(message: md)
|
|
md_for_post =
|
|
Chat::TranscriptService.new(
|
|
channel,
|
|
message1.user,
|
|
messages_or_ids: [message1.id],
|
|
).generate_markdown
|
|
post.update!(raw: md_for_post)
|
|
expect(post.cooked.chomp).to eq(<<~COOKED.chomp)
|
|
<div class="chat-transcript" data-message-id="#{message1.id}" data-username="#{message1.user.username}" data-datetime="#{message1.created_at.iso8601}" data-channel-name="#{channel.name}" data-channel-id="#{channel.id}">
|
|
<div class="chat-transcript-user">
|
|
<div class="chat-transcript-user-avatar">
|
|
<img loading="lazy" alt="" width="24" height="24" src="//test.localhost#{post.user.avatar_template.gsub("{size}", "48")}" class="avatar"></div>
|
|
<div class="chat-transcript-username">
|
|
#{message1.user.username}</div>
|
|
<div class="chat-transcript-datetime">
|
|
<a href="/chat/c/-/#{channel.id}/#{message1.id}" title="#{message1.created_at.iso8601}"></a></div>
|
|
<a class="chat-transcript-channel" href="/chat/c/-/#{channel.id}">
|
|
##{channel.name}</a></div>
|
|
<div class="chat-transcript-messages">
|
|
<div class="chat-transcript" data-message-id="#{message2.id}" data-username="#{message2.user.username}" data-datetime="#{message2.created_at.iso8601}" data-channel-name="#{channel.name}" data-channel-id="#{channel.id}">
|
|
<div class="chat-transcript-user">
|
|
<div class="chat-transcript-user-avatar">
|
|
<img loading="lazy" alt="" width="24" height="24" src="//test.localhost#{post.user.avatar_template.gsub("{size}", "48")}" class="avatar"></div>
|
|
<div class="chat-transcript-username">
|
|
#{message2.user.username}</div>
|
|
<div class="chat-transcript-datetime">
|
|
<a href="/chat/c/-/#{channel.id}/#{message2.id}" title="#{message1.created_at.iso8601}"></a></div>
|
|
<a class="chat-transcript-channel" href="/chat/c/-/#{channel.id}">
|
|
##{channel.name}</a></div>
|
|
<div class="chat-transcript-messages">
|
|
<p>#{message2.message}</p></div>
|
|
</div></div>
|
|
</div>
|
|
COOKED
|
|
end
|
|
end
|