Vendor new Rack::Mock changes

2 files changed, 2 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb
index f088e91de4..ce161ef846 100644
--- a/actionpack/lib/action_controller/testing/integration.rb
+++ b/actionpack/lib/action_controller/testing/integration.rb
@@ -263,7 +263,7 @@ module ActionController
               string << "#{name}=#{value}; "
             }
           }
-          env = ActionDispatch::Test::MockRequest.env_for(path, opts)
+          env = Rack::MockRequest.env_for(path, opts)
 
           (headers || {}).each do |key, value|
             key = key.to_s.upcase.gsub(/-/, "_")
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index a2bb9afaa5..3a7445f890 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -250,7 +250,7 @@ module ActionController #:nodoc:
   #
   # Pass a true third parameter to ensure the uploaded file is opened in binary mode (only required for Windows):
   #   post :change_avatar, :avatar => ActionController::TestUploadedFile.new(ActionController::TestCase.fixture_path + '/files/spongebob.png', 'image/png', :binary)
-  TestUploadedFile = ActionDispatch::Test::UploadedFile
+  TestUploadedFile = Rack::Utils::Multipart::UploadedFile
 
   module TestProcess
     def self.included(base)