removed AS backends and instead rely on MultiJson for json decoding

1 files changed, 4 insertions, 7 deletions

diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index 88cf97de7e..0e6772e284 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -56,12 +56,9 @@ class TestJSONDecoding < ActiveSupport::TestCase
     %q({"a":"Line1\u000aLine2"}) => {"a"=>"Line1\nLine2"}
   }
 
-  # load the default JSON backend
-  ActiveSupport::JSON.backend = 'Yaml'
-
-  backends = %w(Yaml)
-  backends << "JSONGem" if defined?(::JSON)
-  backends << "Yajl" if defined?(::Yajl)
+  backends = [:ok_json]
+  backends << :json_gem if defined?(::JSON)
+  backends << :yajl if defined?(::Yajl)
 
   backends.each do |backend|
     TESTS.each do |json, expected|
@@ -85,7 +82,7 @@ class TestJSONDecoding < ActiveSupport::TestCase
   end
 
   def test_failed_json_decoding
-    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%({: 1})) }
+    assert_raise(MultiJson::DecodeError) { ActiveSupport::JSON.decode(%({: 1})) }
   end
 end