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 /actionpack/lib | |
| parent | d4fafeb003e472283914d3246d5aea92a0ea795c (diff) | |
| download | rails-da290fae09086f864e59ba43b4a0c4f3d8661da1.tar.gz rails-da290fae09086f864e59ba43b4a0c4f3d8661da1.tar.bz2 rails-da290fae09086f864e59ba43b4a0c4f3d8661da1.zip | |
Remove unnecessary include for integration tests.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 6 |
1 files changed, 0 insertions, 6 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 = { |