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, 3 insertions, 3 deletions

diff --git a/actionpack/test/abstract_controller/helper_test.rb b/actionpack/test/abstract_controller/helper_test.rb
index 6284fa4f70..f91aefe606 100644
--- a/actionpack/test/abstract_controller/helper_test.rb
+++ b/actionpack/test/abstract_controller/helper_test.rb
@@ -4,8 +4,8 @@ module AbstractController
   module Testing
   
     class ControllerWithHelpers < AbstractController::Base
-      use Renderer
-      use Helpers
+      include Renderer
+      include Helpers
       
       def render(string)
         super(:_template_name => string)
@@ -35,7 +35,7 @@ module AbstractController
     class TestHelpers < ActiveSupport::TestCase
       def test_helpers
         result = MyHelpers1.process(:index)
-        assert_equal "Hello World : Included", result.response_obj[:body]
+        assert_equal "Hello World : Included", result.response_body
       end
     end