Permalink
Browse files

Integration tests use ActionController::Dispatcher rather than the ol…

…d Dispatcher. Closes #10596.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8483 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent c64a29f commit fa906778ffdc22671cca11b5db1bf80cc44d9468 @jeremy jeremy committed Dec 22, 2007
@@ -1,6 +1,7 @@
-require 'dispatcher'
require 'stringio'
require 'uri'
+
+require 'action_controller/dispatcher'
require 'action_controller/test_process'
module ActionController
@@ -276,7 +277,7 @@ def process(method, path, parameters = nil, headers = nil)
ActionController::Base.clear_last_instantiation!
cgi = StubCGI.new(env, data)
- Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput)
+ ActionController::Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput)
@result = cgi.stdoutput.string
@request_count += 1
@@ -1,6 +1,5 @@
require File.dirname(__FILE__) + '/../abstract_unit'
-$:.unshift File.dirname(__FILE__) + '/../../../railties/lib'
require 'action_controller/integration'
uses_mocha 'integration' do

0 comments on commit fa90677

Please sign in to comment.