aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/testing/process2.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/testing/process2.rb')
-rw-r--r--actionpack/lib/action_controller/testing/process2.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/process2.rb b/actionpack/lib/action_controller/testing/process2.rb
index 677dd41781..1c6fd2d80a 100644
--- a/actionpack/lib/action_controller/testing/process2.rb
+++ b/actionpack/lib/action_controller/testing/process2.rb
@@ -51,9 +51,10 @@ 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.request = @request
@controller.params.merge!(parameters)
+ build_request_uri(action, parameters)
# Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
@controller.process_with_new_base_test(@request, @response)
@response