From fa906778ffdc22671cca11b5db1bf80cc44d9468 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 22 Dec 2007 19:03:01 +0000
Subject: Integration tests use ActionController::Dispatcher rather than the
 old Dispatcher. Closes #10596.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8483 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_controller/integration.rb | 5 +++--
 actionpack/test/controller/integration_test.rb  | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index 25fb1b93af..d979ca494d 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -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 @@ module ActionController
           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
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 4213bb4afa..2aea6eaaaa 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 
-$:.unshift File.dirname(__FILE__) + '/../../../railties/lib'
 require 'action_controller/integration'
 
 uses_mocha 'integration' do
-- 
cgit v1.2.3