diff options
author | José Valim <jose.valim@gmail.com> | 2011-05-01 11:14:38 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-05-01 13:40:12 +0200 |
commit | bebaccdf4a3a17f2ead349cca891032e245655ff (patch) | |
tree | b0c1e7f663862251b58248a520478a99ed503635 /actionpack/lib/action_view/test_case.rb | |
parent | d08f65118cc328de5493a68db33a155487f5fceb (diff) | |
download | rails-bebaccdf4a3a17f2ead349cca891032e245655ff.tar.gz rails-bebaccdf4a3a17f2ead349cca891032e245655ff.tar.bz2 rails-bebaccdf4a3a17f2ead349cca891032e245655ff.zip |
Remove dependency from _template.
Diffstat (limited to 'actionpack/lib/action_view/test_case.rb')
-rw-r--r-- | actionpack/lib/action_view/test_case.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb index 5c74bf843a..14e032790d 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -147,9 +147,19 @@ module ActionView module Locals attr_accessor :locals - def _render_partial(options) - locals[options[:partial]] = options[:locals] - super(options) + def render(options = {}, local_assigns = {}) + case options + when Hash + if block_given? + locals[options[:layout]] = options[:locals] + elsif options.key?(:partial) + locals[options[:partial]] = options[:locals] + end + else + locals[options] = local_assigns + end + + super end end |