Properly set content type of uploaded file

Uses MIME::Types library to guess the content type
Kosmas · Jan 7, 2010 · 43f39b9 · 43f39b9
1 parent fe6f5a1
commit 43f39b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Rakefile b/Rakefile
@@ -15,6 +15,7 @@ Hoe.spec 'capybara' do
 
   self.extra_deps = [
     ['nokogiri', '>= 1.3.3'],
+    ['mime-types', '>= 1.16'],
     ['culerity', '>= 0.2.4'],
     ['selenium-webdriver', '>= 0.0.3'],
     ['rack', '>= 1.0.0'],

diff --git a/lib/capybara/driver/rack_test_driver.rb b/lib/capybara/driver/rack_test_driver.rb
@@ -1,4 +1,5 @@
 require 'rack/test'
+require 'mime/types'
 require 'nokogiri'
 require 'cgi'
 
@@ -86,7 +87,9 @@ def params(button)
       node.xpath(".//input[@type='file']").map do |input|
         unless input['value'].to_s.empty?
           if multipart?
-            merge_param!(params, input['name'].to_s, Rack::Test::UploadedFile.new(input['value'].to_s))
+            content_type = MIME::Types.type_for(input['value'].to_s).first.to_s
+            file = Rack::Test::UploadedFile.new(input['value'].to_s, content_type)
+            merge_param!(params, input['name'].to_s, file)
           else
             merge_param!(params, input['name'].to_s, File.basename(input['value'].to_s))
           end