Skip to content

Commit

Permalink
Deprecate ActionController::Integration, ActionController::Integratio…
Browse files Browse the repository at this point in the history
…nTest, ActionController::PerformanceTest,ActionController::AbstractRequest, ActionController::Request, ActionController::AbstractResponse, ActionController::Response and ActionController::Routing
  • Loading branch information
vishnuatrai authored and Vishnu Atrai committed Jan 14, 2012
1 parent 1919a30 commit 12d60a2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
6 changes: 5 additions & 1 deletion actionpack/lib/action_controller/deprecated.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
ActionController::AbstractRequest = ActionController::Request = ActionDispatch::Request
ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response
ActionController::Routing = ActionDispatch::Routing
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.'
Original file line number Diff line number Diff line change
@@ -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.'
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
ActionController::PerformanceTest = ActionDispatch::PerformanceTest

ActiveSupport::Deprecation.warn 'ActionController::PerformanceTest is deprecated and will be removed, use ActionDispatch::PerformanceTest instead.'

0 comments on commit 12d60a2

Please sign in to comment.