diff options
| author | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-05-11 15:41:23 -0700 |
|---|---|---|
| committer | Guo Xiang Tan <tgx_world@hotmail.com> | 2014-05-11 16:02:12 -0700 |
| commit | da290fae09086f864e59ba43b4a0c4f3d8661da1 (patch) | |
| tree | 5fe3b223149a66f892bb19d14273dae5ef23b70b | |
| parent | d4fafeb003e472283914d3246d5aea92a0ea795c (diff) | |
| download | rails-da290fae09086f864e59ba43b4a0c4f3d8661da1.tar.gz rails-da290fae09086f864e59ba43b4a0c4f3d8661da1.tar.bz2 rails-da290fae09086f864e59ba43b4a0c4f3d8661da1.zip | |
Remove unnecessary include for integration tests.
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 1 | ||||
| -rw-r--r-- | actionview/test/abstract_unit.rb | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index cc6b763093..789aa608a4 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -270,12 +270,6 @@ module ActionDispatch 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 index 03a4741f42..98419efc89 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -251,7 +251,6 @@ end 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 index 9eae3a4fbd..7c71fdabd1 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -274,7 +274,6 @@ ActionView::RoutingUrlFor.send(:include, ActionDispatch::Routing::UrlFor) 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 |