diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/upload.rb | 8 | ||||
| -rw-r--r-- | actionpack/test/dispatch/uploaded_file_test.rb | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb index 42da35edec..d50c8cad17 100644 --- a/actionpack/lib/action_dispatch/http/upload.rb +++ b/actionpack/lib/action_dispatch/http/upload.rb @@ -12,13 +12,9 @@ module ActionDispatch @headers = hash[:head] end - def read(*args) - @tempfile.read(*args) - end - # Delegate these methods to the tempfile. - [:open, :close, :path, :rewind, :size, :eof?].each do |method| - class_eval "def #{method}; @tempfile.#{method}; end" + [:read, :open, :close, :path, :rewind, :size, :eof?].each do |method| + class_eval "def #{method}(*args); @tempfile.#{method}(*args); end" end private diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb index c921a16a4f..f72afe745c 100644 --- a/actionpack/test/dispatch/uploaded_file_test.rb +++ b/actionpack/test/dispatch/uploaded_file_test.rb @@ -51,6 +51,12 @@ module ActionDispatch assert_equal 'thunderhorse', uf.close end + def test_close_accepts_parameter + tf = Class.new { def close(optional = false); "thunderhorse: #{optional}" end } + uf = Http::UploadedFile.new(:tempfile => tf.new) + assert_equal 'thunderhorse: true', uf.close(true) + end + def test_delegates_to_tempfile tf = Class.new { def read; 'thunderhorse' end } uf = Http::UploadedFile.new(:tempfile => tf.new) |