Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 9 insertions, 2 deletions

diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
index 4c82b75cdc..4e7aa63f96 100644
--- a/actionpack/test/template/body_parts_test.rb
+++ b/actionpack/test/template/body_parts_test.rb
@@ -4,9 +4,12 @@ class BodyPartsTest < ActionController::TestCase
   RENDERINGS = [Object.new, Object.new, Object.new]
 
   class TestController < ActionController::Base
+    def performed?
+      defined?(ActionController::Http) ? true : super
+    end
     def index
       RENDERINGS.each do |rendering|
-        response.template.punctuate_body! rendering
+        @template.punctuate_body! rendering
       end
       @performed_render = true
     end
@@ -16,7 +19,11 @@ class BodyPartsTest < ActionController::TestCase
 
   def test_body_parts
     get :index
-    assert_equal RENDERINGS, @response.body_parts
+    pending(:old_base) do
+      # TestProcess buffers body_parts into body
+      # TODO: Rewrite test w/o going through process
+      assert_equal RENDERINGS, @response.body_parts
+    end
     assert_equal RENDERINGS.join, @response.body
   end
 end