1
0
Fork 0
mirror of https://github.com/thoughtbot/shoulda-matchers.git synced 2022-11-09 12:01:38 -05:00
This commit is contained in:
Gabe Berke-Williams 2012-04-03 20:20:50 -04:00
parent 4131030437
commit 4b2b57b3fb
2 changed files with 12 additions and 8 deletions

View file

@ -135,7 +135,6 @@ module Shoulda # :nodoc:
'x' * length
end
end
end
end
end

View file

@ -33,19 +33,24 @@ module Shoulda # :nodoc:
def matches?(subject)
super(subject)
disallows_double_if_only_integer &&
disallows_text
disallows_non_integers? && disallows_text?
end
def description
type = if @only_integer then "integer" else "numeric" end
description = "only allow #{type} values for #{@attribute}"
description
"only allow #{allowed_type} values for #{@attribute}"
end
private
def disallows_double_if_only_integer
def allowed_type
if @only_integer
"integer"
else
"numeric"
end
end
def disallows_non_integers?
if @only_integer
message = @expected_message || :not_an_integer
disallows_value_of(0.1, message) && disallows_value_of('0.1', message)
@ -54,7 +59,7 @@ module Shoulda # :nodoc:
end
end
def disallows_text
def disallows_text?
message = @expected_message || :not_a_number
disallows_value_of('abcd', message)
end