Replace all references to invalid/valid with assert_invalid_values/assert_valid_values.
This commit is contained in:
Rachael Wright-Munn
parent
9a08a2f09c
commit
2ed77a9577
@ -13,93 +13,93 @@ def teardown
|
||||
def test_validates_comparison_with_greater_than_using_numeric
|
||||
Topic.validates_comparison_of :approved, greater_than: 10
|
||||
|
||||
invalid!([-12, 10], "must be greater than 10")
|
||||
valid!([11])
|
||||
assert_invalid_values([-12, 10], "must be greater than 10")
|
||||
assert_valid_values([11])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_greater_than_using_date
|
||||
date_value = Date.parse("2020-08-02")
|
||||
Topic.validates_comparison_of :approved, greater_than: date_value
|
||||
|
||||
invalid!([
|
||||
assert_invalid_values([
|
||||
Date.parse("2019-08-03"),
|
||||
Date.parse("2020-07-03"),
|
||||
Date.parse("2020-08-01"),
|
||||
Date.parse("2020-08-02"),
|
||||
DateTime.new(2020, 8, 1, 12, 34)], "must be greater than 2020-08-02")
|
||||
valid!([Date.parse("2020-08-03"), DateTime.new(2020, 8, 2, 12, 34)])
|
||||
assert_valid_values([Date.parse("2020-08-03"), DateTime.new(2020, 8, 2, 12, 34)])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_greater_than_using_string
|
||||
Topic.validates_comparison_of :approved, greater_than: "cat"
|
||||
|
||||
invalid!(["ant", "cat"], "must be greater than cat")
|
||||
valid!(["dog", "whale"])
|
||||
assert_invalid_values(["ant", "cat"], "must be greater than cat")
|
||||
assert_valid_values(["dog", "whale"])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_greater_than_or_equal_to_using_numeric
|
||||
Topic.validates_comparison_of :approved, greater_than_or_equal_to: 10
|
||||
|
||||
invalid!([-12, 5], "must be greater than or equal to 10")
|
||||
valid!([11, 10])
|
||||
assert_invalid_values([-12, 5], "must be greater than or equal to 10")
|
||||
assert_valid_values([11, 10])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_greater_than_or_equal_to_using_string
|
||||
Topic.validates_comparison_of :approved, greater_than_or_equal_to: "cat"
|
||||
|
||||
invalid!(["ant"], "must be greater than or equal to cat")
|
||||
valid!(["cat", "dog", "whale"])
|
||||
assert_invalid_values(["ant"], "must be greater than or equal to cat")
|
||||
assert_valid_values(["cat", "dog", "whale"])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_greater_than_or_equal_to_using_date
|
||||
date_value = Date.parse("2020-08-02")
|
||||
Topic.validates_comparison_of :approved, greater_than_or_equal_to: date_value
|
||||
|
||||
invalid!([
|
||||
assert_invalid_values([
|
||||
Date.parse("2019-08-03"),
|
||||
Date.parse("2020-07-03"),
|
||||
Date.parse("2020-08-01"),
|
||||
DateTime.new(2020, 8, 1, 12, 34)], "must be greater than or equal to 2020-08-02")
|
||||
valid!([Date.parse("2020-08-03"), DateTime.new(2020, 8, 2, 12, 34), Date.parse("2020-08-02")])
|
||||
assert_valid_values([Date.parse("2020-08-03"), DateTime.new(2020, 8, 2, 12, 34), Date.parse("2020-08-02")])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_equal_to_using_numeric
|
||||
Topic.validates_comparison_of :approved, equal_to: 10
|
||||
|
||||
invalid!([-12, 5, 11], "must be equal to 10")
|
||||
valid!([10])
|
||||
assert_invalid_values([-12, 5, 11], "must be equal to 10")
|
||||
assert_valid_values([10])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_equal_to_using_date
|
||||
date_value = Date.parse("2020-08-02")
|
||||
Topic.validates_comparison_of :approved, equal_to: date_value
|
||||
|
||||
invalid!([
|
||||
assert_invalid_values([
|
||||
Date.parse("2019-08-03"),
|
||||
Date.parse("2020-07-03"),
|
||||
Date.parse("2020-08-01"),
|
||||
DateTime.new(2020, 8, 1, 12, 34),
|
||||
Date.parse("2020-08-03"),
|
||||
DateTime.new(2020, 8, 2, 12, 34)], "must be equal to 2020-08-02")
|
||||
valid!([Date.parse("2020-08-02"), DateTime.new(2020, 8, 2, 0, 0)])
|
||||
assert_valid_values([Date.parse("2020-08-02"), DateTime.new(2020, 8, 2, 0, 0)])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_less_than_using_numeric
|
||||
Topic.validates_comparison_of :approved, less_than: 10
|
||||
|
||||
invalid!([11, 10], "must be less than 10")
|
||||
valid!([-12, -5, 5])
|
||||
assert_invalid_values([11, 10], "must be less than 10")
|
||||
assert_valid_values([-12, -5, 5])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_less_than_using_date
|
||||
date_value = Date.parse("2020-08-02")
|
||||
Topic.validates_comparison_of :approved, less_than: date_value
|
||||
|
||||
invalid!([
|
||||
assert_invalid_values([
|
||||
Date.parse("2020-08-02"),
|
||||
Date.parse("2020-08-03"),
|
||||
DateTime.new(2020, 8, 2, 12, 34)], "must be less than 2020-08-02")
|
||||
valid!([Date.parse("2019-08-03"),
|
||||
assert_valid_values([Date.parse("2019-08-03"),
|
||||
Date.parse("2020-07-03"),
|
||||
Date.parse("2020-08-01"),
|
||||
DateTime.new(2020, 8, 1, 12, 34)])
|
||||
@ -108,18 +108,18 @@ def test_validates_comparison_with_less_than_using_date
|
||||
def test_validates_comparison_with_less_than_or_equal_to_using_numeric
|
||||
Topic.validates_comparison_of :approved, less_than_or_equal_to: 10
|
||||
|
||||
invalid!([12], "must be less than or equal to 10")
|
||||
valid!([-11, 5, 10])
|
||||
assert_invalid_values([12], "must be less than or equal to 10")
|
||||
assert_valid_values([-11, 5, 10])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_less_than_or_equal_to_using_date
|
||||
date_value = Date.parse("2020-08-02")
|
||||
Topic.validates_comparison_of :approved, less_than_or_equal_to: date_value
|
||||
|
||||
invalid!([
|
||||
assert_invalid_values([
|
||||
Date.parse("2020-08-03"),
|
||||
DateTime.new(2020, 8, 2, 12, 34)], "must be less than or equal to 2020-08-02")
|
||||
valid!([Date.parse("2019-08-03"),
|
||||
assert_valid_values([Date.parse("2019-08-03"),
|
||||
Date.parse("2020-07-03"),
|
||||
Date.parse("2020-08-01"),
|
||||
Date.parse("2020-08-02"),
|
||||
@ -129,16 +129,16 @@ def test_validates_comparison_with_less_than_or_equal_to_using_date
|
||||
def test_validates_comparison_with_other_than_using_numeric
|
||||
Topic.validates_comparison_of :approved, other_than: 10
|
||||
|
||||
invalid!([10], "must be other than 10")
|
||||
valid!([-12, 5, 11])
|
||||
assert_invalid_values([10], "must be other than 10")
|
||||
assert_valid_values([-12, 5, 11])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_other_than_using_date
|
||||
date_value = Date.parse("2020-08-02")
|
||||
Topic.validates_comparison_of :approved, other_than: date_value
|
||||
|
||||
invalid!([Date.parse("2020-08-02"), DateTime.new(2020, 8, 2, 0, 0)], "must be other than 2020-08-02")
|
||||
valid!([
|
||||
assert_invalid_values([Date.parse("2020-08-02"), DateTime.new(2020, 8, 2, 0, 0)], "must be other than 2020-08-02")
|
||||
assert_valid_values([
|
||||
Date.parse("2019-08-03"),
|
||||
Date.parse("2020-07-03"),
|
||||
Date.parse("2020-08-01"),
|
||||
@ -151,8 +151,8 @@ def test_validates_comparison_with_proc
|
||||
Topic.define_method(:requested) { Date.new(2020, 8, 1) }
|
||||
Topic.validates_comparison_of :approved, greater_than_or_equal_to: Proc.new(&:requested)
|
||||
|
||||
invalid!([Date.new(2020, 7, 1), Date.new(2019, 7, 1), DateTime.new(2020, 7, 1, 22, 34)])
|
||||
valid!([Date.new(2020, 8, 2), DateTime.new(2021, 8, 1)])
|
||||
assert_invalid_values([Date.new(2020, 7, 1), Date.new(2019, 7, 1), DateTime.new(2020, 7, 1, 22, 34)])
|
||||
assert_valid_values([Date.new(2020, 8, 2), DateTime.new(2021, 8, 1)])
|
||||
ensure
|
||||
Topic.remove_method :requested
|
||||
end
|
||||
@ -161,8 +161,8 @@ def test_validates_comparison_with_method
|
||||
Topic.define_method(:requested) { Date.new(2020, 8, 1) }
|
||||
Topic.validates_comparison_of :approved, greater_than_or_equal_to: :requested
|
||||
|
||||
invalid!([Date.new(2020, 7, 1), Date.new(2019, 7, 1), DateTime.new(2020, 7, 1, 22, 34)])
|
||||
valid!([Date.new(2020, 8, 2), DateTime.new(2021, 8, 1)])
|
||||
assert_invalid_values([Date.new(2020, 7, 1), Date.new(2019, 7, 1), DateTime.new(2020, 7, 1, 22, 34)])
|
||||
assert_valid_values([Date.new(2020, 8, 2), DateTime.new(2021, 8, 1)])
|
||||
ensure
|
||||
Topic.remove_method :requested
|
||||
end
|
||||
@ -177,37 +177,37 @@ def <=>(other)
|
||||
}
|
||||
Topic.validates_comparison_of :approved, greater_than_or_equal_to: custom.new(1150)
|
||||
|
||||
invalid!([custom.new(530), custom.new(2325)])
|
||||
valid!([custom.new(575), custom.new(250), custom.new(1999)])
|
||||
assert_invalid_values([custom.new(530), custom.new(2325)])
|
||||
assert_valid_values([custom.new(575), custom.new(250), custom.new(1999)])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_blank_allowed
|
||||
Topic.validates_comparison_of :approved, greater_than: "cat", allow_blank: true
|
||||
|
||||
invalid!(["ant"])
|
||||
valid!([nil, ""])
|
||||
assert_invalid_values(["ant"])
|
||||
assert_valid_values([nil, ""])
|
||||
end
|
||||
|
||||
def test_validates_comparison_with_nil_allowed
|
||||
Topic.validates_comparison_of :approved, less_than: 100, allow_nil: true
|
||||
|
||||
invalid!([200])
|
||||
valid!([nil, 50])
|
||||
assert_invalid_values([200])
|
||||
assert_valid_values([nil, 50])
|
||||
end
|
||||
|
||||
def test_validates_comparison_of_incomparables
|
||||
Topic.validates_comparison_of :approved, less_than: "cat"
|
||||
|
||||
invalid!([12], "comparison of Integer with String failed")
|
||||
invalid!([nil])
|
||||
valid!([])
|
||||
assert_invalid_values([12], "comparison of Integer with String failed")
|
||||
assert_invalid_values([nil])
|
||||
assert_valid_values([])
|
||||
end
|
||||
|
||||
def test_validates_comparison_of_multiple_values
|
||||
Topic.validates_comparison_of :approved, other_than: 17, greater_than: 13
|
||||
|
||||
invalid!([12, nil, 17])
|
||||
valid!([15])
|
||||
assert_invalid_values([12, nil, 17])
|
||||
assert_valid_values([15])
|
||||
end
|
||||
|
||||
def test_validates_comparison_of_no_options
|
||||
@ -219,7 +219,7 @@ def test_validates_comparison_of_no_options
|
||||
end
|
||||
|
||||
private
|
||||
def invalid!(values, error = nil)
|
||||
def assert_invalid_values(values, error = nil)
|
||||
with_each_topic_approved_value(values) do |topic, value|
|
||||
assert topic.invalid?, "#{value.inspect} failed comparison"
|
||||
assert topic.errors[:approved].any?, "FAILED for #{value.inspect}"
|
||||
@ -227,7 +227,7 @@ def invalid!(values, error = nil)
|
||||
end
|
||||
end
|
||||
|
||||
def valid!(values)
|
||||
def assert_valid_values(values)
|
||||
with_each_topic_approved_value(values) do |topic, value|
|
||||
assert topic.valid?, "#{value.inspect} failed comparison with validation error: #{topic.errors[:approved].first}"
|
||||
end
|
||||
|
||||
@ -27,206 +27,206 @@ def teardown
|
||||
|
||||
def test_default_validates_numericality_of
|
||||
Topic.validates_numericality_of :approved
|
||||
invalid!(NIL + BLANK + JUNK)
|
||||
valid!(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
assert_invalid_values(NIL + BLANK + JUNK)
|
||||
assert_valid_values(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_with_nil_allowed
|
||||
Topic.validates_numericality_of :approved, allow_nil: true
|
||||
|
||||
invalid!(JUNK + BLANK)
|
||||
valid!(NIL + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
assert_invalid_values(JUNK + BLANK)
|
||||
assert_valid_values(NIL + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_with_blank_allowed
|
||||
Topic.validates_numericality_of :approved, allow_blank: true
|
||||
|
||||
invalid!(JUNK)
|
||||
valid!(NIL + BLANK + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
assert_invalid_values(JUNK)
|
||||
assert_valid_values(NIL + BLANK + FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_with_integer_only
|
||||
Topic.validates_numericality_of :approved, only_integer: true
|
||||
|
||||
invalid!(NIL + BLANK + JUNK + FLOATS + BIGDECIMAL + INFINITY)
|
||||
valid!(INTEGERS)
|
||||
assert_invalid_values(NIL + BLANK + JUNK + FLOATS + BIGDECIMAL + INFINITY)
|
||||
assert_valid_values(INTEGERS)
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_with_integer_only_and_nil_allowed
|
||||
Topic.validates_numericality_of :approved, only_integer: true, allow_nil: true
|
||||
|
||||
invalid!(JUNK + BLANK + FLOATS + BIGDECIMAL + INFINITY)
|
||||
valid!(NIL + INTEGERS)
|
||||
assert_invalid_values(JUNK + BLANK + FLOATS + BIGDECIMAL + INFINITY)
|
||||
assert_valid_values(NIL + INTEGERS)
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_with_integer_only_and_symbol_as_value
|
||||
Topic.validates_numericality_of :approved, only_integer: :condition_is_false
|
||||
|
||||
invalid!(NIL + BLANK + JUNK)
|
||||
valid!(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
assert_invalid_values(NIL + BLANK + JUNK)
|
||||
assert_valid_values(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
end
|
||||
|
||||
def test_validates_numericality_of_with_integer_only_and_proc_as_value
|
||||
Topic.define_method(:allow_only_integers?) { false }
|
||||
Topic.validates_numericality_of :approved, only_integer: Proc.new(&:allow_only_integers?)
|
||||
|
||||
invalid!(NIL + BLANK + JUNK)
|
||||
valid!(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
assert_invalid_values(NIL + BLANK + JUNK)
|
||||
assert_valid_values(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_greater_than
|
||||
Topic.validates_numericality_of :approved, greater_than: 10
|
||||
|
||||
invalid!([-10, 10], "must be greater than 10")
|
||||
valid!([11])
|
||||
assert_invalid_values([-10, 10], "must be greater than 10")
|
||||
assert_valid_values([11])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_greater_than_using_differing_numeric_types
|
||||
Topic.validates_numericality_of :approved, greater_than: BigDecimal("97.18")
|
||||
|
||||
invalid!([-97.18, BigDecimal("97.18"), BigDecimal("-97.18")], "must be greater than 97.18")
|
||||
valid!([97.19, 98, BigDecimal("98"), BigDecimal("97.19")])
|
||||
assert_invalid_values([-97.18, BigDecimal("97.18"), BigDecimal("-97.18")], "must be greater than 97.18")
|
||||
assert_valid_values([97.19, 98, BigDecimal("98"), BigDecimal("97.19")])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_greater_than_using_string_value
|
||||
Topic.validates_numericality_of :approved, greater_than: 10
|
||||
|
||||
invalid!(["-10", "9", "9.9", "10"], "must be greater than 10")
|
||||
valid!(["10.1", "11"])
|
||||
assert_invalid_values(["-10", "9", "9.9", "10"], "must be greater than 10")
|
||||
assert_valid_values(["10.1", "11"])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_greater_than_or_equal
|
||||
Topic.validates_numericality_of :approved, greater_than_or_equal_to: 10
|
||||
|
||||
invalid!([-9, 9], "must be greater than or equal to 10")
|
||||
valid!([10])
|
||||
assert_invalid_values([-9, 9], "must be greater than or equal to 10")
|
||||
assert_valid_values([10])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_greater_than_or_equal_using_differing_numeric_types
|
||||
Topic.validates_numericality_of :approved, greater_than_or_equal_to: BigDecimal("97.18")
|
||||
|
||||
invalid!([-97.18, 97.17, 97, BigDecimal("97.17"), BigDecimal("-97.18")], "must be greater than or equal to 97.18")
|
||||
valid!([97.18, 98, BigDecimal("97.19")])
|
||||
assert_invalid_values([-97.18, 97.17, 97, BigDecimal("97.17"), BigDecimal("-97.18")], "must be greater than or equal to 97.18")
|
||||
assert_valid_values([97.18, 98, BigDecimal("97.19")])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_greater_than_or_equal_using_string_value
|
||||
Topic.validates_numericality_of :approved, greater_than_or_equal_to: 10
|
||||
|
||||
invalid!(["-10", "9", "9.9"], "must be greater than or equal to 10")
|
||||
valid!(["10", "10.1", "11"])
|
||||
assert_invalid_values(["-10", "9", "9.9"], "must be greater than or equal to 10")
|
||||
assert_valid_values(["10", "10.1", "11"])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_equal_to
|
||||
Topic.validates_numericality_of :approved, equal_to: 10
|
||||
|
||||
invalid!([-10, 11] + INFINITY, "must be equal to 10")
|
||||
valid!([10])
|
||||
assert_invalid_values([-10, 11] + INFINITY, "must be equal to 10")
|
||||
assert_valid_values([10])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_equal_to_using_differing_numeric_types
|
||||
Topic.validates_numericality_of :approved, equal_to: BigDecimal("97.18")
|
||||
|
||||
invalid!([-97.18], "must be equal to 97.18")
|
||||
valid!([BigDecimal("97.18")])
|
||||
assert_invalid_values([-97.18], "must be equal to 97.18")
|
||||
assert_valid_values([BigDecimal("97.18")])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_equal_to_using_string_value
|
||||
Topic.validates_numericality_of :approved, equal_to: 10
|
||||
|
||||
invalid!(["-10", "9", "9.9", "10.1", "11"], "must be equal to 10")
|
||||
valid!(["10"])
|
||||
assert_invalid_values(["-10", "9", "9.9", "10.1", "11"], "must be equal to 10")
|
||||
assert_valid_values(["10"])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_less_than
|
||||
Topic.validates_numericality_of :approved, less_than: 10
|
||||
|
||||
invalid!([10], "must be less than 10")
|
||||
valid!([-9, 9])
|
||||
assert_invalid_values([10], "must be less than 10")
|
||||
assert_valid_values([-9, 9])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_less_than_using_differing_numeric_types
|
||||
Topic.validates_numericality_of :approved, less_than: BigDecimal("97.18")
|
||||
|
||||
invalid!([97.18, BigDecimal("97.18")], "must be less than 97.18")
|
||||
valid!([-97.0, 97.0, -97, 97, BigDecimal("-97"), BigDecimal("97")])
|
||||
assert_invalid_values([97.18, BigDecimal("97.18")], "must be less than 97.18")
|
||||
assert_valid_values([-97.0, 97.0, -97, 97, BigDecimal("-97"), BigDecimal("97")])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_less_than_using_string_value
|
||||
Topic.validates_numericality_of :approved, less_than: 10
|
||||
|
||||
invalid!(["10", "10.1", "11"], "must be less than 10")
|
||||
valid!(["-10", "9", "9.9"])
|
||||
assert_invalid_values(["10", "10.1", "11"], "must be less than 10")
|
||||
assert_valid_values(["-10", "9", "9.9"])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_less_than_or_equal_to
|
||||
Topic.validates_numericality_of :approved, less_than_or_equal_to: 10
|
||||
|
||||
invalid!([11], "must be less than or equal to 10")
|
||||
valid!([-10, 10])
|
||||
assert_invalid_values([11], "must be less than or equal to 10")
|
||||
assert_valid_values([-10, 10])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_less_than_or_equal_to_using_differing_numeric_types
|
||||
Topic.validates_numericality_of :approved, less_than_or_equal_to: BigDecimal("97.18")
|
||||
|
||||
invalid!([97.19, 98], "must be less than or equal to 97.18")
|
||||
valid!([-97.18, BigDecimal("-97.18"), BigDecimal("97.18")])
|
||||
assert_invalid_values([97.19, 98], "must be less than or equal to 97.18")
|
||||
assert_valid_values([-97.18, BigDecimal("-97.18"), BigDecimal("97.18")])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_less_than_or_equal_using_string_value
|
||||
Topic.validates_numericality_of :approved, less_than_or_equal_to: 10
|
||||
|
||||
invalid!(["10.1", "11"], "must be less than or equal to 10")
|
||||
valid!(["-10", "9", "9.9", "10"])
|
||||
assert_invalid_values(["10.1", "11"], "must be less than or equal to 10")
|
||||
assert_valid_values(["-10", "9", "9.9", "10"])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_odd
|
||||
Topic.validates_numericality_of :approved, odd: true
|
||||
|
||||
invalid!([-2, 2], "must be odd")
|
||||
valid!([-1, 1])
|
||||
assert_invalid_values([-2, 2], "must be odd")
|
||||
assert_valid_values([-1, 1])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_even
|
||||
Topic.validates_numericality_of :approved, even: true
|
||||
|
||||
invalid!([-1, 1], "must be even")
|
||||
valid!([-2, 2])
|
||||
assert_invalid_values([-1, 1], "must be even")
|
||||
assert_valid_values([-2, 2])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_greater_than_less_than_and_even
|
||||
Topic.validates_numericality_of :approved, greater_than: 1, less_than: 4, even: true
|
||||
|
||||
invalid!([1, 3, 4])
|
||||
valid!([2])
|
||||
assert_invalid_values([1, 3, 4])
|
||||
assert_valid_values([2])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_other_than
|
||||
Topic.validates_numericality_of :approved, other_than: 0
|
||||
|
||||
invalid!([0, 0.0])
|
||||
valid!([-1, 42])
|
||||
assert_invalid_values([0, 0.0])
|
||||
assert_valid_values([-1, 42])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_in
|
||||
Topic.validates_numericality_of :approved, in: 1..3
|
||||
|
||||
invalid!([0, 4])
|
||||
valid!([1, 2, 3])
|
||||
assert_invalid_values([0, 4])
|
||||
assert_valid_values([1, 2, 3])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_other_than_using_string_value
|
||||
Topic.validates_numericality_of :approved, other_than: 0
|
||||
|
||||
invalid!(["0", "0.0"])
|
||||
valid!(["-1", "1.1", "42"])
|
||||
assert_invalid_values(["0", "0.0"])
|
||||
assert_valid_values(["-1", "1.1", "42"])
|
||||
end
|
||||
|
||||
def test_validates_numericality_with_proc
|
||||
Topic.define_method(:min_approved) { 5 }
|
||||
Topic.validates_numericality_of :approved, greater_than_or_equal_to: Proc.new(&:min_approved)
|
||||
|
||||
invalid!([3, 4])
|
||||
valid!([5, 6])
|
||||
assert_invalid_values([3, 4])
|
||||
assert_valid_values([5, 6])
|
||||
ensure
|
||||
Topic.remove_method :min_approved
|
||||
end
|
||||
@ -235,8 +235,8 @@ def test_validates_numericality_with_symbol
|
||||
Topic.define_method(:max_approved) { 5 }
|
||||
Topic.validates_numericality_of :approved, less_than_or_equal_to: :max_approved
|
||||
|
||||
invalid!([6])
|
||||
valid!([4, 5])
|
||||
assert_invalid_values([6])
|
||||
assert_valid_values([4, 5])
|
||||
ensure
|
||||
Topic.remove_method :max_approved
|
||||
end
|
||||
@ -313,12 +313,12 @@ def test_validates_numericality_with_invalid_args
|
||||
def test_validates_numericality_equality_for_float_and_big_decimal
|
||||
Topic.validates_numericality_of :approved, equal_to: BigDecimal("65.6")
|
||||
|
||||
invalid!([Float("65.5"), BigDecimal("65.7")], "must be equal to 65.6")
|
||||
valid!([Float("65.6"), BigDecimal("65.6")])
|
||||
assert_invalid_values([Float("65.5"), BigDecimal("65.7")], "must be equal to 65.6")
|
||||
assert_valid_values([Float("65.6"), BigDecimal("65.6")])
|
||||
end
|
||||
|
||||
private
|
||||
def invalid!(values, error = nil)
|
||||
def assert_invalid_values(values, error = nil)
|
||||
with_each_topic_approved_value(values) do |topic, value|
|
||||
assert topic.invalid?, "#{value.inspect} not rejected as a number"
|
||||
assert topic.errors[:approved].any?, "FAILED for #{value.inspect}"
|
||||
@ -326,7 +326,7 @@ def invalid!(values, error = nil)
|
||||
end
|
||||
end
|
||||
|
||||
def valid!(values)
|
||||
def assert_valid_values(values)
|
||||
with_each_topic_approved_value(values) do |topic, value|
|
||||
assert topic.valid?, "#{value.inspect} not accepted as a number with validation error: #{topic.errors[:approved].first}"
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user