diff options
| author | José Valim <jose.valim@gmail.com> | 2011-10-02 11:28:48 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-10-02 11:29:13 +0200 |
| commit | 6e8fe1bf021139a2fbd06a10778ad2c6b67930ef (patch) | |
| tree | 2f03dd143a8210bffaeb3bf400d43a284f31ed35 /actionpack/lib/abstract_controller | |
| parent | 63f6da050acb1108a3f22c2bd393a8c2c05caeea (diff) | |
| download | rails-6e8fe1bf021139a2fbd06a10778ad2c6b67930ef.tar.gz rails-6e8fe1bf021139a2fbd06a10778ad2c6b67930ef.tar.bz2 rails-6e8fe1bf021139a2fbd06a10778ad2c6b67930ef.zip | |
TestCase should respect the view_assigns API instead of pulling variables on its own.
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index ab2c532859..41fdc11196 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -120,8 +120,6 @@ module AbstractController view_renderer.render(view_context, options) end - private - DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w( @_action_name @_response_body @_formats @_prefixes @_config @_view_context_class @_view_renderer @_lookup_context @@ -139,6 +137,8 @@ module AbstractController hash end + private + # Normalize args and options. # :api: private def _normalize_render(*args, &block) |