3 files changed, 64 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/object/json_cherry_pick_test.rb b/activesupport/test/core_ext/object/json_cherry_pick_test.rb
new file mode 100644
index 0000000000..2f7ea3a497
--- /dev/null
+++ b/activesupport/test/core_ext/object/json_cherry_pick_test.rb
@@ -0,0 +1,42 @@
+require 'abstract_unit'
+
+# These test cases were added to test that cherry-picking the json extensions
+# works correctly, primarily for dependencies problems reported in #16131. They
+# need to be executed in isolation to reproduce the scenario correctly, because
+# other test cases might have already loaded additional dependencies.
+
+class JsonCherryPickTest < ActiveSupport::TestCase
+  include ActiveSupport::Testing::Isolation
+
+  def test_time_as_json
+    require_or_skip 'active_support/core_ext/object/json'
+
+    expected = Time.new(2004, 7, 25)
+    actual   = Time.parse(expected.as_json)
+
+    assert_equal expected, actual
+  end
+
+  def test_date_as_json
+    require_or_skip 'active_support/core_ext/object/json'
+
+    expected = Date.new(2004, 7, 25)
+    actual   = Date.parse(expected.as_json)
+
+    assert_equal expected, actual
+  end
+
+  def test_datetime_as_json
+    require_or_skip 'active_support/core_ext/object/json'
+
+    expected = DateTime.new(2004, 7, 25)
+    actual   = DateTime.parse(expected.as_json)
+
+    assert_equal expected, actual
+  end
+
+  private
+    def require_or_skip(file)
+      require(file) || skip("'#{file}' was already loaded")
+    end
+end
diff --git a/activesupport/test/core_ext/object/to_param_test.rb b/activesupport/test/core_ext/object/to_param_test.rb
index bd7c6c422a..25c3bf22c3 100644
--- a/activesupport/test/core_ext/object/to_param_test.rb
+++ b/activesupport/test/core_ext/object/to_param_test.rb
@@ -16,4 +16,16 @@ class ToParamTest < ActiveSupport::TestCase
     assert_equal true, true.to_param
     assert_equal false, false.to_param
   end
+
+  def test_array
+    # Empty Array
+    assert_equal '', [].to_param
+
+    array = [1, 2, 3, 4]
+    assert_equal "1/2/3/4", array.to_param
+
+    # Array of different objects
+    array = [1, '3', { a: 1, b: 2 }, nil, true, false]
+    assert_equal "1/3/a=1&b=2//true/false", array.to_param
+  end
 end
diff --git a/activesupport/test/core_ext/object/to_query_test.rb b/activesupport/test/core_ext/object/to_query_test.rb
index 47220e9509..09cab3ed35 100644
--- a/activesupport/test/core_ext/object/to_query_test.rb
+++ b/activesupport/test/core_ext/object/to_query_test.rb
@@ -65,6 +65,16 @@ class ToQueryTest < ActiveSupport::TestCase
       {a: [], b: 3}
   end
 
+  def test_hash_with_namespace
+    hash = { name: 'Nakshay', nationality: 'Indian' }
+    assert_equal "user%5Bname%5D=Nakshay&user%5Bnationality%5D=Indian", hash.to_query('user')
+  end
+
+  def test_hash_sorted_lexicographically
+    hash = { type: 'human', name: 'Nakshay' }
+    assert_equal "name=Nakshay&type=human", hash.to_query
+  end
+
   private
     def assert_query_equal(expected, actual)
       assert_equal expected.split('&'), actual.to_query.split('&')