diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-04-30 14:40:46 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-04-30 14:40:46 -0500 |
commit | 64e66cf161ee8db0bdbccb1be18fb760f5a9d24e (patch) | |
tree | 3ae960609c335291abc737b62b1344b520c8927a /actionpack/lib/action_controller/testing/process.rb | |
parent | 9bac470c7ac7bc15830a66f416358d8efc74a39d (diff) | |
download | rails-64e66cf161ee8db0bdbccb1be18fb760f5a9d24e.tar.gz rails-64e66cf161ee8db0bdbccb1be18fb760f5a9d24e.tar.bz2 rails-64e66cf161ee8db0bdbccb1be18fb760f5a9d24e.zip |
Vendor new Rack::Mock changes
Diffstat (limited to 'actionpack/lib/action_controller/testing/process.rb')
-rw-r--r-- | actionpack/lib/action_controller/testing/process.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |