Changeset 1285

Timestamp:

01/11/08 22:43:57 (8 months ago)

Author:

has.s..@gmail.com

Message:

Adds some helper methods for multipart testing. Most notably multipart_post, and multipart_put.

See specs/merb/multipart_spec.rb for details.

Files:

• trunk/app_generators/merb/templates/spec/spec_helper.rb (modified) (1 diff)
• trunk/lib/merb/test/multipart.rb (modified) (2 diffs)
• trunk/spec/merb/multipart_spec.rb (modified) (1 diff)
• trunk/spec/spec_helper.rb (modified) (1 diff)

trunk/app_generators/merb/templates/spec/spec_helper.rb

@@ -10 +10 @@
-    config.include(Merb::Test::Helper)
-    config.include(Merb::Test::RspecMatchers)
+    config.include(Merb::Test::Multipart::TestHelper)
-end
-

trunk/lib/merb/test/multipart.rb

@@ -39 +39 @@
-        end
-        
-
+, prefix = nil
-          params.sort_by {|k| k.to_s}.each do |key, value|
+            param_key = prefix.nil? ? key : "#{prefix}[#{key}]"
-            if value.respond_to?(:read)
-
+param_
-            else
-
+
+
+
+
+
+
+
-            end
-          end
@@ -53 +60 @@
-          return query, CONTENT_TYPE
-        end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end    
-  end

trunk/spec/merb/multipart_spec.rb

@@ -48 +48 @@
-  end
-end
+
+require 'tempfile'
+require File.dirname(__FILE__) + '/../fixtures/controllers/render_spec_controllers'
+
+describe Merb::Test::Multipart::TestHelper do
+  
+  before(:each) do
+    @path = "/render_object_controller/render_object.xml"
+    Merb::Router.prepare { |r| r.default_routes }
+    @mp = Merb::Test::Multipart::Post 
+    @file = Tempfile.new("spec_file.stuff")
+  end  
+  
+  it "should setup a multipart request" do
+    multipart_request(@path, :foo => 'bario')
+    controller.params.keys.should include("foo")
+    controller.params["foo"].should == "bario"
+  end
+  
+  it "should take a nested hash and do the right thing" do
+    multipart_request(@path, :foo => "bario", :bar => { :a => "a", :b => "b"})
+    controller.params.keys.should include("foo")
+    controller.params.keys.should include("bar")
+    controller.params["foo"].should == "bario"
+    controller.params["bar"].should be_a_kind_of(Mash)
+    controller.params["bar"]["a"].should == "a"
+    controller.params["bar"]["b"].should == "b"
+  end
+  
+  it "should take a nested hash with a file upload and do the right thing" do
+    multipart_request(@path, :bar => { :a => 'a', :my_file => @file})
+    controller.params.keys.should include('bar')
+    controller.params["bar"].keys.should include('a')
+    controller.params["bar"].keys.should include('my_file')
+    controller.params["bar"]["a"].should == "a"
+    
+    controller.params["bar"]["my_file"].should be_a_kind_of(Mash)
+    
+    file_params = controller.params["bar"]["my_file"]
+    file_params["filename"].should == @file.path.split("/").last
+    file_params["size"].should == 0
+    file_params["tempfile"].should be_a_kind_of(File)
+  end
+  
+  it "should expose the controller inside the block" do
+    multipart_request(@path, :foo => "bar") do
+      controller.should_receive(:dispatch).and_return(true)
+    end    
+  end
+  
+  it "should post the information to the controller" do
+    multipart_post(@path, :foo => "bar")
+    controller.params["foo"].should == "bar"
+    controller.request.should be_post
+  end
+  
+  it "should put the information to the controller" do
+    multipart_put(@path, :foo => "bar")
+    controller.params["foo"].should == "bar"
+    controller.request.should be_put
+  end
+  
+end

trunk/spec/spec_helper.rb

@@ -21 +21 @@
-  config.include(Merb::Test::Helper)
-  config.include(Merb::Test::RspecMatchers)
+  config.include(Merb::Test::Multipart::TestHelper)
-  # config.include(Merb::Test::MerbRspecControllerRedirect)  
-end