actionpack 5.0.7.2 → 5.1.0.beta1

data/lib/action_controller/metal/testing.rb

@@ -13,7 +13,7 @@ module ActionController
 
     module ClassMethods
       def before_filters
-        _process_action_callbacks.find_all{|x| x.kind == :before}.map(&:name)
+        _process_action_callbacks.find_all { |x| x.kind == :before }.map(&:name)
       end
     end
   end

data/lib/action_controller/metal/url_for.rb

@@ -27,10 +27,10 @@ module ActionController
 
     def url_options
       @_url_options ||= {
-        :host => request.host,
-        :port => request.optional_port,
-        :protocol => request.protocol,
-        :_recall => request.path_parameters
+        host: request.host,
+        port: request.optional_port,
+        protocol: request.protocol,
+        _recall: request.path_parameters
       }.merge!(super).freeze
 
       if (same_origin = _routes.equal?(request.routes)) ||

data/lib/action_controller/railtie.rb

@@ -11,7 +11,7 @@ module ActionController
 
     config.eager_load_namespaces << ActionController
 
-    initializer "action_controller.assets_config", :group => :all do |app|
+    initializer "action_controller.assets_config", group: :all do |app|
       app.config.action_controller.assets_dir ||= app.config.paths["public"].first
     end
 
@@ -22,17 +22,13 @@ module ActionController
     initializer "action_controller.parameters_config" do |app|
       options = app.config.action_controller
 
-      ActiveSupport.on_load(:action_controller, run_once: true) do
-        ActionController::Parameters.permit_all_parameters = options.delete(:permit_all_parameters) { false }
-        if app.config.action_controller[:always_permitted_parameters]
-          ActionController::Parameters.always_permitted_parameters =
-            app.config.action_controller.delete(:always_permitted_parameters)
-        end
-        ActionController::Parameters.raise_on_unfiltered_parameters =
-          options.delete(:raise_on_unfiltered_parameters) { false }
-        ActionController::Parameters.action_on_unpermitted_parameters = options.delete(:action_on_unpermitted_parameters) do
-          (Rails.env.test? || Rails.env.development?) ? :log : false
-        end
+      ActionController::Parameters.permit_all_parameters = options.delete(:permit_all_parameters) { false }
+      if app.config.action_controller[:always_permitted_parameters]
+        ActionController::Parameters.always_permitted_parameters =
+          app.config.action_controller.delete(:always_permitted_parameters)
+      end
+      ActionController::Parameters.action_on_unpermitted_parameters = options.delete(:action_on_unpermitted_parameters) do
+        (Rails.env.test? || Rails.env.development?) ? :log : false
       end
     end
 
@@ -55,7 +51,7 @@ module ActionController
         extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
         extend ::ActionController::Railties::Helpers
 
-        options.each do |k,v|
+        options.each do |k, v|
           k = "#{k}="
           if respond_to?(k)
             send(k, v)

data/lib/action_controller/renderer.rb

@@ -1,7 +1,7 @@
-require 'active_support/core_ext/hash/keys'
+require "active_support/core_ext/hash/keys"
 
 module ActionController
-  # ActionController::Renderer allows to render arbitrary templates
+  # ActionController::Renderer allows you to render arbitrary templates
   # without requirement of being in controller actions.
   #
   # You get a concrete renderer class by invoking ActionController::Base#renderer.
@@ -37,11 +37,11 @@ module ActionController
     attr_reader :defaults, :controller
 
     DEFAULTS = {
-      http_host: 'example.org',
+      http_host: "example.org",
       https: false,
-      method: 'get',
-      script_name: '',
-      input: ''
+      method: "get",
+      script_name: "",
+      input: ""
     }.freeze
 
     # Create a new renderer instance for a specific controller class.
@@ -70,7 +70,7 @@ module ActionController
 
     # Render templates with any options from ActionController::Base#render_to_string.
     def render(*args)
-      raise 'missing controller' unless controller
+      raise "missing controller" unless controller
 
       request = ActionDispatch::Request.new @env
       request.routes = controller._routes
@@ -84,27 +84,28 @@ module ActionController
     private
       def normalize_keys(env)
         new_env = {}
-        env.each_pair { |k,v| new_env[rack_key_for(k)] = rack_value_for(k, v) }
-        new_env["rack.url_scheme"] = new_env["HTTPS"] == "on" ? "https" : "http"
+        env.each_pair { |k, v| new_env[rack_key_for(k)] = rack_value_for(k, v) }
         new_env
       end
 
       RACK_KEY_TRANSLATION = {
-        http_host:   'HTTP_HOST',
-        https:       'HTTPS',
-        method:      'REQUEST_METHOD',
-        script_name: 'SCRIPT_NAME',
-        input:       'rack.input'
+        http_host:   "HTTP_HOST",
+        https:       "HTTPS",
+        method:      "REQUEST_METHOD",
+        script_name: "SCRIPT_NAME",
+        input:       "rack.input"
       }
 
       IDENTITY = ->(_) { _ }
 
       RACK_VALUE_TRANSLATION = {
-        https: ->(v) { v ? 'on' : 'off' },
+        https: ->(v) { v ? "on" : "off" },
         method: ->(v) { v.upcase },
       }
 
