Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8483

Show
Ignore:
Timestamp:
12/22/07 19:03:01 (8 months ago)
Author:
bitsweat
Message:

Integration tests use ActionController::Dispatcher rather than the old Dispatcher. Closes #10596.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller/integration.rb

    r8429 r8483  
    1 require 'dispatcher' 
    21require 'stringio' 
    32require 'uri' 
     3 
     4require 'action_controller/dispatcher' 
    45require 'action_controller/test_process' 
    56 
    …… 
    277278 
    278279          cgi = StubCGI.new(env, data) 
    279           Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput) 
     280          ActionController::Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput) 
    280281          @result = cgi.stdoutput.string 
    281282          @request_count += 1 

  • trunk/actionpack/test/controller/integration_test.rb

    r8429 r8483  
    11require File.dirname(__FILE__) + '/../abstract_unit' 
    22 
    3 $:.unshift File.dirname(__FILE__) + '/../../../railties/lib' 
    43require 'action_controller/integration' 
    54