diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-01-13 13:28:14 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-13 13:28:28 -0800 |
| commit | 0932b012fae2ff21214f610a0fd78a55ae4e2420 (patch) | |
| tree | 82b521a5ddf17c3bc4fd7762c95d49f29d31de15 /actionpack/lib/action_controller/test_process.rb | |
| parent | 6fe739ad752aeeaaf274ced6111685d2d6ed2eb8 (diff) | |
| parent | 5a43908c7414996354ca427354d98d789e0210e7 (diff) | |
| download | rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.tar.gz rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.tar.bz2 rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.zip | |
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 8180d4ee93..22b97fc157 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -484,7 +484,8 @@ module ActionController #:nodoc: # # post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png', :binary) def fixture_file_upload(path, mime_type = nil, binary = false) - ActionController::TestUploadedFile.new("#{ActionController::TestCase.try(:fixture_path)}#{path}", mime_type, binary) + fixture_path = ActionController::TestCase.send(:fixture_path) if ActionController::TestCase.respond_to?(:fixture_path) + ActionController::TestUploadedFile.new("#{fixture_path}#{path}", mime_type, binary) end # A helper to make it easier to test different route configurations. |