-      def rack_key_for(key); RACK_KEY_TRANSLATION[key]; end
+      def rack_key_for(key)
+        RACK_KEY_TRANSLATION.fetch(key, key.to_s)
+      end
 
       def rack_value_for(key, value)
         RACK_VALUE_TRANSLATION.fetch(key, IDENTITY).call value

data/lib/action_controller/test_case.rb

@@ -1,10 +1,11 @@
-require 'rack/session/abstract/id'
-require 'active_support/core_ext/hash/conversions'
-require 'active_support/core_ext/object/to_query'
-require 'active_support/core_ext/module/anonymous'
-require 'active_support/core_ext/hash/keys'
-require 'action_controller/template_assertions'
-require 'rails-dom-testing'
+require "rack/session/abstract/id"
+require "active_support/core_ext/hash/conversions"
+require "active_support/core_ext/object/to_query"
+require "active_support/core_ext/module/anonymous"
+require "active_support/core_ext/hash/keys"
+require "active_support/testing/constant_lookup"
+require "action_controller/template_assertions"
+require "rails-dom-testing"
 
 module ActionController
   class Metal
@@ -26,18 +27,20 @@ module ActionController
   # Please use ActionDispatch::IntegrationTest going forward.
   class TestRequest < ActionDispatch::TestRequest #:nodoc:
     DEFAULT_ENV = ActionDispatch::TestRequest::DEFAULT_ENV.dup
-    DEFAULT_ENV.delete 'PATH_INFO'
+    DEFAULT_ENV.delete "PATH_INFO"
 
     def self.new_session
       TestSession.new
     end
 
+    attr_reader :controller_class
+
     # Create a new test request with default `env` values
-    def self.create
+    def self.create(controller_class)
       env = {}
       env = Rails.application.env_config.merge(env) if defined?(Rails.application) && Rails.application
       env["rack.request.cookie_hash"] = {}.with_indifferent_access
-      new(default_env.merge(env), new_session)
+      new(default_env.merge(env), new_session, controller_class)
     end
 
     def self.default_env
@@ -45,13 +48,14 @@ module ActionController
     end
     private_class_method :default_env
 
-    def initialize(env, session)
+    def initialize(env, session, controller_class)
       super(env)
 
       self.session = session
       self.session_options = TestSession::DEFAULT_OPTIONS.dup
+      @controller_class = controller_class
       @custom_param_parsers = {
-        xml: lambda { |raw_post| Hash.from_xml(raw_post)['hash'] }
+        xml: lambda { |raw_post| Hash.from_xml(raw_post)["hash"] }
       }
     end
 
@@ -60,7 +64,7 @@ module ActionController
     end
 
     def content_type=(type)
-      set_header 'CONTENT_TYPE', type
+      set_header "CONTENT_TYPE", type
     end
 
     def assign_parameters(routes, controller_path, action, parameters, generated_path, query_string_keys)
@@ -82,7 +86,7 @@ module ActionController
       end
 
       if get?
-        if self.query_string.blank?
+        if query_string.blank?
           self.query_string = non_path_parameters.to_query
         end
       else
@@ -90,8 +94,8 @@ module ActionController
           self.content_type = ENCODER.content_type
           data = ENCODER.build_multipart non_path_parameters
         else
-          fetch_header('CONTENT_TYPE') do |k|
-            set_header k, 'application/x-www-form-urlencoded'
+          fetch_header("CONTENT_TYPE") do |k|
+            set_header k, "application/x-www-form-urlencoded"
           end
 
           case content_mime_type.to_sym
@@ -152,9 +156,9 @@ module ActionController
 
     private
 
-    def params_parsers
-      super.merge @custom_param_parsers
-    end
+      def params_parsers
+        super.merge @custom_param_parsers
+      end
   end
 
   class LiveTestResponse < Live::Response
@@ -328,7 +332,6 @@ module ActionController
       attr_reader :response, :request
 
       module ClassMethods
-
         # Sets the controller class name. Useful if the name can't be inferred from test class.
         # Normalizes +controller_class+ before using.
         #
@@ -351,7 +354,7 @@ module ActionController
         end
 
         def controller_class
-          if current_controller_class = self._controller_class
+          if current_controller_class = _controller_class
             current_controller_class
           else
             self.controller_class = determine_default_controller_class(name)
@@ -385,57 +388,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` are deprecated and will be removed in Rails 5.1.
-          Switch to e.g. `post :create, params: { comment: { body: 'Honey bunny' } }, 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.
       #
@@ -466,62 +454,40 @@ 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
+          @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
 
-        self.cookies.update @request.cookies
-        self.cookies.update_cookies_from_jar
-        @request.set_header 'HTTP_COOKIE', cookies.to_header
-        @request.delete_header 'action_dispatch.cookies'
+        cookies.update(@request.cookies)
+        cookies.update_cookies_from_jar
+        @request.set_header "HTTP_COOKIE", cookies.to_header
+        @request.delete_header "action_dispatch.cookies"
 
