Skip to content
Browse files

Merge pull request #15061 from tgxworld/remove_unnecessary_include

Remove unnecessary include for integration tests.
  • Loading branch information...
2 parents 159c812 + da290fa commit 29f8eae3faf96cbe46e7eb949c7f674c5860c1cf @matthewd matthewd committed May 29, 2014
View
6 actionpack/lib/action_dispatch/testing/integration.rb
@@ -269,12 +269,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 = {
View
1 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
View
1 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

0 comments on commit 29f8eae

Please sign in to comment.
Something went wrong with that request. Please try again.