diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-21 11:21:27 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-21 11:21:27 +0100 |
| commit | 5f34421c77b4cd873baadbbca877a93de5a4d602 (patch) | |
| tree | 8182bb1c53864ab06079e14116a61d66e9617f7d /actionpack/lib/action_controller/deprecated | |
| parent | cf7b94c013d4e824433a018001474e71ddd81a99 (diff) | |
| parent | f09ad263cabe2e781c1994b85375fee8deba4317 (diff) | |
| download | rails-5f34421c77b4cd873baadbbca877a93de5a4d602.tar.gz rails-5f34421c77b4cd873baadbbca877a93de5a4d602.tar.bz2 rails-5f34421c77b4cd873baadbbca877a93de5a4d602.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/deprecated')
| -rw-r--r-- | actionpack/lib/action_controller/deprecated/integration_test.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/deprecated/integration_test.rb b/actionpack/lib/action_controller/deprecated/integration_test.rb index 05c8c0f156..86336b6bc4 100644 --- a/actionpack/lib/action_controller/deprecated/integration_test.rb +++ b/actionpack/lib/action_controller/deprecated/integration_test.rb @@ -1,4 +1,2 @@ -require "action_dispatch/testing/integration" - ActionController::Integration = ActionDispatch::Integration ActionController::IntegrationTest = ActionDispatch::IntegrationTest |