IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: remap emojis back for push notifications and desktop alerts

Browse Source
This commit is contained in:
Sam
2016-10-11 13:03:21 +11:00
parent 6031e692f0
commit 89daa43754
5 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/components/pretty_text_spec.rb
View File

@@ -265,6 +265,11 @@ HTML
expect(PrettyText.excerpt(emoji_image, 100, { keep_emoji_images: true })).to match_html(emoji_image)
end
it "should have an option to remap emoji to code points" do
emoji_image = "I <img src='/images/emoji/emoji_one/heart.png?v=1' title=':heart:' class='emoji' alt=':heart:'> you <img src='/images/emoji/emoji_one/heart.png?v=1' title=':unknown:' class='emoji' alt=':unknown:'> "
expect(PrettyText.excerpt(emoji_image, 100, { remap_emoji: true })).to match_html("I ❤ you :unknown:")
end
it "should have an option to preserve emoji codes" do
emoji_code = "<img src='/images/emoji/emoji_one/heart.png?v=1' title=':heart:' class='emoji' alt=':heart:'>"
expect(PrettyText.excerpt(emoji_code, 100)).to eq(":heart:")

8
spec/services/post_alerter_spec.rb
View File

@@ -327,7 +327,7 @@ describe PostAlerter do
end
describe "push_notification" do
let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout')}
let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout :heart:')}
let(:topic) { mention_post.topic }
it "correctly pushes notifications if configured correctly" do
@@ -344,8 +344,6 @@ describe PostAlerter do
push_url: "https://site2.com/push")
end
body = nil
headers = nil
@@ -368,7 +366,7 @@ describe PostAlerter do
'post_number' => 1,
'topic_title' => topic.title,
'topic_id' => topic.id,
'excerpt' => 'Hello @eviltrout',
'excerpt' => 'Hello @eviltrout ❤',
'username' => user.username,
'url' => UrlHelper.absolute(mention_post.url),
'client_id' => 'xxx0'
@@ -378,7 +376,7 @@ describe PostAlerter do
'post_number' => 1,
'topic_title' => topic.title,
'topic_id' => topic.id,
'excerpt' => 'Hello @eviltrout',
'excerpt' => 'Hello @eviltrout ❤',
'username' => user.username,
'url' => UrlHelper.absolute(mention_post.url),
'client_id' => 'xxx1'