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

Merge pull request #34219 from wilddima/datetime-exception-message

Browse source 
Add message to exception in datetime type
This commit is contained in:
Ryuta Kamizono 2018-10-21 17:51:54 +09:00 committed by GitHub
commit 26a202a91b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activemodel/lib/active_model/type/date_time.rb
View file

@ -39,9 +39,9 @@ module ActiveModel
end
def value_from_multiparameter_assignment(values_hash)
missing_parameter = (1..3).detect { |key| !values_hash.key?(key) }
if missing_parameter
raise ArgumentError, missing_parameter
missing_parameters = (1..3).select { |key| !values_hash.key?(key) }
if missing_parameters.any?
raise ArgumentError, "Provided hash #{values_hash} doesn't contain necessary keys: #{missing_parameters}"
end
super
end

11
activemodel/test/cases/type/date_time_test.rb
View file

@ -25,6 +25,17 @@ module ActiveModel
end
end
def test_hash_to_time
type = Type::DateTime.new
assert_equal ::Time.utc(2018, 10, 15, 0, 0, 0), type.cast(1 => 2018, 2 => 10, 3 => 15)
end
def test_hash_with_wrong_keys
type = Type::DateTime.new
error = assert_raises(ArgumentError) { type.cast(a: 1) }
assert_equal "Provided hash {:a=>1} doesn't contain necessary keys: [1, 2, 3]", error.message
end
private
def with_timezone_config(default:)