aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-03-27 02:24:47 +0000
committerRick Olson <technoweenie@gmail.com>2006-03-27 02:24:47 +0000
commit3f496c66384160ba8eedd8f0e04aca4c9161aedb (patch)
tree91a8f7fe81c845d14924e7dcab3fe2eb3c31b937 /actionpack/lib
parent89352096293fbbd2077197dba8db18d97b939cba (diff)
downloadrails-3f496c66384160ba8eedd8f0e04aca4c9161aedb.tar.gz
rails-3f496c66384160ba8eedd8f0e04aca4c9161aedb.tar.bz2
rails-3f496c66384160ba8eedd8f0e04aca4c9161aedb.zip
add the TestCase.fixture_path when testing file uploads
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4058 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/test_process.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 267263c364..0afe3f82fc 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -436,7 +436,7 @@ module ActionController #:nodoc:
# post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png')
def fixture_file_upload(path, mime_type = nil)
ActionController::TestUploadedFile.new(
- Test::Unit::TestCase.respond_to?(:fixture_path) ? Test::Unit::TestCase + path : path,
+ Test::Unit::TestCase.respond_to?(:fixture_path) ? Test::Unit::TestCase.fixture_path + path : path,
mime_type
)
end