fix score updates for favoriting
This commit is contained in:
@@ -491,6 +491,7 @@ class Post < ActiveRecord::Base
|
|||||||
return if favorited_by?(user.id)
|
return if favorited_by?(user.id)
|
||||||
append_user_to_fav_string(user.id)
|
append_user_to_fav_string(user.id)
|
||||||
increment!(:fav_count)
|
increment!(:fav_count)
|
||||||
|
increment!(:score) if CurrentUser.is_privileged?
|
||||||
user.add_favorite!(self)
|
user.add_favorite!(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -501,6 +502,7 @@ class Post < ActiveRecord::Base
|
|||||||
def remove_favorite!(user)
|
def remove_favorite!(user)
|
||||||
return unless favorited_by?(user.id)
|
return unless favorited_by?(user.id)
|
||||||
decrement!(:fav_count)
|
decrement!(:fav_count)
|
||||||
|
decrement!(:score) if CurrentUser.is_privileged?
|
||||||
delete_user_from_fav_string(user.id)
|
delete_user_from_fav_string(user.id)
|
||||||
user.remove_favorite!(self)
|
user.remove_favorite!(self)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -567,7 +567,7 @@ class PostTest < ActiveSupport::TestCase
|
|||||||
context "Favorites:" do
|
context "Favorites:" do
|
||||||
context "Removing a post from a user's favorites" do
|
context "Removing a post from a user's favorites" do
|
||||||
setup do
|
setup do
|
||||||
@user = FactoryGirl.create(:user)
|
@user = FactoryGirl.create(:contributor_user)
|
||||||
CurrentUser.user = @user
|
CurrentUser.user = @user
|
||||||
CurrentUser.ip_addr = "127.0.0.1"
|
CurrentUser.ip_addr = "127.0.0.1"
|
||||||
@post = FactoryGirl.create(:post)
|
@post = FactoryGirl.create(:post)
|
||||||
@@ -586,6 +586,21 @@ class PostTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
should "decrement the post's score for privileged users" do
|
||||||
|
@post.remove_favorite!(@user)
|
||||||
|
@post.reload
|
||||||
|
assert_equal(0, @post.score)
|
||||||
|
end
|
||||||
|
|
||||||
|
should "not decrement the post's score for basic users" do
|
||||||
|
@member = FactoryGirl.create(:user)
|
||||||
|
CurrentUser.scoped(@member, "127.0.0.1") do
|
||||||
|
@post.remove_favorite!(@user)
|
||||||
|
end
|
||||||
|
@post.reload
|
||||||
|
assert_equal(1, @post.score)
|
||||||
|
end
|
||||||
|
|
||||||
should "not decrement the user's favorite_count if the user did not favorite the post" do
|
should "not decrement the user's favorite_count if the user did not favorite the post" do
|
||||||
@post2 = FactoryGirl.create(:post)
|
@post2 = FactoryGirl.create(:post)
|
||||||
assert_difference("CurrentUser.favorite_count", 0) do
|
assert_difference("CurrentUser.favorite_count", 0) do
|
||||||
@@ -597,7 +612,7 @@ class PostTest < ActiveSupport::TestCase
|
|||||||
|
|
||||||
context "Adding a post to a user's favorites" do
|
context "Adding a post to a user's favorites" do
|
||||||
setup do
|
setup do
|
||||||
@user = FactoryGirl.create(:user)
|
@user = FactoryGirl.create(:contributor_user)
|
||||||
CurrentUser.user = @user
|
CurrentUser.user = @user
|
||||||
CurrentUser.ip_addr = "127.0.0.1"
|
CurrentUser.ip_addr = "127.0.0.1"
|
||||||
@post = FactoryGirl.create(:post)
|
@post = FactoryGirl.create(:post)
|
||||||
@@ -615,6 +630,21 @@ class PostTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
should "increment the post's score for privileged users" do
|
||||||
|
@post.add_favorite!(@user)
|
||||||
|
@post.reload
|
||||||
|
assert_equal(1, @post.score)
|
||||||
|
end
|
||||||
|
|
||||||
|
should "not increment the post's score for basic users" do
|
||||||
|
@member = FactoryGirl.create(:user)
|
||||||
|
CurrentUser.scoped(@member, "127.0.0.1") do
|
||||||
|
@post.add_favorite!(@user)
|
||||||
|
end
|
||||||
|
@post.reload
|
||||||
|
assert_equal(0, @post.score)
|
||||||
|
end
|
||||||
|
|
||||||
should "update the fav strings ont he post" do
|
should "update the fav strings ont he post" do
|
||||||
@post.add_favorite!(@user)
|
@post.add_favorite!(@user)
|
||||||
@post.reload
|
@post.reload
|
||||||
@@ -963,3 +993,4 @@ class PostTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user