Merge commit 'origin/master' into savepoints

Conflicts:
	activerecord/lib/active_record/fixtures.rb
	activerecord/test/cases/defaults_test.rb

1 files changed, 14 insertions, 14 deletions

diff --git a/activeresource/test/format_test.rb b/activeresource/test/format_test.rb
index a564ee01b5..c3733e13d8 100644
--- a/activeresource/test/format_test.rb
+++ b/activeresource/test/format_test.rb
@@ -15,7 +15,7 @@ class FormatTest < Test::Unit::TestCase
     assert_equal 'Accept', header_name
 
     headers_names = [ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:put], ActiveResource::Connection::HTTP_FORMAT_HEADER_NAMES[:post]]
-    headers_names.each{|header_name| assert_equal 'Content-Type', header_name}
+    headers_names.each{ |name| assert_equal 'Content-Type', name }
   end
 
   def test_formats_on_single_element
@@ -85,20 +85,20 @@ class FormatTest < Test::Unit::TestCase
   end
 
   def test_serialization_of_nested_resource
-   address  = { :street => '12345 Street' }
-   person  = { :name=> 'Rus', :address => address}
+    address  = { :street => '12345 Street' }
+    person  = { :name=> 'Rus', :address => address}
 
-   [:json, :xml].each do |format|
-     encoded_person = ActiveResource::Formats[format].encode(person)
-     assert_match /12345 Street/, encoded_person
-     remote_person = Person.new(person.update({:address => StreetAddress.new(address)}))
-     assert_kind_of StreetAddress, remote_person.address
-     using_format(Person, format) do
-       ActiveResource::HttpMock.respond_to.post "/people.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, encoded_person, 201, {'Location' => "/people/5.#{format}"}
-       remote_person.save
-     end
-   end
- end
+    [:json, :xml].each do |format|
+      encoded_person = ActiveResource::Formats[format].encode(person)
+      assert_match(/12345 Street/, encoded_person)
+      remote_person = Person.new(person.update({:address => StreetAddress.new(address)}))
+      assert_kind_of StreetAddress, remote_person.address
+      using_format(Person, format) do
+        ActiveResource::HttpMock.respond_to.post "/people.#{format}", {'Content-Type' => ActiveResource::Formats[format].mime_type}, encoded_person, 201, {'Location' => "/people/5.#{format}"}
+        remote_person.save
+      end
+    end
+  end
 
   private
     def using_format(klass, mime_type_reference)