-        @request          = TestRequest.new scrub_env!(@request.env), @request.session
+        @request          = TestRequest.new scrub_env!(@request.env), @request.session, @controller.class
         @response         = build_response @response_klass
         @response.request = @request
         @controller.recycle!
 
-        @request.set_header 'REQUEST_METHOD', http_method
+        @request.set_header "REQUEST_METHOD", http_method
 
         if as
           @request.content_type = Mime[as].to_s
           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)
@@ -532,9 +498,9 @@ module ActionController
         @request.flash.update(flash || {})
 
         if xhr
-          @request.set_header 'HTTP_X_REQUESTED_WITH', 'XMLHttpRequest'
-          @request.fetch_header('HTTP_ACCEPT') do |k|
-            @request.set_header k, [Mime[:js], Mime[:html], Mime[:xml], 'text/xml', '*/*'].join(', ')
+          @request.set_header "HTTP_X_REQUESTED_WITH", "XMLHttpRequest"
+          @request.fetch_header("HTTP_ACCEPT") do |k|
+            @request.set_header k, [Mime[:js], Mime[:html], Mime[:xml], "text/xml", "*/*"].join(", ")
           end
         end
 
@@ -552,22 +518,23 @@ module ActionController
           if @request.have_cookie_jar?
             unless @request.cookie_jar.committed?
               @request.cookie_jar.write(@response)
-              self.cookies.update(@request.cookie_jar.instance_variable_get(:@cookies))
+              cookies.update(@request.cookie_jar.instance_variable_get(:@cookies))
             end
           end
           @response.prepare!
 
           if flash_value = @request.flash.to_session_value
-            @request.session['flash'] = flash_value
+            @request.session["flash"] = flash_value
           else
-            @request.session.delete('flash')
+            @request.session.delete("flash")
           end
 
           if xhr
-            @request.delete_header 'HTTP_X_REQUESTED_WITH'
-            @request.delete_header 'HTTP_ACCEPT'
+            @request.delete_header "HTTP_X_REQUESTED_WITH"
+            @request.delete_header "HTTP_ACCEPT"
           end
-          @request.query_string = ''
+          @request.query_string = ""
+          @request.env.delete "PATH_INFO"
 
           @response.sent!
         end
@@ -605,7 +572,7 @@ module ActionController
           end
         end
 
-        @request          = TestRequest.create
+        @request          = TestRequest.create(@controller.class)
         @response         = build_response @response_klass
         @response.request = @request
 
@@ -629,68 +596,28 @@ module ActionController
 
       private
 
-      def scrub_env!(env)
-        env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ }
-        env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
-        env.delete 'action_dispatch.request.query_parameters'
-        env.delete 'action_dispatch.request.request_parameters'
-        env['rack.input'] = StringIO.new
-        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)
+        def scrub_env!(env)
+          env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ }
+          env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
+          env.delete "action_dispatch.request.query_parameters"
+          env.delete "action_dispatch.request.request_parameters"
+          env["rack.input"] = StringIO.new
+          env
         end
-      end
-
-      REQUEST_KWARGS = %i(params session flash method body xhr)
-      FORMAT_KWARGS = %i(format as)
-      def kwarg_request?(args)
-        args.size == 1 && args[0].respond_to?(:keys) && (
-          args[0].keys.all? { |k| FORMAT_KWARGS.include?(k) } ||
-          args[0].keys.any? { |k| REQUEST_KWARGS.include?(k) }
-        )
-      end
-
-      def non_kwarg_request_warning
-        ActiveSupport::Deprecation.warn(<<-MSG.strip_heredoc)
-          Using positional arguments in functional tests has been deprecated,
-          in favor of keyword arguments, and will be removed in Rails 5.1.
 
-          Deprecated style:
-          get :show, { id: 1 }, nil, { notice: "This is a flash message" }
-
-          New keyword style:
-          get :show, params: { id: 1 }, flash: { notice: "This is a flash message" },
-            session: nil # Can safely be omitted.
-        MSG
-      end
-
-      def document_root_element
-        html_document.root
-      end
+        def document_root_element
+          html_document.root
+        end
 
-      def check_required_ivars
-        # Sanity check for required instance variables so we can give an
-        # understandable error message.
-        [:@routes, :@controller, :@request, :@response].each do |iv_name|
-          if !instance_variable_defined?(iv_name) || instance_variable_get(iv_name).nil?
-            raise "#{iv_name} is nil: make sure you set it in your test's setup method."
+        def check_required_ivars
+          # Sanity check for required instance variables so we can give an
+          # understandable error message.
+          [:@routes, :@controller, :@request, :@response].each do |iv_name|
+            if !instance_variable_defined?(iv_name) || instance_variable_get(iv_name).nil?
+              raise "#{iv_name} is nil: make sure you set it in your test's setup method."
+            end
           end
         end
-      end
-
-      def html_format?(parameters)
-        return true unless parameters.key?(:format)
-        Mime.fetch(parameters[:format]) { Mime['html'] }.html?
-      end
     end
 
     include Behavior