Deprecate Controller.process interface

3 files changed, 13 insertions, 10 deletions

diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index eb65f59ddd..60567454b1 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -376,6 +376,7 @@ module ActionController #:nodoc:
 
       # Factory for the standard create, process loop where the controller is discarded after processing.
       def process(request, response) #:nodoc:
+        ActiveSupport::Deprecation.warn("Controller.process has been deprecated. Use Controller.call instead", caller)
         new.process(request, response)
       end
 
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 9e74538310..5876f55420 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -603,7 +603,7 @@ class FilterTest < Test::Unit::TestCase
     %w(foo bar baz).each do |action|
       request = ActionController::TestRequest.new
       request.query_parameters[:choose] = action
-      response = DynamicDispatchController.process(request, ActionController::TestResponse.new)
+      response = Rack::MockResponse.new(*DynamicDispatchController.call(request.env))
       assert_equal action, response.body
     end
   end
diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb
index 58addc123d..e72bce1791 100644
--- a/actionpack/test/controller/helper_test.rb
+++ b/actionpack/test/controller/helper_test.rb
@@ -102,19 +102,19 @@ class HelperTest < Test::Unit::TestCase
   end
 
   def test_helper_for_nested_controller
-    request  = ActionController::TestRequest.new
-    response = ActionController::TestResponse.new
+    request = ActionController::TestRequest.new
     request.action = 'render_hello_world'
 
-    assert_equal 'hello: Iz guuut!', Fun::GamesController.process(request, response).body
+    response = Rack::MockResponse.new(*Fun::GamesController.call(request.env))
+    assert_equal 'hello: Iz guuut!', response.body
   end
 
   def test_helper_for_acronym_controller
-    request  = ActionController::TestRequest.new
-    response = ActionController::TestResponse.new
+    request = ActionController::TestRequest.new
     request.action = 'test'
 
-    assert_equal 'test: baz', Fun::PdfController.process(request, response).body
+    response = Rack::MockResponse.new(*Fun::PdfController.call(request.env))
+    assert_equal 'test: baz', response.body
   end
 
   def test_all_helpers
@@ -211,14 +211,16 @@ class IsolatedHelpersTest < Test::Unit::TestCase
   end
 
   def test_helper_in_a
-    assert_raise(ActionView::TemplateError) { A.process(@request, @response) }
+    assert_raise(ActionView::TemplateError) { A.call(@request.env) }
   end
 
   def test_helper_in_b
-    assert_equal 'B', B.process(@request, @response).body
+    response = Rack::MockResponse.new(*B.call(@request.env))
+    assert_equal 'B', response.body
   end
 
   def test_helper_in_c
-    assert_equal 'C', C.process(@request, @response).body
+    response = Rack::MockResponse.new(*C.call(@request.env))
+    assert_equal 'C', response.body
   end
 end