Merge commit 'mainstream/master'

1 files changed, 22 insertions, 16 deletions

diff --git a/activeresource/test/cases/base/load_test.rb b/activeresource/test/cases/base/load_test.rb
index 1952f5b5f0..189a4d81fe 100644
--- a/activeresource/test/cases/base/load_test.rb
+++ b/activeresource/test/cases/base/load_test.rb
@@ -15,26 +15,21 @@ module Highrise
 
   module Deeply
     module Nested
-
       class Note < ActiveResource::Base
         self.site = "http://37s.sunrise.i:3000"
       end
 
-       class Comment < ActiveResource::Base
-         self.site = "http://37s.sunrise.i:3000"
-       end
-
-       module TestDifferentLevels
-
-         class Note < ActiveResource::Base
-           self.site = "http://37s.sunrise.i:3000"
-         end
-
-       end
+      class Comment < ActiveResource::Base
+        self.site = "http://37s.sunrise.i:3000"
+      end
 
+      module TestDifferentLevels
+        class Note < ActiveResource::Base
+          self.site = "http://37s.sunrise.i:3000"
+        end
+      end
     end
   end
-
 end
 
 
@@ -68,6 +63,19 @@ class BaseLoadTest < Test::Unit::TestCase
     assert_equal @matz.stringify_keys, @person.load(@matz).attributes
   end
 
+  def test_after_load_attributes_are_accessible
+    assert_equal Hash.new, @person.attributes
+    assert_equal @matz.stringify_keys, @person.load(@matz).attributes
+    assert_equal @matz[:name], @person.attributes['name']
+  end
+
+  def test_after_load_attributes_are_accessible_via_indifferent_access
+    assert_equal Hash.new, @person.attributes
+    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
     assert_kind_of StreetAddress, address
@@ -143,7 +151,7 @@ class BaseLoadTest < Test::Unit::TestCase
     assert_kind_of String, places.first
     assert_equal @deep[:street][:state][:places].first, places.first
   end
-  
+
   def test_nested_collections_within_the_same_namespace
     n = Highrise::Note.new(:comments => [{ :name => "1" }])
     assert_kind_of Highrise::Comment, n.comments.first
@@ -158,6 +166,4 @@ class BaseLoadTest < Test::Unit::TestCase
     n = Highrise::Deeply::Nested::TestDifferentLevels::Note.new(:comments => [{ :name => "1" }])
     assert_kind_of Highrise::Deeply::Nested::Comment, n.comments.first
   end
-
-
 end