diff options
| author | Yves Senn <yves.senn@gmail.com> | 2012-10-08 22:22:47 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@garaio.com> | 2012-10-11 08:46:49 +0200 |
| commit | ed9567401dfc7b476bf9ccac82826fc63283f708 (patch) | |
| tree | 4e9da4c25d623281aff8438a65934cd3526834a3 /actionpack/lib/action_view | |
| parent | cd98c25ebedc27fe892468bb87ea260fb070f5eb (diff) | |
| download | rails-ed9567401dfc7b476bf9ccac82826fc63283f708.tar.gz rails-ed9567401dfc7b476bf9ccac82826fc63283f708.tar.bz2 rails-ed9567401dfc7b476bf9ccac82826fc63283f708.zip | |
recognizes when a partial was rendered twice. Closes #3675
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/test_case.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb index 5434b3421e..6e5a3a63ca 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -120,7 +120,7 @@ module ActionView end def locals - @locals ||= {} + @_locals ||= {} end included do @@ -162,12 +162,15 @@ module ActionView case options when Hash if block_given? - locals[options[:layout]] = options[:locals] + locals[options[:layout]] ||= [] + locals[options[:layout]] << options[:locals] elsif options.key?(:partial) - locals[options[:partial]] = options[:locals] + locals[options[:partial]] ||= [] + locals[options[:partial]] << options[:locals] end else - locals[options] = local_assigns + locals[options] ||= [] + locals[options] << local_assigns end super @@ -197,7 +200,7 @@ module ActionView :@_routes, :@controller, :@_layouts, - :@locals, + :@_locals, :@method_name, :@output_buffer, :@_partials, |