diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-19 05:10:55 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-19 05:10:55 -0700 |
| commit | 792910bb69078ff1d14a6384b50e51aba2aae2dd (patch) | |
| tree | 705defb52d5ac6eb903e97334de718defc7ba4e3 /actionpack/lib/action_dispatch/testing | |
| parent | e00c72c9718e518eb99058781f6ee71fa46b38fe (diff) | |
| parent | ad4615e97896428ca140411081442f1b5e7d6089 (diff) | |
| download | rails-792910bb69078ff1d14a6384b50e51aba2aae2dd.tar.gz rails-792910bb69078ff1d14a6384b50e51aba2aae2dd.tar.bz2 rails-792910bb69078ff1d14a6384b50e51aba2aae2dd.zip | |
Merge commit 'rails/master'
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 |