11 files changed, 19 insertions, 14 deletions
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb
index f960698566..7fa1fd93bf 100644
--- a/actionpack/lib/action_controller/testing/integration.rb
+++ b/actionpack/lib/action_controller/testing/integration.rb
@@ -14,7 +14,7 @@ module ActionController
     # Integration::Session directly.
     class Session
       include Test::Unit::Assertions
-      include ActionController::TestCase::Assertions
+      include ActionDispatch::Assertions
       include ActionController::TestProcess
 
       # The integer HTTP status code of the last request.
diff --git a/actionpack/lib/action_controller/testing/test_case.rb b/actionpack/lib/action_controller/testing/test_case.rb
index a80488e13e..7b4eda58e5 100644
--- a/actionpack/lib/action_controller/testing/test_case.rb
+++ b/actionpack/lib/action_controller/testing/test_case.rb
@@ -105,12 +105,7 @@ module ActionController
   class TestCase < ActiveSupport::TestCase
     include TestProcess
 
-    module Assertions
-      %w(response selector tag dom routing model).each do |kind|
-        include ActionController::Assertions.const_get("#{kind.camelize}Assertions")
-      end
-    end
-    include Assertions
+    include ActionDispatch::Assertions
 
     # When the request.remote_addr remains the default for testing, which is 0.0.0.0, the exception is simply raised inline
     # (bystepping the regular exception handling from rescue_action). If the request.remote_addr is anything else, the regular
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 4f65dcadee..8b8a1774e4 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -45,6 +45,8 @@ module ActionDispatch
   autoload :Reloader, 'action_dispatch/middleware/reloader'
   autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
 
+  autoload :Assertions, 'action_dispatch/testing/assertions'
+
   module Http
     autoload :Headers, 'action_dispatch/http/headers'
   end
diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb
new file mode 100644
index 0000000000..96f08f2355
--- /dev/null
+++ b/actionpack/lib/action_dispatch/testing/assertions.rb
@@ -0,0 +1,8 @@
+module ActionDispatch
+  module Assertions
+    %w(response selector tag dom routing model).each do |kind|
+      require "action_dispatch/testing/assertions/#{kind}"
+      include const_get("#{kind.camelize}Assertions")
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/testing/assertions/dom.rb b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
index c0e6c68fcd..9a917f704a 100644
--- a/actionpack/lib/action_controller/testing/assertions/dom.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     module DomAssertions
       # Test two HTML strings for equivalency (e.g., identical up to reordering of attributes)
diff --git a/actionpack/lib/action_controller/testing/assertions/model.rb b/actionpack/lib/action_dispatch/testing/assertions/model.rb
index 93e3bcf456..46714418c6 100644
--- a/actionpack/lib/action_controller/testing/assertions/model.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/model.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     module ModelAssertions
       # Ensures that the passed record is valid by Active Record standards and
diff --git a/actionpack/lib/action_controller/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 7b2936e26c..a72ce9084f 100644
--- a/actionpack/lib/action_controller/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     # A small suite of assertions that test responses from Rails applications.
     module ResponseAssertions
diff --git a/actionpack/lib/action_controller/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index f3f4f54fe3..89d1a49403 100644
--- a/actionpack/lib/action_controller/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     # Suite of assertions to test routes generated by Rails and the handling of requests made to them.
     module RoutingAssertions
diff --git a/actionpack/lib/action_controller/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 0d56ea5ef7..dd75cda6b9 100644
--- a/actionpack/lib/action_controller/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -3,7 +3,7 @@
 # Under MIT and/or CC By license.
 #++
 
-module ActionController
+module ActionDispatch
   module Assertions
     unless const_defined?(:NO_STRIP)
       NO_STRIP = %w{pre script style textarea}
diff --git a/actionpack/lib/action_controller/testing/assertions/tag.rb b/actionpack/lib/action_dispatch/testing/assertions/tag.rb
index d9197b7855..ef6867576e 100644
--- a/actionpack/lib/action_controller/testing/assertions/tag.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/tag.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     # Pair of assertions to testing elements in the HTML output of the response.
     module TagAssertions
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 50bed67f7d..22adf97304 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -21,7 +21,7 @@ module ActionView
   end
 
   class TestCase < ActiveSupport::TestCase
-    include ActionController::TestCase::Assertions
+    include ActionDispatch::Assertions
     include ActionController::TestProcess
 
     class_inheritable_accessor :helper_class