let (array|hash)/conversions.rb load the extensions in object/to_(par…

…am|query).rb
rails · Oct 9, 2012 · 0787cea · 0787cea
1 parent 3395633
commit 0787cea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -1,6 +1,8 @@
 require 'active_support/xml_mini'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/object/to_param'
+require 'active_support/core_ext/object/to_query'
 
 class Array
   # Converts the array to a comma-separated sentence where the last element is

diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -1,8 +1,10 @@
 require 'active_support/xml_mini'
 require 'active_support/time'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/to_param'
+require 'active_support/core_ext/object/to_query'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/reverse_merge'
-require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/inflections'
 
 class Hash

diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
@@ -5,8 +5,6 @@
 require 'active_support/ordered_hash'
 require 'active_support/core_ext/object/deep_dup'
 require 'active_support/inflections'
-require 'active_support/core_ext/object/to_param'
-require 'active_support/core_ext/object/to_query'
 
 class HashExtTest < ActiveSupport::TestCase
   class IndifferentHash < HashWithIndifferentAccess