fix matches_conditons_hash for string values on 1.8
This commit is contained in:
parent
60cf6a67ef
commit
ea2b07f416
|
@ -116,7 +116,7 @@ module CanCan
|
|||
else
|
||||
!attribute.nil? && matches_conditions_hash?(attribute, value)
|
||||
end
|
||||
elsif value.kind_of?(Enumerable)
|
||||
elsif !value.is_a?(String) && value.kind_of?(Enumerable)
|
||||
value.include? attribute
|
||||
else
|
||||
attribute == value
|
||||
|
|
|
@ -269,6 +269,12 @@ describe CanCan::Ability do
|
|||
@ability.can?(:read, []).should be_false
|
||||
end
|
||||
|
||||
it "should match strings but not substrings specified in a conditions hash" do
|
||||
@ability.can :read, String, :presence => "declassified"
|
||||
@ability.can?(:read, "declassified").should be_true
|
||||
@ability.can?(:read, "classified").should be_false
|
||||
end
|
||||
|
||||
it "should not stop at cannot definition when comparing class" do
|
||||
@ability.can :read, Range
|
||||
@ability.cannot :read, Range, :begin => 1
|
||||
|
|
Loading…
Reference in New Issue
Block a user