diff options
author | David Chelimsky <dchelimsky@gmail.com> | 2010-04-17 14:52:37 -0500 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-04-17 15:59:10 -0400 |
commit | 4327ad51abfddde822766702d154df11bd5b47a3 (patch) | |
tree | 387edf55bcc5241e02f2764d14691e3b285f1d1c /actionpack/lib | |
parent | d4d352bf94f8d2b6fc5684706ed2b33da77203fd (diff) | |
download | rails-4327ad51abfddde822766702d154df11bd5b47a3.tar.gz rails-4327ad51abfddde822766702d154df11bd5b47a3.tar.bz2 rails-4327ad51abfddde822766702d154df11bd5b47a3.zip |
access assigns as a method or hash, with strings or symbols [#4431 state:resolved]
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/test_process.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb index d4eecac2de..79f309cae7 100644 --- a/actionpack/lib/action_dispatch/testing/test_process.rb +++ b/actionpack/lib/action_dispatch/testing/test_process.rb @@ -3,13 +3,13 @@ require 'action_dispatch/middleware/flash' module ActionDispatch module TestProcess def assigns(key = nil) - assigns = {} + assigns = {}.with_indifferent_access @controller.instance_variable_names.each do |ivar| next if ActionController::Base.protected_instance_variables.include?(ivar) assigns[ivar[1..-1]] = @controller.instance_variable_get(ivar) end - key.nil? ? assigns : assigns[key.to_s] + key.nil? ? assigns : assigns[key] end def session |