diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-04-19 09:43:47 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-04-19 09:43:47 -0500 |
| commit | d24d938af453d4a8bd0401c8456191530ecee433 (patch) | |
| tree | 18e802e29d90edc0efe0e8178e0e6b8f7df34631 /activesupport/test | |
| parent | 069e9b004f91c4ace1373ab5203bb00ab41bd1f9 (diff) | |
| parent | 011afb70e51c063de7685196bcace55ddf0dc67b (diff) | |
| download | rails-d24d938af453d4a8bd0401c8456191530ecee433.tar.gz rails-d24d938af453d4a8bd0401c8456191530ecee433.tar.bz2 rails-d24d938af453d4a8bd0401c8456191530ecee433.zip | |
Merge branch 'joshk-multi_json'
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/json/decoding_test.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb index 88cf97de7e..6ccffa59b1 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| |