From d6524d78687b39c72e0814e61b80e3e6b6d9997e Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Tue, 9 Oct 2012 21:14:11 +0200
Subject: refactor `ActionView::TestCase` internals to track rendered locals

this refactoring extracts the semi complex data structure of rendered locals
per view into into a separate class
---
 actionpack/lib/action_controller/test_case.rb | 13 +++------
 actionpack/lib/action_view/test_case.rb       | 40 +++++++++++++++++++--------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 6aa43edf47..d911d47a1d 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -123,17 +123,12 @@ module ActionController
 
         if expected_partial = options[:partial]
           if expected_locals = options[:locals]
-            if defined?(@_locals)
-              actual_locals_collection = @_locals[expected_partial.to_s.sub(/^_/,'')]
-              result = actual_locals_collection.any? do |actual_locals|
-                expected_locals.each_pair.all? do |k,v|
-                  v == actual_locals[k]
-                end
-              end
+            if defined?(@_rendered_views)
+              view = expected_partial.to_s.sub(/^_/,'')
               msg = 'expecting %s to be rendered with %s but was with %s' % [expected_partial,
                                                                              expected_locals,
-                                                                             actual_locals_collection]
-              assert(result, msg)
+                                                                             @_rendered_views.locals_for(view)]
+              assert(@_rendered_views.view_rendered?(view, options[:locals]), msg)
             else
               warn "the :locals option to #assert_template is only supported in a ActionView::TestCase"
             end
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 6e5a3a63ca..a548b44780 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -119,8 +119,29 @@ module ActionView
         output
       end
 
-      def locals
-        @_locals ||= {}
+      def rendered_views
+        @_rendered_views ||= RenderedViewsCollection.new
+      end
+
+      class RenderedViewsCollection
+        def initialize
+          @rendered_views ||= {}
+        end
+
+        def add(view, locals)
+          @rendered_views[view] ||= []
+          @rendered_views[view] << locals
+        end
+
+        def locals_for(view)
+          @rendered_views[view]
+        end
+
+        def view_rendered?(view, expected_locals)
+          locals_for(view).any? do |actual_locals|
+            expected_locals.all? {|key, value| value == actual_locals[key] }
+          end
+        end
       end
 
       included do
@@ -156,21 +177,18 @@ module ActionView
       end
 
       module Locals
-        attr_accessor :locals
+        attr_accessor :rendered_views
 
         def render(options = {}, local_assigns = {})
           case options
           when Hash
             if block_given?
-              locals[options[:layout]] ||= []
-              locals[options[:layout]] << options[:locals]
+              rendered_views.add options[:layout], options[:locals]
             elsif options.key?(:partial)
-              locals[options[:partial]] ||= []
-              locals[options[:partial]] << options[:locals]
+              rendered_views.add options[:partial], options[:locals]
             end
           else
-            locals[options] ||= []
-            locals[options] << local_assigns
+            rendered_views.add options, local_assigns
           end
 
           super
@@ -183,7 +201,7 @@ module ActionView
           view = @controller.view_context
           view.singleton_class.send :include, _helpers
           view.extend(Locals)
-          view.locals = self.locals
+          view.rendered_views = self.rendered_views
           view.output_buffer = self.output_buffer
           view
         end
@@ -200,7 +218,7 @@ module ActionView
         :@_routes,
         :@controller,
         :@_layouts,
-        :@_locals,
+        :@_rendered_views,
         :@method_name,
         :@output_buffer,
         :@_partials,
-- 
cgit v1.2.3