Remove deprecated stuff in ActionController

This removes all deprecated classes in ActionController related to
Routing, Abstract Request/Response and Integration/IntegrationTest.
All tests and docs were changed to ActionDispatch instead of ActionController.

4 files changed, 8 insertions, 8 deletions

diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile
index 2355d2a31a..043a2462b4 100644
--- a/railties/guides/source/testing.textile
+++ b/railties/guides/source/testing.textile
@@ -613,7 +613,7 @@ Here's what a freshly-generated integration test looks like:
 <ruby>
 require 'test_helper'
 
-class UserFlowsTest < ActionController::IntegrationTest
+class UserFlowsTest < ActionDispatch::IntegrationTest
   fixtures :all
 
   # Replace this with your real tests.
@@ -623,7 +623,7 @@ class UserFlowsTest < ActionController::IntegrationTest
 end
 </ruby>
 
-Integration tests inherit from +ActionController::IntegrationTest+. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test.
+Integration tests inherit from +ActionDispatch::IntegrationTest+. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test.
 
 h4. Helpers Available for Integration Tests
 
@@ -649,7 +649,7 @@ A simple integration test that exercises multiple controllers:
 <ruby>
 require 'test_helper'
 
-class UserFlowsTest < ActionController::IntegrationTest
+class UserFlowsTest < ActionDispatch::IntegrationTest
   fixtures :users
 
   test "login and browse site" do
@@ -677,7 +677,7 @@ Here's an example of multiple sessions and custom DSL in an integration test
 <ruby>
 require 'test_helper'
 
-class UserFlowsTest < ActionController::IntegrationTest
+class UserFlowsTest < ActionDispatch::IntegrationTest
   fixtures :users
 
   test "login and browse site" do
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 7c1472147b..38f2f651f4 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -21,7 +21,7 @@ if defined?(ActiveRecord)
     self.fixture_path = "#{Rails.root}/test/fixtures/"
   end
 
-  ActionController::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
+  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
 
   def create_fixtures(*table_names, &block)
     Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index a72e6916dd..25b4a21902 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -17,14 +17,14 @@ class ConsoleTest < Test::Unit::TestCase
     load_environment
     console_session = app
     assert_not_nil console_session
-    assert_instance_of ActionController::Integration::Session, console_session
+    assert_instance_of ActionDispatch::Integration::Session, console_session
   end
 
   def test_new_session_should_return_integration_session
     load_environment
     session = new_session
     assert_not_nil session
-    assert_instance_of ActionController::Integration::Session, session
+    assert_instance_of ActionDispatch::Integration::Session, session
   end
 
   def test_reload_should_fire_preparation_callbacks
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index de316a6fd0..1fbbb40132 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -53,7 +53,7 @@ module ApplicationTests
       app_file 'test/integration/posts_test.rb', <<-RUBY
         require 'test_helper'
 
-        class PostsTest < ActionController::IntegrationTest
+        class PostsTest < ActionDispatch::IntegrationTest
           def test_index
             get '/posts'
             assert_response :success