diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2010-09-26 01:03:10 +0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-09-26 02:13:48 +0800 |
| commit | 12db1a39cd7af3d756ab37fa94257af3f35f08f6 (patch) | |
| tree | 1c608db40e157ba42bae9ec65d454e316e043488 | |
| parent | ecc13f7c18d6255dd6cc13c76dbc6fd1c4c317b5 (diff) | |
| download | rails-12db1a39cd7af3d756ab37fa94257af3f35f08f6.tar.gz rails-12db1a39cd7af3d756ab37fa94257af3f35f08f6.tar.bz2 rails-12db1a39cd7af3d756ab37fa94257af3f35f08f6.zip | |
Partial revert of #d650b71 'Remove deprecated stuff in ActionController'
This brings back the deprecated modules from ActionController, because
they didn't have any deprecation warning.
4 files changed, 11 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 288f412caf..e02578eafd 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -34,6 +34,11 @@ module ActionController autoload :UrlFor end + autoload :Integration, 'action_controller/deprecated/integration_test' + autoload :IntegrationTest, 'action_controller/deprecated/integration_test' + autoload :PerformanceTest, 'action_controller/deprecated/performance_test' + autoload :UrlWriter, 'action_controller/deprecated' + autoload :Routing, 'action_controller/deprecated' autoload :TestCase, 'action_controller/test_case' eager_autoload do diff --git a/actionpack/lib/action_controller/deprecated.rb b/actionpack/lib/action_controller/deprecated.rb new file mode 100644 index 0000000000..aa0cfc9395 --- /dev/null +++ b/actionpack/lib/action_controller/deprecated.rb @@ -0,0 +1,3 @@ +ActionController::AbstractRequest = ActionController::Request = ActionDispatch::Request +ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response +ActionController::Routing = ActionDispatch::Routing
\ No newline at end of file diff --git a/actionpack/lib/action_controller/deprecated/integration_test.rb b/actionpack/lib/action_controller/deprecated/integration_test.rb new file mode 100644 index 0000000000..86336b6bc4 --- /dev/null +++ b/actionpack/lib/action_controller/deprecated/integration_test.rb @@ -0,0 +1,2 @@ +ActionController::Integration = ActionDispatch::Integration +ActionController::IntegrationTest = ActionDispatch::IntegrationTest diff --git a/actionpack/lib/action_controller/deprecated/performance_test.rb b/actionpack/lib/action_controller/deprecated/performance_test.rb new file mode 100644 index 0000000000..fcf47d31a7 --- /dev/null +++ b/actionpack/lib/action_controller/deprecated/performance_test.rb @@ -0,0 +1 @@ +ActionController::PerformanceTest = ActionDispatch::PerformanceTest |