Merge branch 'master' of git@github.com:rails/rails

actionpack/lib/action_controller/components.rb

@@ -39,12 +39,7 @@ module ActionController #:nodoc:
       base.class_eval do
         include InstanceMethods
         extend ClassMethods
-
-        helper do
-          def render_component(options)
-            @controller.send!(:render_component_as_string, options)
-          end
-        end
+        helper HelperMethods
 
         # If this controller was instantiated to process a component request,
         # +parent_controller+ points to the instantiator of this controller.
@@ -67,6 +62,12 @@ module ActionController #:nodoc:
       end
     end
 
+    module HelperMethods
+      def render_component(options)
+        @controller.send!(:render_component_as_string, options)
+      end
+    end
+
     module InstanceMethods
       # Extracts the action_name from the request parameters and performs that action.
       def process_with_components(request, response, method = :perform_action, *arguments) #:nodoc:

actionpack/test/controller/dispatcher_test.rb

@@ -41,7 +41,7 @@ class DispatcherTest < Test::Unit::TestCase
     CGI.expects(:new).raises('some multipart parsing failure')
 
     ActionController::Routing::Routes.stubs(:reload)
-    Dispatcher.stubs(:log_failsafe_exception)
+    Dispatcher.any_instance.stubs(:log_failsafe_exception)
 
     assert_nothing_raised { dispatch }