@@ -1,3 +1,4 @@ +* [#101] Update to file upload testing (build_file -> file_for_upload, and multipart support in put) * [#96] Distributed Views module now uses file cache * [#92] Removed deprecated app_config.orm code. * [#91] Fixed Mack blowing up if there is no config/initializers/gems.rb file. CHANGELOG @@ -1,7 +1,7 @@ require 'base64' module Mack module Testing - class FileWrapper + class FileWrapper # :nodoc: attr_reader :path attr_reader :file_name lib/mack/testing/file.rb @@ -80,10 +80,16 @@ module Mack # Performs a 'put' request for the specified uri. def put(uri, options = {}) - build_response(request.put(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.put(uri, build_request_options({:input => options.to_params}))) + end end - def build_file(path) + # create a wrapper object for file upload testing. + def file_for_upload(path) return Mack::Testing::FileWrapper.new(path) end lib/mack/testing/helpers.rb @@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper' describe "File Upload Request" do 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' + post upload_file_url, :multipart => true, :file0 => file_for_upload(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 @@ -11,7 +11,7 @@ describe "File Upload Request" do 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")) + post upload_multiple_url, :multipart => true, :file0 => file_for_upload(File.join(File.dirname(__FILE__), "images", "homer_brain.jpg")), :file1 => file_for_upload(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" test/unit/controller/file_upload_spec.rb afc26c3570fb97c4509caf7c25ef923d8a46f8d0 dsutedja dsutedja@helium.com http://github.com/markbates/mack/commit/c48498d7606d3484506fc0d9ef5382c561d421c5 c48498d7606d3484506fc0d9ef5382c561d421c5 2008-08-18T05:31:41-07:00 2008-08-18T05:31:41-07:00 Update to file upload testing [#101 state:resolved] 944118836ae8dd7764696c9df7f938753312cfe5 dsutedja dsutedja@helium.com