diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-10-16 12:05:00 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-10-16 12:05:00 +0200 |
| commit | 74bf8afb9fb92b4c45ffdd37b91e0580b86c1590 (patch) | |
| tree | cd1e97e5892422300e7b1cf9190fc308b10cb7a5 /activesupport/test/core_ext | |
| parent | d1fb675a104d5ee07ce786c7b99be9897a0ea766 (diff) | |
| download | rails-74bf8afb9fb92b4c45ffdd37b91e0580b86c1590.tar.gz rails-74bf8afb9fb92b4c45ffdd37b91e0580b86c1590.tar.bz2 rails-74bf8afb9fb92b4c45ffdd37b91e0580b86c1590.zip | |
Revert "remove unnecessary object/conversions file"
This file is used at least by Active Merchant, its existence
is maybe not necessary but no big deal either.
This reverts commit ae9b3d7cecd77b9ace38671b183e1a360bf632b6.
Diffstat (limited to 'activesupport/test/core_ext')
| -rw-r--r-- | activesupport/test/core_ext/array_ext_test.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/core_ext/hash_ext_test.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb index 0b33a63460..9dfa2cbf11 100644 --- a/activesupport/test/core_ext/array_ext_test.rb +++ b/activesupport/test/core_ext/array_ext_test.rb @@ -1,6 +1,7 @@ require 'abstract_unit' require 'active_support/core_ext/array' require 'active_support/core_ext/big_decimal' +require 'active_support/core_ext/object/conversions' require 'active_support/core_ext' # FIXME: pulling in all to_xml extensions require 'active_support/hash_with_indifferent_access' diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index b208767490..7cfe7b0ea7 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -3,6 +3,7 @@ require 'active_support/core_ext/hash' require 'bigdecimal' require 'active_support/core_ext/string/access' require 'active_support/ordered_hash' +require 'active_support/core_ext/object/conversions' require 'active_support/core_ext/object/deep_dup' require 'active_support/inflections' |