don't stop at cannot definitions when there are no conditions - closes …

…ryanb#161
olliebennett · Oct 4, 2010 · 8f49f28 · 8f49f28
1 parent 12037d7
commit 8f49f28
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/cancan/can_definition.rb b/lib/cancan/can_definition.rb
@@ -36,7 +36,8 @@ def matches_conditions?(action, subject, extra_args)
       elsif @conditions.kind_of?(Hash) && !subject_class?(subject)
         matches_conditions_hash?(subject)
       else
-        @base_behavior
+        # Don't stop at "cannot" definitions when there are conditions.
+        @conditions.empty? ? true : @base_behavior
       end
     end
 

diff --git a/spec/cancan/ability_spec.rb b/spec/cancan/ability_spec.rb
@@ -258,6 +258,13 @@
     @ability.can?(:read, Range).should be_true
   end
 
+  it "should stop at cannot definition when no hash is present" do
+    @ability.can :read, :all
+    @ability.cannot :read, Range
+    @ability.can?(:read, 1..5).should be_false
+    @ability.can?(:read, Range).should be_false
+  end
+
   it "should allow to check ability for Module" do
     module B; end
     class A; include B; end