From 5de072c73082d901cc319a810fe6159065c26257 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Sat, 12 Jul 2014 02:58:43 -0700
Subject: [PATCH] Added failing test case for #16131

---
 .../core_ext/object/json_cherry_pick_test.rb  | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 activesupport/test/core_ext/object/json_cherry_pick_test.rb

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 00000000000..2f7ea3a4972
--- /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