Merge pull request #3628 from tgxworld/emoji_in_user_stream

FEATURE: Display emojis in user stream.

spec/components/pretty_text_spec.rb

@@ -230,6 +230,11 @@ describe PrettyText do
       expect(PrettyText.excerpt("'", 500, text_entities: true)).to eq("'")
     end
 
+    it "should have an option to preserve emojis" do
+      emoji_image = "<img src='/images/emoji/emoji_one/heart.png?v=0' title=':heart:' class='emoji' alt='heart'>"
+      expect(PrettyText.excerpt(emoji_image, 100, { keep_emojis: true })).to match_html(emoji_image)
+    end
+
   end
 
   describe "strip links" do