1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Fix numericality validator not to be affected by custom getter

Since fe9547b6, numericality validator would parse raw value only when a
value came from user to work type casting to a value from database.

But that was caused a regression that the validator would work against
getter value instead of parsed raw value, a getter is sometimes
customized by people. #33550

There we never guarantees that the value before type cast was going to
the used in this validation (actually here is only place that getter
value might not be used), but we should not change the behavior unless
there is some particular reason.

The purpose of fe9547b6 is to work type casting to a value from
database. We could achieve the purpose by using `read_attribute`,
without using getter value.

Fixes #33550.
This commit is contained in:
Ryuta Kamizono 2018-08-10 19:42:00 +09:00
parent f2970a08b5
commit 2fece9036d
4 changed files with 28 additions and 2 deletions

View file

@ -23,6 +23,8 @@ module ActiveModel
if record.respond_to?(came_from_user) && record.public_send(came_from_user) if record.respond_to?(came_from_user) && record.public_send(came_from_user)
raw_value = record.read_attribute_before_type_cast(attr_name) raw_value = record.read_attribute_before_type_cast(attr_name)
elsif record.respond_to?(:read_attribute)
raw_value = record.read_attribute(attr_name)
end end
raw_value ||= value raw_value ||= value

View file

@ -781,7 +781,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
end end
def test_has_many_through_polymorphic_has_manys_works def test_has_many_through_polymorphic_has_manys_works
assert_equal [10, 20].to_set, pirates(:redbeard).treasure_estimates.map(&:price).to_set assert_equal ["$10.00", "$20.00"].to_set, pirates(:redbeard).treasure_estimates.map(&:price).to_set
end end
def test_symbols_as_keys def test_symbols_as_keys

View file

@ -3,11 +3,11 @@
require "cases/helper" require "cases/helper"
require "models/topic" require "models/topic"
require "models/reply" require "models/reply"
require "models/person"
require "models/developer" require "models/developer"
require "models/computer" require "models/computer"
require "models/parrot" require "models/parrot"
require "models/company" require "models/company"
require "models/price_estimate"
class ValidationsTest < ActiveRecord::TestCase class ValidationsTest < ActiveRecord::TestCase
fixtures :topics, :developers fixtures :topics, :developers
@ -183,6 +183,22 @@ class ValidationsTest < ActiveRecord::TestCase
assert_not_predicate klass.new(wibble: BigDecimal("97.179")), :valid? assert_not_predicate klass.new(wibble: BigDecimal("97.179")), :valid?
end end
def test_numericality_validator_wont_be_affected_by_custom_getter
price_estimate = PriceEstimate.new(price: 50)
assert_equal "$50.00", price_estimate.price
assert_equal 50, price_estimate.price_before_type_cast
assert_equal 50, price_estimate.read_attribute(:price)
assert_predicate price_estimate, :price_came_from_user?
assert_predicate price_estimate, :valid?
price_estimate.save!
assert_not_predicate price_estimate, :price_came_from_user?
assert_predicate price_estimate, :valid?
end
def test_acceptance_validator_doesnt_require_db_connection def test_acceptance_validator_doesnt_require_db_connection
klass = Class.new(ActiveRecord::Base) do klass = Class.new(ActiveRecord::Base) do
self.table_name = "posts" self.table_name = "posts"

View file

@ -1,6 +1,14 @@
# frozen_string_literal: true # frozen_string_literal: true
class PriceEstimate < ActiveRecord::Base class PriceEstimate < ActiveRecord::Base
include ActiveSupport::NumberHelper
belongs_to :estimate_of, polymorphic: true belongs_to :estimate_of, polymorphic: true
belongs_to :thing, polymorphic: true belongs_to :thing, polymorphic: true
validates_numericality_of :price
def price
number_to_currency super
end
end end