aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/deprecated
diff options
context:
space:
mode:
authorVishnu Atrai <vishnu.atrai@gmail.com>2012-01-10 18:00:54 +0530
committerVishnu Atrai <me@vishnuatrai.com>2012-01-15 00:02:07 +0530
commit12d60a252e560e95d862704d772b937bc16da527 (patch)
treefd34eeab1273a4fe0935352403adfed2c69a823f /actionpack/lib/action_controller/deprecated
parent1919a303f98619d636f17b7fb736967ffdd35972 (diff)
downloadrails-12d60a252e560e95d862704d772b937bc16da527.tar.gz
rails-12d60a252e560e95d862704d772b937bc16da527.tar.bz2
rails-12d60a252e560e95d862704d772b937bc16da527.zip
Deprecate ActionController::Integration, ActionController::IntegrationTest, ActionController::PerformanceTest,ActionController::AbstractRequest, ActionController::Request, ActionController::AbstractResponse, ActionController::Response and ActionController::Routing
Diffstat (limited to 'actionpack/lib/action_controller/deprecated')
-rw-r--r--actionpack/lib/action_controller/deprecated/integration_test.rb3
-rw-r--r--actionpack/lib/action_controller/deprecated/performance_test.rb2
2 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/deprecated/integration_test.rb b/actionpack/lib/action_controller/deprecated/integration_test.rb
index 86336b6bc4..54eae48f47 100644
--- a/actionpack/lib/action_controller/deprecated/integration_test.rb
+++ b/actionpack/lib/action_controller/deprecated/integration_test.rb
@@ -1,2 +1,5 @@
ActionController::Integration = ActionDispatch::Integration
ActionController::IntegrationTest = ActionDispatch::IntegrationTest
+
+ActiveSupport::Deprecation.warn 'ActionController::Integration is deprecated and will be removed, use ActionDispatch::Integration instead.'
+ActiveSupport::Deprecation.warn 'ActionController::IntegrationTest is deprecated and will be removed, use ActionDispatch::IntegrationTest instead.'
diff --git a/actionpack/lib/action_controller/deprecated/performance_test.rb b/actionpack/lib/action_controller/deprecated/performance_test.rb
index fcf47d31a7..c7ba5a2fe7 100644
--- a/actionpack/lib/action_controller/deprecated/performance_test.rb
+++ b/actionpack/lib/action_controller/deprecated/performance_test.rb
@@ -1 +1,3 @@
ActionController::PerformanceTest = ActionDispatch::PerformanceTest
+
+ActiveSupport::Deprecation.warn 'ActionController::PerformanceTest is deprecated and will be removed, use ActionDispatch::PerformanceTest instead.'