aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorJosh Kalderimis <josh.kalderimis@gmail.com>2011-04-19 00:01:50 +0200
committerJosh Kalderimis <josh.kalderimis@gmail.com>2011-04-19 00:01:50 +0200
commit1d8be7bc6f098b829ac14ef457af688043975ddc (patch)
treed0358a42fe6312d6d06a9d35a109716cdf75aa19 /activesupport/test
parente019587e31abe66416c0b5d26b6ac177b345a727 (diff)
downloadrails-1d8be7bc6f098b829ac14ef457af688043975ddc.tar.gz
rails-1d8be7bc6f098b829ac14ef457af688043975ddc.tar.bz2
rails-1d8be7bc6f098b829ac14ef457af688043975ddc.zip
AS Json parse_error makes a return for backwards compatibility, although it will return MultiJson::DecodeError
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/json/decoding_test.rb2
1 files changed, 1 insertions, 1 deletions
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