AS Json parse_error makes a return for backwards compatibility, although it will return MultiJson::DecodeError

2 files changed, 5 insertions, 1 deletions

diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb
index ac99f180a5..cbeb6c0a28 100644
--- a/activesupport/lib/active_support/json/decoding.rb
+++ b/activesupport/lib/active_support/json/decoding.rb
@@ -34,6 +34,10 @@ module ActiveSupport
         self.backend = old_backend
       end
 
+      def parse_error
+        MultiJson::DecodeError
+      end
+
       private
 
       def convert_dates_from(data)
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index 0e6772e284..6ccffa59b1 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -82,7 +82,7 @@ class TestJSONDecoding < ActiveSupport::TestCase
   end
 
   def test_failed_json_decoding
-    assert_raise(MultiJson::DecodeError) { ActiveSupport::JSON.decode(%({: 1})) }
+    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%({: 1})) }
   end
 end