Changeset 8978

Timestamp:

03/03/08 06:42:24 (3 months ago)

Author:

nzkoz

Message:

Allow file uploads in Integration Tests. Closes #11091 [RubyRedRick]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/integration.rb (modified) (4 diffs)
• trunk/actionpack/test/controller/integration_upload_test.rb (added)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow file uploads in Integration Tests.  Closes #11091 [RubyRedRick]
-
-* Refactor partial rendering into a PartialTemplate class. [Pratik]

trunk/actionpack/lib/action_controller/integration.rb

@@ -56 +56 @@
-      attr_accessor :request_count
-
+      class MultiPartNeededException < Exception
+      end
+
-      # Create and initialize a new +Session+ instance.
-      def initialize
@@ -295 +298 @@
-          parse_result
-          return status
+        rescue MultiPartNeededException
+          boundary = "----------XnJLe9ZIbbGUYtzPQJ16u1"
+          status = process(method, path, multipart_body(parameters, boundary), (headers || {}).merge({"CONTENT_TYPE" => "multipart/form-data; boundary=#{boundary}"}))
+          return status
-        end
-
@@ -343 +350 @@
-        # be a string, +nil+, or a Hash.
-        def requestify(parameters, prefix=nil)
-
+
+
+
-            return nil if parameters.empty?
-            parameters.map { |k,v| requestify(v, name_with_prefix(prefix, k)) }.join("&")
@@ -353 +362 @@
-            "#{CGI.escape(prefix)}=#{CGI.escape(parameters.to_s)}"
-          end
+        end
+
+        def multipart_requestify(params, first=true)
+          returning Hash.new do |p|
+            params.each do |key, value|
+              k = first ? CGI.escape(key.to_s) : "[#{CGI.escape(key.to_s)}]"
+              if Hash === value
+                multipart_requestify(value, false).each do |subkey, subvalue|
+                  p[k + subkey] = subvalue
+                end
+              else
+                p[k] = value
+              end
+            end
+          end
+        end
+
+        def multipart_body(params, boundary)
+          multipart_requestify(params).map do |key, value|
+            if value.respond_to?(:original_filename)
+              File.open(value.path) do |f|
+                <<-EOF
+--#{boundary}\r
+Content-Disposition: form-data; name="#{key}"; filename="#{CGI.escape(value.original_filename)}"\r
+Content-Type: #{value.content_type}\r
+Content-Length: #{File.stat(value.path).size}\r
+\r
+#{f.read}\r
+EOF
+              end
+            else
+<<-EOF
+--#{boundary}\r
+Content-Disposition: form-data; name="#{key}"\r
+\r
+#{value}\r
+EOF
+            end
+          end.join("")+"--#{boundary}--\r"
-        end
-    end