diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-05-29 21:33:12 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-05-29 21:33:12 +0930 |
| commit | 29f8eae3faf96cbe46e7eb949c7f674c5860c1cf (patch) | |
| tree | 6d26d80d20c69530319b6a107f6688d641b9e6e6 /actionpack | |
| parent | 159c812b350055028176902cfa1363e8af3237dc (diff) | |
| parent | da290fae09086f864e59ba43b4a0c4f3d8661da1 (diff) | |
| download | rails-29f8eae3faf96cbe46e7eb949c7f674c5860c1cf.tar.gz rails-29f8eae3faf96cbe46e7eb949c7f674c5860c1cf.tar.bz2 rails-29f8eae3faf96cbe46e7eb949c7f674c5860c1cf.zip | |
Merge pull request #15061 from tgxworld/remove_unnecessary_include
Remove unnecessary include for integration tests.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 107e62d20f..af3bc26691 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -269,12 +269,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 46de36317e..6584d20840 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 |