diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-04-18 13:02:37 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-04-18 13:02:37 -0700 |
| commit | d32a4cbaa5174cc1a73d41a73f55145251c18c84 (patch) | |
| tree | 16e3ad82102aa6d290b8941dd69e27b1efaf14f6 /actionpack/lib/action_dispatch/testing | |
| parent | c16c248912e4ae3b6a64e6acdbf1a1e0dd2feb26 (diff) | |
| parent | 8c7e8976e97d96f514e22b04fc1afb9453134076 (diff) | |
| download | rails-d32a4cbaa5174cc1a73d41a73f55145251c18c84.tar.gz rails-d32a4cbaa5174cc1a73d41a73f55145251c18c84.tar.bz2 rails-d32a4cbaa5174cc1a73d41a73f55145251c18c84.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
| -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 |