Get modules back into integration tests

actionpack/lib/action_controller/test_case.rb

@@ -1,5 +1,4 @@
 require 'rack/session/abstract/id'
-require 'action_view/test_case'
 
 module ActionController
   module TemplateAssertions

actionpack/lib/action_dispatch/testing/integration.rb

@@ -288,6 +288,8 @@ module ActionDispatch
     end
 
     module Runner
+      include ActionDispatch::Assertions
+
       def app
         @app
       end
@@ -455,6 +457,7 @@ module ActionDispatch
   #   end
   class IntegrationTest < ActiveSupport::TestCase
     include Integration::Runner
+    include ActionController::TemplateAssertions
 
     @@app = nil