lib/webrat/merb_multipart_support.rb @@ -4,13 +4,7 @@ require "cgi" gem "extlib" require "extlib" require "merb-core" - -begin - # Require Merb::Test::MultipartRequestHelper with multipart support. - require "merb-core/two-oh" -rescue LoadError => e - # Maybe Merb got rid of this. We'll do more checking for multiparth support. -end +require "webrat/merb_multipart_support" # HashWithIndifferentAccess = Mash @@ -18,6 +12,10 @@ module Webrat class MerbSession < Session #:nodoc: include Merb::Test::MakeRequest + # Include Webrat's own version of multipart_post/put because the officially + # supported methods in Merb don't perform the request correctly. + include MerbMultipartSupport + attr_accessor :response def get(url, data, headers = nil) @@ -44,13 +42,11 @@ module Webrat @response.status end - include Merb::Test::MultipartRequestHelper - def do_request(url, data, headers, method) - if method == "POST" && supports_multipart? && has_file?(data) + if method == "POST" && has_file?(data) @response = multipart_post(url, data, :headers => headers) - elsif method == "PUT" && supports_multipart? && has_file?(data) + elsif method == "PUT" && has_file?(data) @response = multipart_put(url, data, :headers => headers) else @@ -63,13 +59,6 @@ module Webrat protected - # multipart_post and multipart_put which use request to do their - # business through multipart_request. Older implementations of - # multipart_post and multipart_put use the controller directly. - def supports_multipart? - respond_to?(:multipart_request) - end - # Recursively search the data for a file attachment. def has_file?(data) data.each do |key, value| lib/webrat/merb_session.rb 1769075c2547d613e8ea3349c5781d2bb3259b11 Ryan Carver ryan@fivesevensix.com http://github.com/brynary/webrat/commit/c11f4868a9fc85c966c811428405509e8f2f1c7b c11f4868a9fc85c966c811428405509e8f2f1c7b 2009-06-16T21:06:32-07:00 2009-06-16T12:43:17-07:00 Don't require merb-core/two-oh for multipart support. Instead, copy the code into Webrat a8745b2f50a636be2949d177354b77db1c4c5633 Bryan Helmkamp bryan@brynary.com