aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2010-09-26 01:03:10 +0800
committerJosé Valim <jose.valim@gmail.com>2010-09-26 02:13:48 +0800
commit12db1a39cd7af3d756ab37fa94257af3f35f08f6 (patch)
tree1c608db40e157ba42bae9ec65d454e316e043488 /actionpack/lib/action_controller
parentecc13f7c18d6255dd6cc13c76dbc6fd1c4c317b5 (diff)
downloadrails-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.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/deprecated.rb3
-rw-r--r--actionpack/lib/action_controller/deprecated/integration_test.rb2
-rw-r--r--actionpack/lib/action_controller/deprecated/performance_test.rb1
3 files changed, 6 insertions, 0 deletions
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