Get controller/test_test.rb to pass on new base

actionpack/Rakefile

@@ -65,15 +65,14 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # ==== Not ported
   # * filters
   # * integration
-  # * test
   t.test_files = %w(
     action_pack_assertions addresses_render assert_select
     base benchmark caching capture content_type cookie dispatcher
     filter_params flash helper http_basic_authentication
     http_digest_authentication layout logging mime_responds
     record_identifier redirect render render_js render_json
     render_other render_xml request_forgery_protection rescue
-    resources routing selector send_file url_rewriter
+    resources routing selector send_file test url_rewriter
     verification view_paths webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true

actionpack/lib/action_controller/testing/process2.rb

@@ -51,9 +51,10 @@ def process(action, parameters = nil, session = nil, flash = nil, http_method =
 
       @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