updated all the tests in ARes to work with json

1 files changed, 16 insertions, 15 deletions

diff --git a/activeresource/test/cases/base/load_test.rb b/activeresource/test/cases/base/load_test.rb
index 228dc36d9b..d6b04cfaa8 100644
--- a/activeresource/test/cases/base/load_test.rb
+++ b/activeresource/test/cases/base/load_test.rb
@@ -36,10 +36,10 @@ class BaseLoadTest < Test::Unit::TestCase
   def setup
     @matz  = { :id => 1, :name => 'Matz' }
 
-    @first_address = { :id => 1, :street => '12345 Street' }
-    @addresses = [@first_address, { :id => 2, :street => '67890 Street' }]
-    @addresses_from_xml = { :street_addresses => @addresses }
-    @addresses_from_xml_single = { :street_addresses => [ @first_address ] }
+    @first_address = { :address => { :id => 1, :street => '12345 Street' } }
+    @addresses = [@first_address, { :address => { :id => 2, :street => '67890 Street' } }]
+    @addresses_from_json = { :street_addresses => @addresses }
+    @addresses_from_json_single = { :street_addresses => [ @first_address ] }
 
     @deep  = { :id => 1, :street => {
       :id => 1, :state => { :id => 1, :name => 'Oregon',
@@ -72,28 +72,29 @@ class BaseLoadTest < Test::Unit::TestCase
 
   def test_after_load_attributes_are_accessible_via_indifferent_access
     assert_equal Hash.new, @person.attributes
+    matz_attributes = @matz.values.first
     assert_equal @matz.stringify_keys, @person.load(@matz).attributes
     assert_equal @matz[:name], @person.attributes['name']
     assert_equal @matz[:name], @person.attributes[:name]
   end
 
   def test_load_one_with_existing_resource
-    address = @person.load(:street_address => @first_address).street_address
+    address = @person.load(:street_address => @first_address.values.first).street_address
     assert_kind_of StreetAddress, address
-    assert_equal @first_address.stringify_keys, address.attributes
+    assert_equal @first_address.values.first.stringify_keys, address.attributes
   end
 
   def test_load_one_with_unknown_resource
-    address = silence_warnings { @person.load(:address => @first_address).address }
+    address = silence_warnings { @person.load(@first_address).address }
     assert_kind_of Person::Address, address
-    assert_equal @first_address.stringify_keys, address.attributes
+    assert_equal @first_address.values.first.stringify_keys, address.attributes
   end
 
   def test_load_collection_with_existing_resource
-    addresses = @person.load(@addresses_from_xml).street_addresses
+    addresses = @person.load(@addresses_from_json).street_addresses
     assert_kind_of Array, addresses
     addresses.each { |address| assert_kind_of StreetAddress, address }
-    assert_equal @addresses.map(&:stringify_keys), addresses.map(&:attributes)
+    assert_equal @addresses.map { |a| a[:address].stringify_keys }, addresses.map(&:attributes)
   end
 
   def test_load_collection_with_unknown_resource
@@ -102,14 +103,14 @@ class BaseLoadTest < Test::Unit::TestCase
     addresses = silence_warnings { @person.load(:addresses => @addresses).addresses }
     assert Person.const_defined?(:Address), "Address should have been autocreated"
     addresses.each { |address| assert_kind_of Person::Address, address }
-    assert_equal @addresses.map(&:stringify_keys), addresses.map(&:attributes)
+    assert_equal @addresses.map { |a| a[:address].stringify_keys }, addresses.map(&:attributes)
   end
 
   def test_load_collection_with_single_existing_resource
-    addresses = @person.load(@addresses_from_xml_single).street_addresses
+    addresses = @person.load(@addresses_from_json_single).street_addresses
     assert_kind_of Array, addresses
     addresses.each { |address| assert_kind_of StreetAddress, address }
-    assert_equal [ @first_address ].map(&:stringify_keys), addresses.map(&:attributes)
+    assert_equal [ @first_address.values.first ].map(&:stringify_keys), addresses.map(&:attributes)
   end
 
   def test_load_collection_with_single_unknown_resource
@@ -118,7 +119,7 @@ class BaseLoadTest < Test::Unit::TestCase
     addresses = silence_warnings { @person.load(:addresses => [ @first_address ]).addresses }
     assert Person.const_defined?(:Address), "Address should have been autocreated"
     addresses.each { |address| assert_kind_of Person::Address, address }
-    assert_equal [ @first_address ].map(&:stringify_keys), addresses.map(&:attributes)
+    assert_equal [ @first_address.values.first ].map(&:stringify_keys), addresses.map(&:attributes)
   end
 
   def test_recursively_loaded_collections
@@ -164,7 +165,7 @@ class BaseLoadTest < Test::Unit::TestCase
   end
 
   def test_nested_collections_within_the_same_namespace
-    n = Highrise::Note.new(:comments => [{ :name => "1" }])
+    n = Highrise::Note.new(:comments => [{ :comment => { :name => "1" } }])
     assert_kind_of Highrise::Comment, n.comments.first
   end