aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Chelimsky <dchelimsky@gmail.com>2010-06-22 09:45:44 -0500
committerJosé Valim <jose.valim@gmail.com>2010-06-22 17:15:56 +0200
commitf29fb0dd9ef3e563f9813ee09e7a9b826f70e3f2 (patch)
tree85850fadb7f2905bc8481a68ef4a50fc08642bac /actionpack
parent12a9e8479958bcada73b3df6b254ce69cb02305c (diff)
downloadrails-f29fb0dd9ef3e563f9813ee09e7a9b826f70e3f2.tar.gz
rails-f29fb0dd9ef3e563f9813ee09e7a9b826f70e3f2.tar.bz2
rails-f29fb0dd9ef3e563f9813ee09e7a9b826f70e3f2.zip
update the list of instance variables that are excluded from assigns in view tests
[#4930 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/test_case.rb19
1 files changed, 10 insertions, 9 deletions
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index fcfbb92157..00c7386d23 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -159,24 +159,25 @@ module ActionView
end
EXCLUDE_IVARS = %w{
+ @_assertion_wrapped
@_result
+ @_view
+ @controller
+ @layouts
+ @locals
+ @method_name
@output_buffer
+ @partials
@rendered
+ @request
+ @routes
@templates
- @view_context_class
- @layouts
- @partials
- @controller
-
- @method_name
- @fixture_cache
- @loaded_fixtures
@test_passed
+ @view_context_class
}
def _instance_variables
instance_variables - EXCLUDE_IVARS
- instance_variables
end
def _assigns