Changeset 1324

Timestamp:

01/25/08 20:55:38 (10 months ago)

Author:

has.s..@gmail.com

Message:

Fixes an issue with :yields in the spec helpers where it was being passed through to the controller params

Files:

• trunk/lib/merb/test/helper.rb (modified) (1 diff)

trunk/lib/merb/test/helper.rb

@@ -41 +41 @@
-        response = StringIO.new
-        
+        yield_to_controller = opts.delete(:yields)
+        
-        request = opts.delete(:fake_request) || Merb::Test::FakeRequest.with(path_with_options(path, opts), :request_method => (verb.to_s.upcase rescue 'GET'))
-
-        yield_to_controller = opts.delete(:yields)
-        
-        if yield_to_controller == :controller
-          request_yielding_controller(request, response, &block)