Changeset 1286

Timestamp:

01/12/08 00:52:49 (8 months ago)

Author:

has.s..@gmail.com

Message:

Adds allows for the get, post, put, and delete helpers to yield the controller instead of the request.

This allows for stubbing on the controller prior to dispatching the action.

Files:

• trunk/lib/merb/test/helper.rb (modified) (4 diffs)
• trunk/lib/merb/test/multipart.rb (modified) (1 diff)
• trunk/spec/merb/multipart_spec.rb (modified) (1 diff)
• trunk/spec/spec_helper.rb (modified) (1 diff)

trunk/lib/merb/test/helper.rb

@@ -1 +1 @@
-require 'merb/test/fake_request'
-require 'merb/test/hpricot'
+require 'merb/test/multipart'
-include HpricotTestHelper
-
@@ -15 +16 @@
-      
-      # For integration/functional testing
-
+, &block
-        response = StringIO.new
-        @request = Merb::Test::FakeRequest.with(path, :request_method => (verb.to_s.upcase rescue 'GET'))
-
-
-
-@controller, @action = Merb::Dispatcher.handle @request, response
-end
-
+      @request = Merb::Request.new(@request)
+
+      check_request_for_route(@request)
+
+  dispatch_fake_request(@request, response, &block)
+
-      
-      # Makes a get request routed to +path+ with any options encoded into the 
@@ -62 +63 @@
-      def delete(path, opts= {}, &block)
-        request("DELETE", path_with_options(path,opts), &block)
+      end
+            
+      # Posts multipart form data to a path
+      # pass the +path+ to send and the parameters.  For file uploads, just include a file as the option value.
+      # ===Example
+      # multipart_post("/my_collection", :foo => "bar", :user => { :login => "joe", :image => File.open("my_image.png")})
+      def multipart_post(path, params = {}, &block)
+        multipart_request(path, params.merge!(:request_method => 'POST'), &block)
+      end
+
+      # Posts multipart form data to a path
+      # Same as +multipart_post+ but used for PUT(ting) data to the server
+      def multipart_put(path, params = {}, &block)
+        multipart_request(path, params.merge!(:request_method => 'PUT'), &block)
-      end
-      
@@ -131 +146 @@
-        path
-      end
+      
+      protected
+      
+      def multipart_request(path, params = {}, &block)
+        response = StringIO.new
+        request = request_with_multipart_params(path, params)
+        check_request_for_route(request)
+        dispatch_fake_request(request, response, &block)
+      end
+      
+      
+      def check_request_for_route(request)
+        if request.route_params.empty?
+          raise ControllerExceptions::BadRequest, "No routes match the request"
+        elsif request.controller_name.nil?
+          raise ControllerExceptions::BadRequest, "Route matched, but route did not specify a controller" 
+        end
+      end
+      
+      def dispatch_fake_request(request, response, &block)
+        klass = request.controller_class
+        @controller = klass.build(request, response, 200)
+        
+        @controller.send(:setup_session)
+        @controller.stub!(:setup_session).and_return(true)
+        
+        yield @controller if block_given?
+
+        @controller.dispatch(request.action)
+        [@controller, request.action]
+        
+        rescue => exception
+          exception = Dispatcher.send(:controller_exception, exception)
+          Dispatcher.send(:dispatch_exception, request, response, exception)
+      end
+      
+      def request_with_multipart_params(path, params = {})
+        request_method = params.delete(:request_method) || "GET"
+        request = Merb::Test::FakeRequest.new(:request_uri => path)
+        m = Merb::Test::Multipart::Post.new(params)
+        body, head = m.to_multipart
+        request['REQUEST_METHOD'] = request_method
+        request['CONTENT_TYPE'] = head
+        request['CONTENT_LENGTH'] = body.length
+        request.post_body = body
+        Merb::Request.new(request)
+      end
+      
-    end
-  end

trunk/lib/merb/test/multipart.rb

@@ -61 +61 @@
-        end
-      end 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    end    
-  end

trunk/spec/merb/multipart_spec.rb

@@ -52 +52 @@
-require File.dirname(__FILE__) + '/../fixtures/controllers/render_spec_controllers'
-
-Multipart::TestHelper
+Helper, "Multipart form helpers"
-  
-  before(:each) do

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