diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 18:17:08 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 18:17:08 -0700 |
commit | ad2a1b5cb1afb0ea810cfdcac2ba1be95c55f1aa (patch) | |
tree | 6742641152bab4be99a6c032168c7cb067dedfc1 /actionpack/lib/action_controller/testing | |
parent | 7dd072d333040d2bb1197baa55fddfb9b72053bd (diff) | |
download | rails-ad2a1b5cb1afb0ea810cfdcac2ba1be95c55f1aa.tar.gz rails-ad2a1b5cb1afb0ea810cfdcac2ba1be95c55f1aa.tar.bz2 rails-ad2a1b5cb1afb0ea810cfdcac2ba1be95c55f1aa.zip |
Get render :inline working
Diffstat (limited to 'actionpack/lib/action_controller/testing')
-rw-r--r-- | actionpack/lib/action_controller/testing/process2.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/process2.rb b/actionpack/lib/action_controller/testing/process2.rb index d9af7add5f..67b5afb9c5 100644 --- a/actionpack/lib/action_controller/testing/process2.rb +++ b/actionpack/lib/action_controller/testing/process2.rb @@ -49,7 +49,7 @@ module ActionController @request.session = ActionController::TestSession.new(session) unless session.nil? @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash build_request_uri(action, parameters) - + @controller.params.merge!(parameters) # Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest @controller.process_with_test(@request, @response) end |