From 12db1a39cd7af3d756ab37fa94257af3f35f08f6 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 26 Sep 2010 01:03:10 +0800 Subject: 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. --- actionpack/lib/action_controller.rb | 5 +++++ actionpack/lib/action_controller/deprecated.rb | 3 +++ actionpack/lib/action_controller/deprecated/integration_test.rb | 2 ++ actionpack/lib/action_controller/deprecated/performance_test.rb | 1 + 4 files changed, 11 insertions(+) create mode 100644 actionpack/lib/action_controller/deprecated.rb create mode 100644 actionpack/lib/action_controller/deprecated/integration_test.rb create mode 100644 actionpack/lib/action_controller/deprecated/performance_test.rb (limited to 'actionpack/lib') 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 -- cgit v1.2.3