From f76e27555df9cb86cd20158a1198a132a45f3916 Mon Sep 17 00:00:00 2001 From: Kuldeep Aggarwal Date: Sun, 4 May 2014 22:37:55 +0530 Subject: Remove deprecated file(`active_support/core_ext/object/to_json.rb`) and its test case. --- activesupport/lib/active_support/core_ext/object/to_json.rb | 5 ----- activesupport/test/core_ext/object/json_test.rb | 9 --------- 2 files changed, 14 deletions(-) delete mode 100644 activesupport/lib/active_support/core_ext/object/to_json.rb delete mode 100644 activesupport/test/core_ext/object/json_test.rb diff --git a/activesupport/lib/active_support/core_ext/object/to_json.rb b/activesupport/lib/active_support/core_ext/object/to_json.rb deleted file mode 100644 index f58364f9c6..0000000000 --- a/activesupport/lib/active_support/core_ext/object/to_json.rb +++ /dev/null @@ -1,5 +0,0 @@ -ActiveSupport::Deprecation.warn 'You have required `active_support/core_ext/object/to_json`. ' \ - 'This file will be removed in Rails 4.2. You should require `active_support/core_ext/object/json` ' \ - 'instead.' - -require 'active_support/core_ext/object/json' \ No newline at end of file diff --git a/activesupport/test/core_ext/object/json_test.rb b/activesupport/test/core_ext/object/json_test.rb deleted file mode 100644 index d3d31530df..0000000000 --- a/activesupport/test/core_ext/object/json_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'abstract_unit' - -class JsonTest < ActiveSupport::TestCase - # See activesupport/test/json/encoding_test.rb for JSON encoding tests - - def test_deprecated_require_to_json_rb - assert_deprecated { require 'active_support/core_ext/object/to_json' } - end -end -- cgit v1.2.3