1 files changed, 33 insertions, 13 deletions

diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index b698b4cfec..757e4cf77c 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -99,10 +99,15 @@ module ActionView
       end
 
       def render(options = {}, local_assigns = {}, &block)
-        @rendered << output = _view.render(options, local_assigns, &block)
+        view.assign(_assigns)
+        @rendered << output = view.render(options, local_assigns, &block)
         output
       end
 
+      def locals
+        @locals ||= {}
+      end
+
       included do
         setup :setup_with_controller
       end
@@ -132,36 +137,51 @@ module ActionView
         end
       end
 
-      def _view
-        @_view ||= begin
-                     view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
+      module Locals
+        attr_accessor :locals
+
+        def _render_partial(options)
+          locals[options[:partial]] = options[:locals]
+          super(options)
+        end
+      end
+
+      # The instance of ActionView::Base that is used by +render+.
+      def view
+        @view ||= begin
+                     view = ActionView::Base.new(ActionController::Base.view_paths, {}, @controller)
                      view.singleton_class.send :include, _helpers
                      view.singleton_class.send :include, @controller._router.url_helpers
                      view.singleton_class.send :delegate, :alert, :notice, :to => "request.flash"
+                     view.extend(Locals)
+                     view.locals = self.locals
                      view.output_buffer = self.output_buffer
                      view
                    end
       end
 
+      alias_method :_view, :view
+
       EXCLUDE_IVARS = %w{
+        @_assertion_wrapped
         @_result
+        @controller
+        @layouts
+        @locals
+        @method_name
         @output_buffer
+        @partials
         @rendered
+        @request
+        @routes
         @templates
-        @view_context_class
-        @layouts
-        @partials
-        @controller
-
-        @method_name
-        @fixture_cache
-        @loaded_fixtures
         @test_passed
+        @view
+        @view_context_class
       }
 
       def _instance_variables
         instance_variables - EXCLUDE_IVARS
-        instance_variables
       end
 
       def _assigns