aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-05-04 22:27:17 -0300
committerJeremy Kemper <jeremy@bitsweat.net>2010-05-12 09:31:30 -0700
commit42fa2714c5005bb50679bf9a081d8bf0774f7eec (patch)
tree426fdef0c657efd5646d0da0c2b25f880e50e278 /activeresource
parent7321a3a7d314585093d08c098eca38afd3b57b00 (diff)
downloadrails-42fa2714c5005bb50679bf9a081d8bf0774f7eec.tar.gz
rails-42fa2714c5005bb50679bf9a081d8bf0774f7eec.tar.bz2
rails-42fa2714c5005bb50679bf9a081d8bf0774f7eec.zip
Make use of to_xml and to_json in tests
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/test/cases/base_test.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb
index 2ed7e1c95f..e5f556962b 100644
--- a/activeresource/test/cases/base_test.rb
+++ b/activeresource/test/cases/base_test.rb
@@ -1009,7 +1009,10 @@ class BaseTest < Test::Unit::TestCase
def test_to_xml
matz = Person.find(1)
- xml = matz.encode
+ encode = matz.encode
+ xml = matz.to_xml
+
+ assert encode, xml
assert xml.include?('<?xml version="1.0" encoding="UTF-8"?>')
assert xml.include?('<name>Matz</name>')
assert xml.include?('<id type="integer">1</id>')
@@ -1019,9 +1022,11 @@ class BaseTest < Test::Unit::TestCase
Person.include_root_in_json = true
Person.format = :json
joe = Person.find(6)
- json = joe.encode
+ encode = joe.encode
+ json = joe.to_json
Person.format = :xml
+ assert encode, json
assert_match %r{^\{"person":\{"person":\{}, json
assert_match %r{"id":6}, json
assert_match %r{"name":"Joe"}, json