diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-14 10:54:12 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-14 10:54:12 -0800 |
| commit | f4b1dcdbcfe525efd0eb3ff047bbddca353d47b1 (patch) | |
| tree | fd34eeab1273a4fe0935352403adfed2c69a823f /actionpack/lib | |
| parent | 1919a303f98619d636f17b7fb736967ffdd35972 (diff) | |
| parent | 12d60a252e560e95d862704d772b937bc16da527 (diff) | |
| download | rails-f4b1dcdbcfe525efd0eb3ff047bbddca353d47b1.tar.gz rails-f4b1dcdbcfe525efd0eb3ff047bbddca353d47b1.tar.bz2 rails-f4b1dcdbcfe525efd0eb3ff047bbddca353d47b1.zip | |
Merge pull request #4398 from castlerock/remove_deprecated
deprecated action_controller integration test and performance test
Diffstat (limited to 'actionpack/lib')
3 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/deprecated.rb b/actionpack/lib/action_controller/deprecated.rb index aa0cfc9395..2405bebb97 100644 --- a/actionpack/lib/action_controller/deprecated.rb +++ b/actionpack/lib/action_controller/deprecated.rb @@ -1,3 +1,7 @@ ActionController::AbstractRequest = ActionController::Request = ActionDispatch::Request ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response -ActionController::Routing = ActionDispatch::Routing
\ No newline at end of file +ActionController::Routing = ActionDispatch::Routing + +ActiveSupport::Deprecation.warn 'ActionController::AbstractRequest and ActionController::Request are deprecated and will be removed, use ActionDispatch::Request instead.' +ActiveSupport::Deprecation.warn 'ActionController::AbstractResponse and ActionController::Response are deprecated and will be removed, use ActionDispatch::Response instead.' +ActiveSupport::Deprecation.warn 'ActionController::Routing is deprecated and will be removed, use ActionDispatch::Routing instead.'
\ 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 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.' |