False positives on multiple nested abilities definitions #564

Merged
merged 1 commit into from May 10, 2012
Jump to file or symbol
Failed to load files and symbols.
+9 −1
Diff settings

Always

Just for now

View
@@ -123,7 +123,7 @@ def matches_conditions_hash?(subject, conditions = @conditions)
end
def nested_subject_matches_conditions?(subject_hash)
- parent, child = subject_hash.shift
+ parent, child = subject_hash.first
matches_conditions_hash?(parent, @conditions[parent.class.name.downcase.to_sym] || {})
end
@@ -298,6 +298,14 @@ class A; include B; end
@ability.can?(:read, 123 => Range).should be_true
end
+ it "passing a hash of subjects with multiple definitions should check permissions correctly" do
+ @ability.can :read, Range, :string => {:length => 4}
+ @ability.can [:create, :read], Range, :string => {:upcase => 'FOO'}
+ @ability.can?(:read, "foo" => Range).should be_true
+ @ability.can?(:read, "foobar" => Range).should be_false
+ @ability.can?(:read, 1234 => Range).should be_true
+ end
+
it "should allow to check ability on Hash-like object" do
class Container < Hash; end
@ability.can :read, Container