Changeset 1296

Timestamp:

01/14/08 03:46:45 (9 months ago)

Author:

has.s..@gmail.com

Message:

Reverts behaviour of the request test helper method to previous behaviour, but adds an option
to allow yielding of controllers.

Usage:
get(path){|request| ... }
get(path, :yields => :controller){|controller| ...}

You can also supply a fake request to use.
get(path, :yields => :controller, :fake_request => @my_fake_request){|controller| ... }

Files:

• trunk/lib/merb/test/helper.rb (modified) (7 diffs)
• trunk/spec/merb/multipart_spec.rb (modified) (3 diffs)
• trunk/spec/merb/request_spec.rb (modified) (1 diff)

trunk/lib/merb/test/helper.rb

@@ -16 +16 @@
-      
-      # For integration/functional testing
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        response = StringIO.new
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      # Makes a get request routed to +path+ with any options encoded into the 
-      # request url
@@ -33 +58 @@
-      # }}}
-      def get(path, opts = {}, &block)
-
+
+
-      end
-      
@@ -43 +69 @@
-      # }}}
-      def post(path, opts = {}, &block)
-
+
+
-      end
-      
@@ -53 +80 @@
-      # }}}
-      def put(path,opts = {}, &block)
-
+
+
-      end
-      
@@ -62 +90 @@
-      # }}}
-      def delete(path, opts= {}, &block)
-
+
+
-      end
-            
@@ -149 +178 @@
-      protected
-      
+      def request_yielding_request(request, response, &block)
+        # response = StringIO.new
+        # @request = Merb::Test::FakeRequest.with(path, :request_method => (verb.to_s.upcase rescue 'GET'))
+        @request = request
+        
+        yield @request if block_given?
+      
+        @controller, @action = Merb::Dispatcher.handle @request, response
+      end
+      
+      def request_yielding_controller(request, response, &block)
+        # response = StringIO.new
+        # @request = Merb::Test::FakeRequest.with(path, :request_method => (verb.to_s.upcase rescue 'GET'))
+        @request = Merb::Request.new(request)
+
+        check_request_for_route(@request)
+        
+        dispatch_fake_request(@request, response, &block)
+      end
+      
-      def multipart_request(path, params = {}, &block)
-        response = StringIO.new
@@ -165 +214 @@
-      end
-      
+      # Used for yielding a controller with request and multipart helpers
-      def dispatch_fake_request(request, response, status = 200, &block)
-        klass = request.controller_class

trunk/spec/merb/multipart_spec.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'tempfile'
-
-describe Merb::Test::Multipart::Param, '.to_multipart' do
@@ -17 +16 @@
-
-describe Merb::Test::Multipart::Post, '.push_params(params) param parsing' do
- :each
+(:each)
-    @fake_return_param = mock('fake return_param')
-  end
-
+
-  it "should create Param from params when param doesn't respond to read" do
-    params = { 'normal' => 'normal_param' }
@@ -50 +49 @@
-end
-
-describe Merb::Test::Helper, "Multipart form helpers" 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/merb/request_spec.rb

@@ -273 +273 @@
-    request.method.should == :get
-  end
+
-  
-  it "multipart_params should return an empty hash if the request is not multipart" do