aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/json
diff options
context:
space:
mode:
authorBrian Lopez <seniorlopez@gmail.com>2010-01-26 08:40:35 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-02-05 10:15:51 -0800
commita96bf4ab5e73fccdafb78b99e8a122cc2172b505 (patch)
tree3c2f89d4903b4d69f7248e1a7d36030c6ce6c04c /activesupport/test/json
parentc548e213658386f3a5b00097bc5b30bf3736e6b4 (diff)
downloadrails-a96bf4ab5e73fccdafb78b99e8a122cc2172b505.tar.gz
rails-a96bf4ab5e73fccdafb78b99e8a122cc2172b505.tar.bz2
rails-a96bf4ab5e73fccdafb78b99e8a122cc2172b505.zip
Add yajl-ruby as a JSON parsing backend
[#2666 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activesupport/test/json')
-rw-r--r--activesupport/test/json/decoding_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index 8fcb16abfb..fbd75a8966 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -49,6 +49,7 @@ class TestJSONDecoding < ActiveSupport::TestCase
backends = %w(Yaml)
backends << "JSONGem" if defined?(::JSON)
+ backends << "Yajl" if defined?(::Yajl)
backends.each do |backend|
TESTS.each do |json, expected|