aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/test_case.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2012-10-09 21:14:11 +0200
committerYves Senn <yves.senn@garaio.com>2012-10-11 08:47:10 +0200
commitd6524d78687b39c72e0814e61b80e3e6b6d9997e (patch)
treeb7400c5569e4f718e42f10a2c964b16331bcac2c /actionpack/lib/action_view/test_case.rb
parented9567401dfc7b476bf9ccac82826fc63283f708 (diff)
downloadrails-d6524d78687b39c72e0814e61b80e3e6b6d9997e.tar.gz
rails-d6524d78687b39c72e0814e61b80e3e6b6d9997e.tar.bz2
rails-d6524d78687b39c72e0814e61b80e3e6b6d9997e.zip
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
Diffstat (limited to 'actionpack/lib/action_view/test_case.rb')
-rw-r--r--actionpack/lib/action_view/test_case.rb40
1 files changed, 29 insertions, 11 deletions
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,