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

emoji should not be coupled into the core

Browse Source 
avatars were being counted and should not have been for basic users
This commit is contained in:
Sam Saffron
2013-02-12 18:43:48 +11:00
parent bdba0a78c4
commit 99526c33da
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spec/models/post_spec.rb
View File

@ -86,7 +86,8 @@ describe Post do
let(:post_no_images) { Fabricate.build(:post, post_args) }
let(:post_one_image) { Fabricate.build(:post, post_args.merge(raw: "![sherlock](http://bbc.co.uk/sherlock.jpg)")) }
let(:post_two_images) { Fabricate.build(:post, post_args.merge(raw: "<img src='http://discourse.org/logo.png'> <img src='http://bbc.co.uk/sherlock.jpg'>")) }
let(:post_with_emoticons) { Fabricate.build(:post, post_args.merge(raw: '<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="emoji"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="emoji">')) }
let(:post_with_avatars) { Fabricate.build(:post, post_args.merge(raw: '<img alt="smiley" title=":smiley:" src="/assets/emoji/smiley.png" class="avatar"> <img alt="wink" title=":wink:" src="/assets/emoji/wink.png" class="avatar">')) }
let(:post_with_two_classy_images) { Fabricate.build(:post, post_args.merge(raw: "<img src='http://discourse.org/logo.png' class='classy'> <img src='http://bbc.co.uk/sherlock.jpg' class='classy'>")) }
it "returns 0 images for an empty post" do
Fabricate.build(:post).image_count.should == 0
@ -100,10 +101,14 @@ describe Post do
post_two_images.image_count.should == 2
end
it "doesn't count emoticons as images" do
post_with_emoticons.image_count.should == 0
it "doesn't count avatars as images" do
post_with_avatars.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
end
context "validation" do
it "allows a new user to make a post with one image" do