aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-02-05 10:16:30 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-02-05 10:22:45 -0800
commit63bb955a99eb46e257655c93dd64e86ebbf05651 (patch)
tree034b65b1706964e402f5c9622be27f87be2de352 /activesupport/test
parenta96bf4ab5e73fccdafb78b99e8a122cc2172b505 (diff)
downloadrails-63bb955a99eb46e257655c93dd64e86ebbf05651.tar.gz
rails-63bb955a99eb46e257655c93dd64e86ebbf05651.tar.bz2
rails-63bb955a99eb46e257655c93dd64e86ebbf05651.zip
Automatically prefer Yajl or JSON backend over Yaml, if available
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 fbd75a8966..d2e3efaa6b 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -45,7 +45,7 @@ class TestJSONDecoding < ActiveSupport::TestCase
}
# load the default JSON backend
- ActiveSupport::JSON.backend
+ ActiveSupport::JSON.backend = 'Yaml'
backends = %w(Yaml)
backends << "JSONGem" if defined?(::JSON)