diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 4 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 7b5614afc5..c263f0700d 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that :get, :post, and the others should take a flash array as the third argument just like process #1144 [rails@cogentdude.com] + * Fixed a problem with Flash.now * Fixed stringification on all assigned hashes. The sacrifice is that assigns[:person] won't work in testing. Instead assigns["person"] or assigns(:person) must be used. In other words, the keys of assigns stay strings but we've added a method-based accessor to appease the need for symbols. diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index a68887e8cc..f7dc275c2f 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -258,9 +258,9 @@ module Test # execute the request simulating a specific http method and set/volley the response %w( get post put delete head ).each do |method| class_eval <<-EOV - def #{method}(action, parameters = nil, session = nil) + def #{method}(action, parameters = nil, session = nil, flash = nil) @request.env['REQUEST_METHOD'] = "#{method.upcase}" - process(action, parameters, session) + process(action, parameters, session, flash) end EOV end diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 59eb437c45..5f206f5472 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -146,6 +146,9 @@ module ActiveRecord # Please note that because eager loading is fetching both models and associations in the same grab, it doesn't make sense to use the # :limit property and it will be ignored if attempted. # + # Also have in mind that since the eager loading is pulling from multiple tables, you'll have to disambiguate any column references + # in both conditions and orders. So :order => "posts.id DESC" will work while :order => "id DESC" will not. + # # == Modules # # By default, associations will look for objects within the current module scope. Consider: |