6 files changed, 18 insertions, 17 deletions
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index d0fd9e8e46..cf4a461622 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -452,13 +452,14 @@ class FilterTest < ActionController::TestCase
       render :text => 'hello world'
     end
   end
+
   def test_sweeper_should_not_block_rendering
     response = test_process(SweeperTestController)
     assert_equal 'hello world', response.body
   end
 
   def test_before_method_of_sweeper_should_always_return_true
-    sweeper =  ActionController::Caching::Sweeper.send(:new)
+    sweeper = ActionController::Caching::Sweeper.send(:new)
     assert sweeper.before(TestController.new)
   end
 
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index 6c411d8997..3569a2f213 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -209,7 +209,7 @@ class FlashTest < ActionController::TestCase
   end
 end
 
-class FlashIntegrationTest < ActionController::IntegrationTest
+class FlashIntegrationTest < ActionDispatch::IntegrationTest
   SessionKey = '_myapp_session'
   SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33'
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 343cffdf7f..4ff39fb76c 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -8,7 +8,7 @@ class SessionTest < Test::Unit::TestCase
   }
 
   def setup
-    @session = ActionController::Integration::Session.new(StubApp)
+    @session = ActionDispatch::Integration::Session.new(StubApp)
   end
 
   def test_https_bang_works_and_sets_truth_by_default
@@ -167,7 +167,7 @@ end
 
 class IntegrationTestTest < Test::Unit::TestCase
   def setup
-    @test = ::ActionController::IntegrationTest.new(:default_test)
+    @test = ::ActionDispatch::IntegrationTest.new(:default_test)
     @test.class.stubs(:fixture_table_names).returns([])
     @session = @test.open_session
   end
@@ -202,7 +202,7 @@ end
 
 # Tests that integration tests don't call Controller test methods for processing.
 # Integration tests have their own setup and teardown.
-class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest
+class IntegrationTestUsesCorrectClass < ActionDispatch::IntegrationTest
   def self.fixture_table_names
     []
   end
@@ -218,7 +218,7 @@ class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest
   end
 end
 
-class IntegrationProcessTest < ActionController::IntegrationTest
+class IntegrationProcessTest < ActionDispatch::IntegrationTest
   class IntegrationController < ActionController::Base
     def get
       respond_to do |format|
@@ -439,7 +439,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     end
 end
 
-class MetalIntegrationTest < ActionController::IntegrationTest
+class MetalIntegrationTest < ActionDispatch::IntegrationTest
   include SharedTestRoutes.url_helpers
 
   class Poller
@@ -476,7 +476,7 @@ class MetalIntegrationTest < ActionController::IntegrationTest
   end
 end
 
-class ApplicationIntegrationTest < ActionController::IntegrationTest
+class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
   class TestController < ActionController::Base
     def index
       render :text => "index"
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index 04eedf3295..cefbc548c0 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -311,7 +311,7 @@ class RescueControllerTest < ActionController::TestCase
   end
 end
 
-class RescueTest < ActionController::IntegrationTest
+class RescueTest < ActionDispatch::IntegrationTest
   class TestController < ActionController::Base
     class RecordInvalid < StandardError
       def message
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index bb990586f7..ecfa13d4ba 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -10,12 +10,12 @@ class MilestonesController < ActionController::Base
   def rescue_action(e) raise e end
 end
 
-ROUTING = ActionController::Routing
+ROUTING = ActionDispatch::Routing
 
 # See RFC 3986, section 3.3 for allowed path characters.
 class UriReservedCharactersRoutingTest < Test::Unit::TestCase
   def setup
-    @set = ActionController::Routing::RouteSet.new
+    @set = ActionDispatch::Routing::RouteSet.new
     @set.draw do
       match ':controller/:action/:variable/*additional'
     end
@@ -71,7 +71,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   attr_reader :rs
 
   def setup
-    @rs = ::ActionController::Routing::RouteSet.new
+    @rs = ::ActionDispatch::Routing::RouteSet.new
   end
 
   def teardown
@@ -103,7 +103,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def test_time_recognition
     # We create many routes to make situation more realistic
-    @rs = ::ActionController::Routing::RouteSet.new
+    @rs = ::ActionDispatch::Routing::RouteSet.new
     @rs.draw {
       root :to => "search#new", :as => "frontpage"
       resources :videos do
@@ -581,7 +581,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   end
 
   def test_routes_changed_correctly_after_clear
-    rs = ::ActionController::Routing::RouteSet.new
+    rs = ::ActionDispatch::Routing::RouteSet.new
     rs.draw do
       match 'ca' => 'ca#aa'
       match 'cb' => 'cb#ab'
@@ -1516,7 +1516,7 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
     end
 
     match '/blog(/:year(/:month(/:day)))' => 'posts#show_date',
-      :constraints => { 
+      :constraints => {
         :year => /(19|20)\d\d/,
         :month => /[01]?\d/,
         :day => /[0-3]?\d/
@@ -1559,7 +1559,7 @@ class RackMountIntegrationTests < ActiveSupport::TestCase
   }
 
   def setup
-    @routes = ActionController::Routing::RouteSet.new
+    @routes = ActionDispatch::Routing::RouteSet.new
     @routes.draw(&Mapping)
   end
 
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index cd021c3b20..5564775a48 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class WebServiceTest < ActionController::IntegrationTest
+class WebServiceTest < ActionDispatch::IntegrationTest
   class TestController < ActionController::Base
     def assign_parameters
       if params[:full]