aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuldeep Aggarwal <kd.engineer@yahoo.co.in>2014-05-04 22:37:55 +0530
committerKuldeep Aggarwal <kd.engineer@yahoo.co.in>2014-05-04 22:37:55 +0530
commitf76e27555df9cb86cd20158a1198a132a45f3916 (patch)
treedaf676583d8b37cd49b975104e6fd3cf42ed9698
parent9b2b36fadbe05c395d6d8f51c247e51cb8766d0f (diff)
downloadrails-f76e27555df9cb86cd20158a1198a132a45f3916.tar.gz
rails-f76e27555df9cb86cd20158a1198a132a45f3916.tar.bz2
rails-f76e27555df9cb86cd20158a1198a132a45f3916.zip
Remove deprecated file(`active_support/core_ext/object/to_json.rb`) and its test case.
-rw-r--r--activesupport/lib/active_support/core_ext/object/to_json.rb5
-rw-r--r--activesupport/test/core_ext/object/json_test.rb9
2 files changed, 0 insertions, 14 deletions
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