diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-09-29 14:35:24 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-09-29 14:35:24 -0300 |
| commit | 6371e5b99f933ebe462784b5272fdf12e9602e5a (patch) | |
| tree | e221b722f6b195d1ea46cbb6b4f761dbb05beaa8 | |
| parent | c37800aae123d21d53a49433cac2e0a2479c6bbd (diff) | |
| download | rails-6371e5b99f933ebe462784b5272fdf12e9602e5a.tar.gz rails-6371e5b99f933ebe462784b5272fdf12e9602e5a.tar.bz2 rails-6371e5b99f933ebe462784b5272fdf12e9602e5a.zip | |
We can't assign @view_context_class here, define super() in test instead if we want to avoid warnings.
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/filters_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 918def3e81..5d9b35d297 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -66,7 +66,7 @@ module AbstractController attr_writer :view_context_class def view_context_class - @view_context_class ||= self.class.view_context_class + @view_context_class || self.class.view_context_class end def initialize(*) diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb index d13ebc705a..dfc90943e1 100644 --- a/actionpack/test/controller/filters_test.rb +++ b/actionpack/test/controller/filters_test.rb @@ -314,6 +314,7 @@ class FilterTest < ActionController::TestCase def initialize @@execution_log = "" + super() end before_filter { |c| c.class.execution_log << " before procfilter " } |