diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-08-29 05:57:11 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-08-29 05:57:11 -0700 |
| commit | 0b3a078a24819fae8b9df0b0f63a264cece70a7c (patch) | |
| tree | 6b5b51f8a024b87c596bc162fd3c8b6b11dd383c /actionpack/test/controller | |
| parent | a7b845c27f32b6e00a7bf87aa555c41808b3e1a8 (diff) | |
| parent | 7de994fa215e9f4c2856d85034bc4dd7b65d0c01 (diff) | |
| download | rails-0b3a078a24819fae8b9df0b0f63a264cece70a7c.tar.gz rails-0b3a078a24819fae8b9df0b0f63a264cece70a7c.tar.bz2 rails-0b3a078a24819fae8b9df0b0f63a264cece70a7c.zip | |
Merge pull request #12062 from strzalek/default-protected-vars
Port all remaining self.protected_instance_variables to class methods
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/filters_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb index 3b5d7ef446..e58a1aadb8 100644 --- a/actionpack/test/controller/filters_test.rb +++ b/actionpack/test/controller/filters_test.rb @@ -17,7 +17,7 @@ class ActionController::Base def assigns(key = nil) assigns = {} instance_variables.each do |ivar| - next if ActionController::Base.protected_instance_variables.include?(ivar) + next if ActionController::Base.default_protected_instance_vars.include?(ivar) assigns[ivar[1..-1]] = instance_variable_get(ivar) end |