lib/mack/testing/file.rb 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/file_upload_spec.rb test/unit/controller/images/homer_brain.jpg test/unit/controller/images/homer_brain2.jpg @@ -82,10 +82,19 @@ module Mack def put(uri, options = {}) build_response(request.put(uri, build_request_options({:input => options.to_params}))) end - + + def build_file(path) + return Mack::Testing::FileWrapper.new(path) + end + # Performs a 'post' request for the specified uri. def post(uri, options = {}) - build_response(request.post(uri, build_request_options({:input => options.to_params}))) + if options[:multipart] + 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}))) + else + build_response(request.post(uri, build_request_options({:input => options.to_params}))) + end end # Performs a 'delete' request for the specified uri. @@ -152,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 @@ -48,6 +48,19 @@ class TstAnotherController render(:text, love_you) end + def do_upload + file = request.file("file0") + @saved_file_name = file.file_name + @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 x = "" x << "from_string: foo=#{params["foo"]}\n" test/fake_application/app/controllers/tst_another_controller.rb @@ -24,6 +24,8 @@ Mack::Routes.build do |r| map.env '/env', :action => :env 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_multiple "/tst_another/upload_multiple", :action => :upload_multiple end r.with_options(:controller => "vtt/view_template") do |map| test/fake_application/config/routes.rb @@ -52,7 +52,7 @@ describe Mack::Request::UploadedFile do File.exists?(File.join(Mack.root, "tmp", @uploaded_file.file_name)).should == true File.exists?(@uploaded_file.temp_file.path).should_not == true end - + it "should raise error when destination path is not specified" do lambda { @uploaded_file.save }.should raise_error(ArgumentError) end test/unit/controller/uploaded_file_spec.rb 43f7ea16ad3d16545bfcbc378d5908ebd3fc03f1 afc26c3570fb97c4509caf7c25ef923d8a46f8d0 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/a34c8757220841422dd605fa1a91e87c9b92a530 a34c8757220841422dd605fa1a91e87c9b92a530 2008-08-15T15:02:47-07:00 2008-08-15T15:02:47-07:00 Merge branch 'master' of git@github.com:markbates/mack into date_selects * 'master' of git@github.com:markbates/mack: Distributed views module now uses file cache [#96] file upload testing [#15 state:resolved] file upload testing 83142e564c867c47f249de7aeab9a8ea2028b3a5 Mark Bates mark@markbates.com