test/fake_application/app/views/tst_another/do_upload.html.erb test/fake_application/app/views/tst_another/upload_multiple.html.erb test/unit/controller/images/homer_brain2.jpg @@ -1,4 +1,4 @@ -* [#68] Removed const redefined warnings if mack-l10n is used along with mack-activerecord +* [#15] File upload testing support (ability to do multipart form post in testing) * [#88] Implemented pending SQLite3 tests in mack-activerecord * [#68] Transactional support in mack-AR * [#87] Refactored out common ORM code from mack-active_record and mack-data_mapper into mack-orm @@ -16,6 +16,7 @@ * [#74] Added optional feature to disable initialization logging. * [#73] Tests no longer use the functional/unit directories * [#69] Added ViewHelperGenerator and ControllerHelperGenerator +* [#68] Removed const redefined warnings if mack-l10n is used along with mack-activerecord * [#67] Added test:setup tasks for active_record and data_mapper * [#39] HAML 2.0.2 support * [#28] Refactored out encryption into the mack-encryption gem. CHANGELOG @@ -7,12 +7,20 @@ module Mack attr_reader :file_name attr_reader :content attr_reader :size + attr_reader :mime def initialize(path) @path = path @file_name = File.basename(path) + extension = File.extname(path) + extension = extension.gsub!(".", "") + if extension and !extension.empty? + @mime = Mack::Utils::MimeTypes.instance.get(extension) if extension + else + @mime = "application/octet-stream" + end raw_content = File.read(path) - @content = Base64.encode64(raw_content) + @content = Base64.encode64(raw_content).strip @size = @content.size end end lib/mack/testing/file.rb @@ -86,33 +86,12 @@ module Mack def build_file(path) return Mack::Testing::FileWrapper.new(path) end - + # Performs a 'post' request for the specified uri. def post(uri, options = {}) if options[:multipart] - form_input = "" - boundary = "--Mack-boundary\r\n" - options.each_pair do |k, v| - if v.kind_of?(Mack::Testing::FileWrapper) - form_input += boundary - form_input += "content-disposition: form-data; name=\"#{k}\"; filename=\"#{v.file_name}\"\r\n" - form_input += "Content-Type: application/octet-stream\r\n\r\n" - form_input += "#{v.content}\r\n" - elsif k != :multipart - form_input += boundary - form_input += "content-disposition: form-data; name=\"#{k}\"\r\n" - form_input += "Content-Type: text/plain\r\n\r\n" - form_input += "#{v}\r\n" - end - end - - form_input += boundary + "\r\n" - # request.env_for("/", - # "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x", - # "CONTENT_LENGTH" => form_input.size) - # build_response(request.post(uri, build_request_options({:input => form_input}))) + form_input = build_multipart_data(options) build_response(request.post(uri, build_request_options({"CONTENT_TYPE" => "multipart/form-data, boundary=Mack-boundary", "CONTENT_LENGTH" => form_input.size, :input => form_input}))) - # build_response(request.post(uri, build_request_options({:content_type => "multipart/form-data, boundary=Mack-boundary", :content_length => form_input.size, :input => form_input}))) else build_response(request.post(uri, build_request_options({:input => options.to_params}))) end @@ -182,6 +161,28 @@ module Mack end private + + def build_multipart_data(options) + form_input = "" + boundary = "--Mack-boundary\r\n" + options.each_pair do |k, v| + if v.kind_of?(Mack::Testing::FileWrapper) + form_input += boundary + form_input += "content-disposition: form-data; name=\"#{k}\"; filename=\"#{v.file_name}\"\r\n" + form_input += "Content-Type: #{v.mime}\r\n\r\n" + form_input += "#{v.content}\r\n" + elsif k != :multipart + form_input += boundary + form_input += "content-disposition: form-data; name=\"#{k}\"\r\n" + form_input += "Content-Type: text/plain\r\n\r\n" + form_input += "#{v}\r\n" + end + end + form_input += boundary + return form_input + end + + def test_cookies @test_cookies = {} if @test_cookies.nil? @test_cookies lib/mack/testing/helpers.rb @@ -49,10 +49,16 @@ class TstAnotherController end def do_upload - debugger file = request.file("file0") @saved_file_name = file.file_name - redirect_to(upload_successful_url) + @album = params[:album] + end + + def upload_multiple + file = request.file("file0") + @saved_file1 = file.file_name.dup + file = request.file("file1") + @saved_file2 = file.file_name.dup end def regardless_of_string_or_symbol test/fake_application/app/controllers/tst_another_controller.rb @@ -25,7 +25,7 @@ Mack::Routes.build do |r| map.kill_kenny_no_meth "/tst_another/kill_kenny", :action => :kill_kenny map.kill_kenny_bad "/tst_another/kill_kenny_bad", :action => :kill_kenny_bad map.upload_file "/tst_another/do_upload", :action => :do_upload - map.upload_successful "/tst_another/upload_successful" + map.upload_multiple "/tst_another/upload_multiple", :action => :upload_multiple end r.with_options(:controller => "vtt/view_template") do |map| test/fake_application/config/routes.rb @@ -2,8 +2,19 @@ require 'pathname' require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper' describe "File Upload Request" do - it "should handle multipart content properly" do - post upload_file_url, :multipart => true, :file0 => build_file(File.join(File.dirname(__FILE__), "images", "homer_brain.jpg")) - pp response + it "should generate proper multipart content" do + post upload_file_url, :multipart => true, :file0 => build_file(File.join(File.dirname(__FILE__), "images", "homer_brain.jpg")), :album => 'simpsons' + assigns(:saved_file_name).should_not be_nil + assigns(:saved_file_name).should == "homer_brain.jpg" + assigns(:album).should_not be_nil + assigns(:album).should == "simpsons" + end + + it "should be able to upload multiple files" do + post upload_multiple_url, :multipart => true, :file0 => build_file(File.join(File.dirname(__FILE__), "images", "homer_brain.jpg")), :file1 => build_file(File.join(File.dirname(__FILE__), "images", "homer_brain2.jpg")) + assigns(:saved_file1).should_not be_nil + assigns(:saved_file2).should_not be_nil + assigns(:saved_file1).should == "homer_brain.jpg" + assigns(:saved_file2).should == "homer_brain2.jpg" end end \ No newline at end of file test/unit/controller/file_upload_spec.rb test/fake_application/app/views/tst_another/upload_successful.html.erb e8b236b2ef78a838448edc36d4141985620bceb6 dsutedja dsutedja@helium.com http://github.com/markbates/mack/commit/f634e81de2541bfbfbf8232592c5409ad06b4112 f634e81de2541bfbfbf8232592c5409ad06b4112 2008-08-15T14:00:00-07:00 2008-08-15T14:00:00-07:00 file upload testing [#15 state:resolved] de23838b8f10a555a627dbff0b95135bc09653f2 dsutedja dsutedja@helium.com