Changeset 1313

Show
Ignore:
Timestamp:
01/16/08 03:00:10 (8 months ago)
Author:
has.s..@gmail.com
Message:

Fixes the request helper to accept an option hash.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/templates/script/destroy

    r1213 r1313  
    22APP_ROOT = File.join(File.dirname(__FILE__), '..') 
    33 
     4# required to overcome a callback in rspec 
    45def at_exit 
    56end 

  • trunk/app_generators/merb/templates/script/generate

    r1235 r1313  
    11#!/usr/bin/env ruby 
    22APP_ROOT = File.join(File.dirname(__FILE__), '..') 
     3 
     4# required to overcome a callback in rspec 
     5def at_exit 
     6end 
    37 
    48begin 

  • trunk/lib/merb/test/helper.rb

    r1297 r1313  
    4141        response = StringIO.new 
    4242         
    43         request = opts.delete(:fake_request) || Merb::Test::FakeRequest.with(path, opts.merge(:request_method => (verb.to_s.upcase rescue 'GET'))) 
     43        request = opts.delete(:fake_request) || Merb::Test::FakeRequest.with(path_with_options(path, opts), :request_method => (verb.to_s.upcase rescue 'GET')) 
     44 
    4445        yield_to_controller = opts.delete(:yields) 
    4546