Merge pull request #26746 from rails/deprecations

Remove all deprecations from Action Pack

1 files changed, 16 insertions, 85 deletions

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index f4ec13c831..33c0201951 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -386,57 +386,42 @@ module ActionController
       #
       # Note that the request method is not verified. The different methods are
       # available to make the tests more expressive.
-      def get(action, *args)
-        res = process_with_kwargs("GET", action, *args)
+      def get(action, **args)
+        res = process(action, method: "GET", **args)
         cookies.update res.cookies
         res
       end
 
       # Simulate a POST request with the given parameters and set/volley the response.
       # See +get+ for more details.
-      def post(action, *args)
-        process_with_kwargs("POST", action, *args)
+      def post(action, **args)
+        process(action, method: "POST", **args)
       end
 
       # Simulate a PATCH request with the given parameters and set/volley the response.
       # See +get+ for more details.
-      def patch(action, *args)
-        process_with_kwargs("PATCH", action, *args)
+      def patch(action, **args)
+        process(action, method: "PATCH", **args)
       end
 
       # Simulate a PUT request with the given parameters and set/volley the response.
       # See +get+ for more details.
-      def put(action, *args)
-        process_with_kwargs("PUT", action, *args)
+      def put(action, **args)
+        process(action, method: "PUT", **args)
       end
 
       # Simulate a DELETE request with the given parameters and set/volley the response.
       # See +get+ for more details.
-      def delete(action, *args)
-        process_with_kwargs("DELETE", action, *args)
+      def delete(action, **args)
+        process(action, method: "DELETE", **args)
       end
 
       # Simulate a HEAD request with the given parameters and set/volley the response.
       # See +get+ for more details.
-      def head(action, *args)
-        process_with_kwargs("HEAD", action, *args)
+      def head(action, **args)
+        process(action, method: "HEAD", **args)
       end
 
-      def xml_http_request(*args)
-        ActiveSupport::Deprecation.warn(<<-MSG.strip_heredoc)
-          xhr and xml_http_request methods are deprecated in favor of
-          `get :index, xhr: true` and `post :create, xhr: true`
-        MSG
-
-        @request.env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest"
-        @request.env["HTTP_ACCEPT"] ||= [Mime[:js], Mime[:html], Mime[:xml], "text/xml", "*/*"].join(", ")
-        __send__(*args).tap do
-          @request.env.delete "HTTP_X_REQUESTED_WITH"
-          @request.env.delete "HTTP_ACCEPT"
-        end
-      end
-      alias xhr :xml_http_request
-
       # Simulate an HTTP request to +action+ by specifying request method,
       # parameters and set/volley the response.
       #
@@ -467,36 +452,14 @@ module ActionController
       # respectively which will make tests more expressive.
       #
       # Note that the request method is not verified.
-      def process(action, *args)
+      def process(action, method: "GET", params: {}, session: nil, body: nil, flash: {}, format: nil, xhr: false, as: nil)
         check_required_ivars
 
-        if kwarg_request?(args)
-          parameters, session, body, flash, http_method, format, xhr, as = args[0].values_at(:params, :session, :body, :flash, :method, :format, :xhr, :as)
-        else
-          http_method, parameters, session, flash = args
-          format = nil
-
-          if parameters.is_a?(String) && http_method != "HEAD"
-            body = parameters
-            parameters = nil
-          end
-
-          if parameters || session || flash
-            non_kwarg_request_warning
-          end
-        end
-
         if body
           @request.set_header "RAW_POST_DATA", body
         end
 
-        if http_method
-          http_method = http_method.to_s.upcase
-        else
-          http_method = "GET"
-        end
-
-        parameters ||= {}
+        http_method = method.to_s.upcase
 
         @html_document = nil
 
@@ -517,12 +480,12 @@ module ActionController
           format ||= as
         end
 
+        parameters = params.symbolize_keys
+
         if format
           parameters[:format] = format
         end
 
-        parameters = parameters.symbolize_keys
-
         generated_extras = @routes.generate_extras(parameters.merge(controller: controller_class_name, action: action.to_s))
         generated_path = generated_path(generated_extras)
         query_string_keys = query_parameter_names(generated_extras)
@@ -641,38 +604,6 @@ module ActionController
           env
         end
 
-        def process_with_kwargs(http_method, action, *args)
-          if kwarg_request?(args)
-            args.first.merge!(method: http_method)
-            process(action, *args)
-          else
-            non_kwarg_request_warning if args.any?
-
-            args = args.unshift(http_method)
-            process(action, *args)
-          end
-        end
-
-        REQUEST_KWARGS = %i(params session flash method body xhr)
-        def kwarg_request?(args)
-          args[0].respond_to?(:keys) && (
-            (args[0].key?(:format) && args[0].keys.size == 1) ||
-            args[0].keys.any? { |k| REQUEST_KWARGS.include?(k) }
-          )
-        end
-
-        def non_kwarg_request_warning
-          ActiveSupport::Deprecation.warn(<<-MSG.strip_heredoc)
-            ActionController::TestCase HTTP request methods will accept only
-            keyword arguments in future Rails versions.
-
-            Examples:
-
-            get :show, params: { id: 1 }, session: { user_id: 1 }
-            process :update, method: :post, params: { id: 1 }
-          MSG
-        end
-
         def document_root_element
           html_document.root
         end