Skip to content

Remove ability to block oneself #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ryandrake08 wants to merge 3 commits into from
Closed

Remove ability to block oneself #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aef7f36
Lock factory_girl to v2.6.0, which is compatible with ruby 1.8
ryandrake08 Jun 10, 2012
9b883fd
Lock shoulda to version 2.11.3, because acts_as_follower uses should_…
ryandrake08 Jun 10, 2012
3f1f284
Removed the ability for a followable to block oneself, an act that do…
ryandrake08 Jun 10, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions acts_as_follower.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]

s.add_development_dependency "sqlite3"
s.add_development_dependency "shoulda"
s.add_development_dependency "factory_girl"
s.add_development_dependency "shoulda", "~>2.11.3"
s.add_development_dependency "factory_girl", "~>2.6.0"
s.add_development_dependency "rails", "~>3.0.10"
end
2 changes: 1 addition & 1 deletion lib/acts_as_follower/followable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def get_follow_for(follower)
private

def block_future_follow(follower)
follows.create(:followable => self, :follower => follower, :blocked => true)
follows.create(:followable => self, :follower => follower, :blocked => true) unless follower == self
end

def block_existing_follow(follower)
Expand Down
10 changes: 10 additions & 0 deletions test/acts_as_followable_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,16 @@ class ActsAsFollowableTest < ActiveSupport::TestCase
end
end

context "blocking yourself" do
setup do
@jon.block(@jon)
end

should "not add self to the blocked followers" do
assert_equal 0, @jon.blocked_followers_count
end
end

context "blocking a follower" do
context "in my following list" do
setup do
Expand Down