github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 04:52:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: allow new user to post emojis

Browse Source
This commit is contained in:
Régis Hanol 2013-12-12 15:05:18 +01:00
parent 0525cbdb11
commit be835785f8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/post.rb
View File

@ -111,7 +111,7 @@ class Post < ActiveRecord::Base
end
def self.white_listed_image_classes
@white_listed_image_classes ||= ['avatar', 'favicon', 'thumbnail']
@white_listed_image_classes ||= ['avatar', 'favicon', 'thumbnail', 'emoji']
end
def post_analyzer

9
spec/models/post_spec.rb
View File

@ -125,6 +125,7 @@ describe Post do
let(:post_with_favicon) { post_with_body('<img src="/assets/favicons/wikipedia.png" class="favicon">', newuser) }
let(:post_with_thumbnail) { post_with_body('<img src="/assets/emoji/smiley.png" class="thumbnail">', newuser) }
let(:post_with_two_classy_images) { post_with_body("<img src='http://discourse.org/logo.png' class='classy'> <img src='http://bbc.co.uk/sherlock.jpg' class='classy'>", newuser) }
let(:post_with_emojis) { post_with_body("<img src='/plugins/emoji/images/smile.png' title=':smile:' class='emoji' alt='smile'><img src='/plugins/emoji/images/wink.png' title=':wink:' class='emoji' alt='wink'>", newuser) }
it "returns 0 images for an empty post" do
Fabricate.build(:post).image_count.should == 0
@ -150,6 +151,10 @@ describe Post do
post_with_thumbnail.image_count.should == 0
end
it "doesn't count emojies as images" do
post_with_emojis.image_count.should == 0
end
it "doesn't count whitelisted images" do
Post.stubs(:white_listed_image_classes).returns(["classy"])
post_with_two_classy_images.image_count.should == 0
@ -166,6 +171,10 @@ describe Post do
post_one_image.should be_valid
end
it "allows a new user to post emojies" do
post_with_emojis.should be_valid
end
it "doesn't allow more than the maximum" do
post_two_images.should_not be_valid
end