Remove unnecessary include for integration tests.

rails · May 11, 2014 · da290fa · da290fa
1 parent d4fafeb
commit da290fa
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 8 deletions.
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -270,12 +270,6 @@ def process(method, path, parameters = nil, headers_or_env = nil)
             path = location.query ? "#{location.path}?#{location.query}" : location.path
           end
 
-          unless ActionController::Base < ActionController::Testing
-            ActionController::Base.class_eval do
-              include ActionController::Testing
-            end
-          end
-
           hostname, port = host.split(':')
 
           env = {

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
@@ -251,7 +251,6 @@ def assert_header(name, value)
 
 module ActionController
   class Base
-    include ActionController::Testing
     # This stub emulates the Railtie including the URL helpers from a Rails application
     include SharedTestRoutes.url_helpers
     include SharedTestRoutes.mounted_helpers

diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
@@ -274,7 +274,6 @@ def assert_header(name, value)
 
 module ActionController
   class Base
-    include ActionController::Testing
     # This stub emulates the Railtie including the URL helpers from a Rails application
     include SharedTestRoutes.url_helpers
     include SharedTestRoutes.mounted_helpers