will/cancan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't stop at cannot definition when checking class - closes #131

Browse Source
This commit is contained in:
Ryan Bates 2010-08-30 15:20:06 -07:00
parent 4fe44af45d
commit 5a353c1cba
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cancan/can_definition.rb
View File

@ -30,7 +30,7 @@ module CanCan
elsif @conditions.kind_of?(Hash) && subject.class != Class elsif @conditions.kind_of?(Hash) && subject.class != Class
matches_conditions_hash?(subject) matches_conditions_hash?(subject)
else else
true @base_behavior
end end
end end

8
spec/cancan/ability_spec.rb
View File

@ -246,6 +246,14 @@ describe CanCan::Ability do
@ability.can?(:read, [[4, 5, 6]]).should be_false @ability.can?(:read, [[4, 5, 6]]).should be_false
end end
it "should not stop at cannot definition when comparing class" do
@ability.can :read, Array
@ability.cannot :read, Array, :first => 1
@ability.can?(:read, [2,3,5]).should be_true
@ability.can?(:read, [1,3,5]).should be_false
@ability.can?(:read, Array).should be_true
end
it "should has eated cheezburger" do it "should has eated cheezburger" do
lambda { lambda {
@ability.can? :has, :cheezburger @ability.can? :has, :cheezburger