RubyGems - actionpack - Versions diffs - 7.0.4 → 7.1.3.4 - Mend

actionpack 7.0.4 → 7.1.3.4

Potentially problematic release.

This version of actionpack might be problematic. Click here for more details.

Files changed (140) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +397 -269
data/MIT-LICENSE +1 -1
data/README.rdoc +4 -4
data/lib/abstract_controller/base.rb +20 -11
data/lib/abstract_controller/caching/fragments.rb +2 -0
data/lib/abstract_controller/callbacks.rb +31 -6
data/lib/abstract_controller/deprecator.rb +7 -0
data/lib/abstract_controller/helpers.rb +75 -28
data/lib/abstract_controller/railties/routes_helpers.rb +1 -16
data/lib/abstract_controller/rendering.rb +12 -14
data/lib/abstract_controller/translation.rb +9 -6
data/lib/abstract_controller/url_for.rb +2 -0
data/lib/abstract_controller.rb +6 -0
data/lib/action_controller/api.rb +6 -4
data/lib/action_controller/base.rb +3 -17
data/lib/action_controller/caching.rb +2 -0
data/lib/action_controller/deprecator.rb +7 -0
data/lib/action_controller/form_builder.rb +2 -0
data/lib/action_controller/log_subscriber.rb +16 -4
data/lib/action_controller/metal/basic_implicit_render.rb +3 -1
data/lib/action_controller/metal/conditional_get.rb +121 -123
data/lib/action_controller/metal/content_security_policy.rb +5 -5
data/lib/action_controller/metal/data_streaming.rb +20 -18
data/lib/action_controller/metal/default_headers.rb +2 -0
data/lib/action_controller/metal/etag_with_flash.rb +3 -1
data/lib/action_controller/metal/etag_with_template_digest.rb +2 -0
data/lib/action_controller/metal/exceptions.rb +8 -0
data/lib/action_controller/metal/head.rb +9 -7
data/lib/action_controller/metal/helpers.rb +3 -14
data/lib/action_controller/metal/http_authentication.rb +17 -8
data/lib/action_controller/metal/implicit_render.rb +5 -3
data/lib/action_controller/metal/instrumentation.rb +8 -1
data/lib/action_controller/metal/live.rb +25 -1
data/lib/action_controller/metal/mime_responds.rb +2 -2
data/lib/action_controller/metal/params_wrapper.rb +4 -2
data/lib/action_controller/metal/permissions_policy.rb +2 -2
data/lib/action_controller/metal/redirecting.rb +29 -8
data/lib/action_controller/metal/renderers.rb +4 -4
data/lib/action_controller/metal/rendering.rb +114 -9
data/lib/action_controller/metal/request_forgery_protection.rb +144 -53
data/lib/action_controller/metal/rescue.rb +6 -3
data/lib/action_controller/metal/streaming.rb +71 -31
data/lib/action_controller/metal/strong_parameters.rb +158 -101
data/lib/action_controller/metal/url_for.rb +9 -4
data/lib/action_controller/metal.rb +79 -21
data/lib/action_controller/railtie.rb +24 -10
data/lib/action_controller/renderer.rb +99 -85
data/lib/action_controller/test_case.rb +15 -5
data/lib/action_controller.rb +8 -1
data/lib/action_dispatch/constants.rb +32 -0
data/lib/action_dispatch/deprecator.rb +7 -0
data/lib/action_dispatch/http/cache.rb +9 -11
data/lib/action_dispatch/http/content_security_policy.rb +14 -9
data/lib/action_dispatch/http/filter_parameters.rb +14 -28
data/lib/action_dispatch/http/headers.rb +3 -1
data/lib/action_dispatch/http/mime_negotiation.rb +22 -22
data/lib/action_dispatch/http/mime_type.rb +35 -12
data/lib/action_dispatch/http/mime_types.rb +3 -1
data/lib/action_dispatch/http/parameters.rb +1 -1
data/lib/action_dispatch/http/permissions_policy.rb +38 -23
data/lib/action_dispatch/http/rack_cache.rb +2 -0
data/lib/action_dispatch/http/request.rb +63 -30
data/lib/action_dispatch/http/response.rb +80 -63
data/lib/action_dispatch/http/upload.rb +15 -2
data/lib/action_dispatch/journey/formatter.rb +8 -2
data/lib/action_dispatch/journey/path/pattern.rb +14 -14
data/lib/action_dispatch/journey/route.rb +3 -2
data/lib/action_dispatch/journey/router.rb +9 -8
data/lib/action_dispatch/journey/routes.rb +2 -2
data/lib/action_dispatch/log_subscriber.rb +23 -0
data/lib/action_dispatch/middleware/actionable_exceptions.rb +5 -6
data/lib/action_dispatch/middleware/assume_ssl.rb +24 -0
data/lib/action_dispatch/middleware/callbacks.rb +2 -0
data/lib/action_dispatch/middleware/cookies.rb +108 -117
data/lib/action_dispatch/middleware/debug_exceptions.rb +26 -25
data/lib/action_dispatch/middleware/debug_locks.rb +4 -1
data/lib/action_dispatch/middleware/debug_view.rb +7 -2
data/lib/action_dispatch/middleware/exception_wrapper.rb +186 -27
data/lib/action_dispatch/middleware/executor.rb +1 -1
data/lib/action_dispatch/middleware/flash.rb +7 -0
data/lib/action_dispatch/middleware/host_authorization.rb +18 -8
data/lib/action_dispatch/middleware/public_exceptions.rb +5 -3
data/lib/action_dispatch/middleware/reloader.rb +7 -5
data/lib/action_dispatch/middleware/remote_ip.rb +21 -20
data/lib/action_dispatch/middleware/request_id.rb +4 -2
data/lib/action_dispatch/middleware/server_timing.rb +4 -4
data/lib/action_dispatch/middleware/session/abstract_store.rb +5 -0
data/lib/action_dispatch/middleware/session/cache_store.rb +2 -0
data/lib/action_dispatch/middleware/session/cookie_store.rb +11 -5
data/lib/action_dispatch/middleware/session/mem_cache_store.rb +3 -1
data/lib/action_dispatch/middleware/show_exceptions.rb +25 -18
data/lib/action_dispatch/middleware/ssl.rb +18 -6
data/lib/action_dispatch/middleware/stack.rb +7 -2
data/lib/action_dispatch/middleware/static.rb +14 -10
data/lib/action_dispatch/middleware/templates/rescues/_actions.html.erb +2 -2
data/lib/action_dispatch/middleware/templates/rescues/_message_and_suggestions.html.erb +4 -4
data/lib/action_dispatch/middleware/templates/rescues/_source.html.erb +8 -1
data/lib/action_dispatch/middleware/templates/rescues/blocked_host.html.erb +7 -3
data/lib/action_dispatch/middleware/templates/rescues/blocked_host.text.erb +5 -3
data/lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb +7 -7
data/lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb +2 -2
data/lib/action_dispatch/middleware/templates/rescues/layout.erb +17 -0
data/lib/action_dispatch/middleware/templates/rescues/missing_exact_template.html.erb +16 -12
data/lib/action_dispatch/middleware/templates/rescues/missing_template.html.erb +1 -1
data/lib/action_dispatch/middleware/templates/rescues/routing_error.html.erb +3 -3
data/lib/action_dispatch/middleware/templates/rescues/template_error.html.erb +4 -4
data/lib/action_dispatch/middleware/templates/rescues/unknown_action.html.erb +1 -1
data/lib/action_dispatch/middleware/templates/rescues/unknown_action.text.erb +1 -1
data/lib/action_dispatch/middleware/templates/routes/_route.html.erb +3 -0
data/lib/action_dispatch/middleware/templates/routes/_table.html.erb +59 -41
data/lib/action_dispatch/railtie.rb +14 -4
data/lib/action_dispatch/request/session.rb +16 -6
data/lib/action_dispatch/request/utils.rb +8 -3
data/lib/action_dispatch/routing/inspector.rb +54 -6
data/lib/action_dispatch/routing/mapper.rb +58 -24
data/lib/action_dispatch/routing/polymorphic_routes.rb +2 -0
data/lib/action_dispatch/routing/redirection.rb +15 -6
data/lib/action_dispatch/routing/route_set.rb +52 -22
data/lib/action_dispatch/routing/routes_proxy.rb +10 -15
data/lib/action_dispatch/routing/url_for.rb +26 -22
data/lib/action_dispatch/routing.rb +7 -7
data/lib/action_dispatch/system_test_case.rb +3 -3
data/lib/action_dispatch/system_testing/browser.rb +20 -19
data/lib/action_dispatch/system_testing/driver.rb +14 -22
data/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb +27 -16
data/lib/action_dispatch/testing/assertion_response.rb +1 -1
data/lib/action_dispatch/testing/assertions/response.rb +14 -7
data/lib/action_dispatch/testing/assertions/routing.rb +67 -28
data/lib/action_dispatch/testing/assertions.rb +3 -1
data/lib/action_dispatch/testing/integration.rb +27 -17
data/lib/action_dispatch/testing/request_encoder.rb +4 -1
data/lib/action_dispatch/testing/test_process.rb +4 -3
data/lib/action_dispatch/testing/test_request.rb +1 -1
data/lib/action_dispatch/testing/test_response.rb +23 -9
data/lib/action_dispatch.rb +37 -4
data/lib/action_pack/gem_version.rb +4 -4
data/lib/action_pack/version.rb +1 -1
data/lib/action_pack.rb +1 -1
metadata +65 -29

data/lib/action_dispatch/routing/redirection.rb CHANGED Viewed

@@ -18,10 +18,19 @@ module ActionDispatch
       def redirect?; true; end
       def call(env)
-        serve Request.new env
+        ActiveSupport::Notifications.instrument("redirect.action_dispatch") do |payload|
+          request = Request.new(env)
+          response = build_response(request)
+          payload[:status] = @status
+          payload[:location] = response.headers["Location"]
+          payload[:request] = request
+          response.to_a
+        end
       end
-      def serve(req)
+      def build_response(req)
         uri = URI.parse(path(req.path_parameters, req))
         unless uri.host
@@ -38,15 +47,15 @@ module ActionDispatch
         req.commit_flash
-        body = %(<html><body>You are being <a href="#{ERB::Util.unwrapped_html_escape(uri.to_s)}">redirected</a>.</body></html>)
+        body = ""
         headers = {
           "Location" => uri.to_s,
-          "Content-Type" => "text/html",
+          "Content-Type" => "text/html; charset=#{ActionDispatch::Response.default_charset}",
           "Content-Length" => body.length.to_s
         }
-        [ status, headers, [body] ]
+        ActionDispatch::Response.new(status, headers, body)
       end
       def path(params, request)
@@ -59,7 +68,7 @@ module ActionDispatch
       private
         def relative_path?(path)
-          path && !path.empty? && path[0] != "/"
+          path && !path.empty? && !path.start_with?("/")
         end
         def escape(params)

data/lib/action_dispatch/routing/route_set.rb CHANGED Viewed

@@ -34,20 +34,20 @@ module ActionDispatch
           if @raise_on_name_error
             raise
           else
-            [404, { "X-Cascade" => "pass" }, []]
+            [404, { Constants::X_CASCADE => "pass" }, []]
           end
         end
-      private
-        def controller(req)
-          req.controller_class
-        rescue NameError => e
-          raise ActionController::RoutingError, e.message, e.backtrace
-        end
+        private
+          def controller(req)
+            req.controller_class
+          rescue NameError => e
+            raise ActionController::RoutingError, e.message, e.backtrace
+          end
-        def dispatch(controller, action, req, res)
-          controller.dispatch(action, req, res)
-        end
+          def dispatch(controller, action, req, res)
+            controller.dispatch(action, req, res)
+          end
       end
       class StaticDispatcher < Dispatcher
@@ -282,7 +282,7 @@ module ActionDispatch
               if args.size < path_params_size
                 path_params -= controller_options.keys
-                path_params -= result.keys
+                path_params -= (result[:path_params] || {}).merge(result).keys
               else
                 path_params = path_params.dup
               end
@@ -375,6 +375,7 @@ module ActionDispatch
         @disable_clear_and_finalize = false
         @finalized                  = false
         @env_key                    = "ROUTES_#{object_id}_SCRIPT_NAME"
+        @default_env                = nil
         @set    = Journey::Routes.new
         @router = Journey::Router.new @set
@@ -405,6 +406,25 @@ module ActionDispatch
       end
       private :make_request
+      def default_env
+        if default_url_options != @default_env&.[]("action_dispatch.routes.default_url_options")
+          url_options = default_url_options.dup.freeze
+          uri = URI(ActionDispatch::Http::URL.full_url_for(host: "example.org", **url_options))
+          @default_env = {
+            "action_dispatch.routes" => self,
+            "action_dispatch.routes.default_url_options" => url_options,
+            "HTTPS" => uri.scheme == "https" ? "on" : "off",
+            "rack.url_scheme" => uri.scheme,
+            "HTTP_HOST" => uri.port == uri.default_port ? uri.host : "#{uri.host}:#{uri.port}",
+            "SCRIPT_NAME" => uri.path.chomp("/"),
+            "rack.input" => "",
+          }.freeze
+        end
+        @default_env
+      end
       def draw(&block)
         clear! unless @disable_clear_and_finalize
         eval_block(block)
@@ -574,6 +594,20 @@ module ActionDispatch
           end
           private :_generate_paths_by_default
+          # If the module is included more than once (for example, in a subclass
+          # of an ancestor that includes the module), ensure that the `_routes`
+          # singleton and instance methods return the desired route set by
+          # including a new copy of the module (recursively if necessary). Note
+          # that this method is called for each inclusion, whereas the above
+          # `included` block is run only for the initial inclusion of each copy.
+          def self.included(base)
+            super
+            if base.respond_to?(:_routes) && !base._routes.equal?(@_proxy._routes)
+              @dup_for_reinclude ||= self.dup
+              base.include @dup_for_reinclude
+            end
+          end
         end
       end
@@ -596,16 +630,16 @@ module ActionDispatch
         named_routes[name] = route if name
         if route.segment_keys.include?(:controller)
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          ActionDispatch.deprecator.warn(<<-MSG.squish)
             Using a dynamic :controller segment in a route is deprecated and
-            will be removed in Rails 7.1.
+            will be removed in Rails 7.2.
           MSG
         end
         if route.segment_keys.include?(:action)
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+          ActionDispatch.deprecator.warn(<<-MSG.squish)
             Using a dynamic :action segment in a route is deprecated and
-            will be removed in Rails 7.1.
+            will be removed in Rails 7.2.
           MSG
         end
@@ -779,18 +813,14 @@ module ActionDispatch
       RESERVED_OPTIONS = [:host, :protocol, :port, :subdomain, :domain, :tld_length,
                           :trailing_slash, :anchor, :params, :only_path, :script_name,
-                          :original_script_name, :relative_url_root]
+                          :original_script_name]
       def optimize_routes_generation?
         default_url_options.empty?
       end
       def find_script_name(options)
-        options.delete(:script_name) || find_relative_url_root(options) || ""
-      end
-      def find_relative_url_root(options)
-        options.delete(:relative_url_root) || relative_url_root
+        options.delete(:script_name) || relative_url_root || ""
       end
       def path_for(options, route_name = nil, reserved = RESERVED_OPTIONS)
@@ -854,7 +884,7 @@ module ActionDispatch
       def recognize_path(path, environment = {})
         method = (environment[:method] || "GET").to_s.upcase
-        path = Journey::Router::Utils.normalize_path(path) unless %r{://}.match?(path)
+        path = Journey::Router::Utils.normalize_path(path) unless path&.include?("://")
         extras = environment[:extras] || {}
         begin

data/lib/action_dispatch/routing/routes_proxy.rb CHANGED Viewed

@@ -29,23 +29,18 @@ module ActionDispatch
       def method_missing(method, *args)
         if @helpers.respond_to?(method)
-          self.class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def #{method}(*args)
-              options = args.extract_options!
-              options = url_options.merge((options || {}).symbolize_keys)
+          options = args.extract_options!
+          options = url_options.merge((options || {}).symbolize_keys)
-              if @script_namer
-                options[:script_name] = merge_script_names(
-                  options[:script_name],
-                  @script_namer.call(options)
-                )
-              end
+          if @script_namer
+            options[:script_name] = merge_script_names(
+              options[:script_name],
+              @script_namer.call(options)
+            )
+          end
-              args << options
-              @helpers.#{method}(*args)
-            end
-          RUBY
-          public_send(method, *args)
+          args << options
+          @helpers.public_send(method, *args)
         else
           super
         end

data/lib/action_dispatch/routing/url_for.rb CHANGED Viewed

@@ -2,20 +2,22 @@
 module ActionDispatch
   module Routing
+    # = Action Dispatch Routing \UrlFor
+    #
     # In <tt>config/routes.rb</tt> you define URL-to-controller mappings, but the reverse
     # is also possible: a URL can be generated from one of your routing definitions.
     # URL generation functionality is centralized in this module.
     #
-    # See ActionDispatch::Routing for general information about routing and routes.rb.
+    # See ActionDispatch::Routing for general information about routing and <tt>config/routes.rb</tt>.
     #
     # <b>Tip:</b> If you need to generate URLs from your models or some other place,
-    # then ActionController::UrlFor is what you're looking for. Read on for
+    # then ActionDispatch::Routing::UrlFor is what you're looking for. Read on for
     # an introduction. In general, this module should not be included on its own,
-    # as it is usually included by url_helpers (as in Rails.application.routes.url_helpers).
+    # as it is usually included by +url_helpers+ (as in <tt>Rails.application.routes.url_helpers</tt>).
     #
     # == URL generation from parameters
     #
-    # As you may know, some functions, such as ActionController::Base#url_for
+    # As you may know, some functions, such as <tt>ActionController::Base#url_for</tt>
     # and ActionView::Helpers::UrlHelper#link_to, can generate URLs given a set
     # of parameters. For example, you've probably had the chance to write code
     # like this in one of your views:
@@ -24,12 +26,12 @@ module ActionDispatch
     #           action: 'new', message: 'Welcome!') %>
     #   # => <a href="/users/new?message=Welcome%21">Click here</a>
     #
-    # link_to, and all other functions that require URL generation functionality,
-    # actually use ActionController::UrlFor under the hood. And in particular,
-    # they use the ActionController::UrlFor#url_for method. One can generate
+    # +link_to+, and all other functions that require URL generation functionality,
+    # actually use ActionDispatch::Routing::UrlFor under the hood. And in particular,
+    # they use the ActionDispatch::Routing::UrlFor#url_for method. One can generate
     # the same path as the above example by using the following code:
     #
-    #   include UrlFor
+    #   include ActionDispatch::Routing::UrlFor
     #   url_for(controller: 'users',
     #           action: 'new',
     #           message: 'Welcome!',
@@ -37,7 +39,7 @@ module ActionDispatch
     #   # => "/users/new?message=Welcome%21"
     #
     # Notice the <tt>only_path: true</tt> part. This is because UrlFor has no
-    # information about the website hostname that your Rails app is serving. So if you
+    # information about the website hostname that your \Rails app is serving. So if you
     # want to include the hostname as well, then you must also pass the <tt>:host</tt>
     # argument:
     #
@@ -48,17 +50,17 @@ module ActionDispatch
     #           host: 'www.example.com')
     #   # => "http://www.example.com/users/new?message=Welcome%21"
     #
-    # By default, all controllers and views have access to a special version of url_for,
-    # that already knows what the current hostname is. So if you use url_for in your
+    # By default, all controllers and views have access to a special version of +url_for+,
+    # that already knows what the current hostname is. So if you use +url_for+ in your
     # controllers or your views, then you don't need to explicitly pass the <tt>:host</tt>
     # argument.
     #
-    # For convenience reasons, mailers provide a shortcut for ActionController::UrlFor#url_for.
-    # So within mailers, you only have to type +url_for+ instead of 'ActionController::UrlFor#url_for'
-    # in full. However, mailers don't have hostname information, and you still have to provide
-    # the +:host+ argument or set the default host that will be used in all mailers using the
-    # configuration option +config.action_mailer.default_url_options+. For more information on
-    # url_for in mailers read the ActionMailer#Base documentation.
+    # For convenience, mailers also include ActionDispatch::Routing::UrlFor. So
+    # within mailers, you can use url_for. However, mailers cannot access
+    # incoming web requests in order to derive hostname information, so you have
+    # to provide the +:host+ option or set the default host using
+    # +default_url_options+. For more information on url_for in mailers see the
+    # ActionMailer::Base documentation.
     #
     #
     # == URL generation for named routes
@@ -72,7 +74,7 @@ module ActionDispatch
     # This generates, among other things, the method <tt>users_path</tt>. By default,
     # this method is accessible from your controllers, views, and mailers. If you need
     # to access this auto-generated method from other places (such as a model), then
-    # you can do that by including Rails.application.routes.url_helpers in your class:
+    # you can do that by including <tt>Rails.application.routes.url_helpers</tt> in your class:
     #
     #   class User < ActiveRecord::Base
     #     include Rails.application.routes.url_helpers
@@ -115,11 +117,11 @@ module ActionDispatch
         default_url_options
       end
-      # Generate a URL based on the options provided, default_url_options, and the
-      # routes defined in routes.rb. The following options are supported:
+      # Generate a URL based on the options provided, +default_url_options+, and the
+      # routes defined in <tt>config/routes.rb</tt>. The following options are supported:
       #
       # * <tt>:only_path</tt> - If true, the relative URL is returned. Defaults to +false+.
-      # * <tt>:protocol</tt> - The protocol to connect to. Defaults to 'http'.
+      # * <tt>:protocol</tt> - The protocol to connect to. Defaults to <tt>"http"</tt>.
       # * <tt>:host</tt> - Specifies the host the link should be targeted at.
       #   If <tt>:only_path</tt> is false, this option must be
       #   provided either explicitly, or via +default_url_options+.
@@ -134,7 +136,9 @@ module ActionDispatch
       # * <tt>:port</tt> - Optionally specify the port to connect to.
       # * <tt>:anchor</tt> - An anchor name to be appended to the path.
       # * <tt>:params</tt> - The query parameters to be appended to the path.
-      # * <tt>:trailing_slash</tt> - If true, adds a trailing slash, as in "/archive/2009/"
+      # * <tt>:path_params</tt> - The query parameters that will only be used
+      #   for the named dynamic segments of path. If unused, they will be discarded.
+      # * <tt>:trailing_slash</tt> - If true, adds a trailing slash, as in <tt>"/archive/2009/"</tt>.
       # * <tt>:script_name</tt> - Specifies application path relative to domain root. If provided, prepends application path.
       #
       # Any other key (<tt>:controller</tt>, <tt>:action</tt>, etc.) given to

data/lib/action_dispatch/routing.rb CHANGED Viewed

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-require "active_support/core_ext/string/filters"
 module ActionDispatch
   # The routing module provides URL rewriting in native Ruby. It's a way to
   # redirect incoming requests to controllers and actions. This replaces
@@ -119,9 +117,9 @@ module ActionDispatch
   #
   #   # In config/routes.rb
   #   controller :blog do
-  #     get 'blog/show',    to: :list
-  #     get 'blog/delete',  to: :delete
-  #     get 'blog/edit',    to: :edit
+  #     get 'blog/show'    => :list
+  #     get 'blog/delete'  => :delete
+  #     get 'blog/edit'    => :edit
   #   end
   #
   #   # provides named routes for show, delete, and edit
@@ -240,7 +238,7 @@ module ActionDispatch
   #
   # == View a list of all your routes
   #
-  #   rails routes
+  #   $ bin/rails routes
   #
   # Target a specific controller with <tt>-c</tt>, or grep routes
   # using <tt>-g</tt>. Useful in conjunction with <tt>--expanded</tt>
@@ -250,7 +248,9 @@ module ActionDispatch
     autoload :Mapper
     autoload :RouteSet
-    autoload :RoutesProxy
+    eager_autoload do
+      autoload :RoutesProxy
+    end
     autoload :UrlFor
     autoload :PolymorphicRoutes

data/lib/action_dispatch/system_test_case.rb CHANGED Viewed

@@ -51,7 +51,7 @@ module ActionDispatch
   #     driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
   #   end
   #
-  # By default, <tt>ActionDispatch::SystemTestCase</tt> is driven by the
+  # By default, +ActionDispatch::SystemTestCase+ is driven by the
   # Selenium driver, with the Chrome browser, and a browser size of 1400x1400.
   #
   # Changing the driver configuration options is easy. Let's say you want to use
@@ -106,8 +106,8 @@ module ActionDispatch
   #     end
   #   end
   #
-  # Because <tt>ActionDispatch::SystemTestCase</tt> is a shim between Capybara
-  # and Rails, any driver that is supported by Capybara is supported by system
+  # Because +ActionDispatch::SystemTestCase+ is a shim between Capybara
+  # and \Rails, any driver that is supported by Capybara is supported by system
   # tests as long as you include the required gems and files.
   class SystemTestCase < ActiveSupport::TestCase
     include Capybara::DSL

data/lib/action_dispatch/system_testing/browser.rb CHANGED Viewed

@@ -3,7 +3,7 @@
 module ActionDispatch
   module SystemTesting
     class Browser # :nodoc:
-      attr_reader :name, :options
+      attr_reader :name
       def initialize(name)
         @name = name
@@ -21,35 +21,32 @@ module ActionDispatch
         end
       end
+      def options
+        @options ||=
+          case type
+          when :chrome
+            ::Selenium::WebDriver::Chrome::Options.new
+          when :firefox
+            ::Selenium::WebDriver::Firefox::Options.new
+          end
+      end
       def configure
-        initialize_options
-        yield options if block_given? && options
+        yield options if block_given?
       end
-      # driver_path can be configured as a proc. The webdrivers gem uses this
-      # proc to update web drivers. Running this proc early allows us to only
-      # update the webdriver once and avoid race conditions when using
-      # parallel tests.
+      # driver_path is lazily initialized by default. Eagerly set it to
+      # avoid race conditions when using parallel tests.
       def preload
         case type
         when :chrome
-          ::Selenium::WebDriver::Chrome::Service.driver_path&.call
+          resolve_driver_path(::Selenium::WebDriver::Chrome)
         when :firefox
-          ::Selenium::WebDriver::Firefox::Service.driver_path&.call
+          resolve_driver_path(::Selenium::WebDriver::Firefox)
         end
       end
       private
-        def initialize_options
-          @options ||=
-            case type
-            when :chrome
-              ::Selenium::WebDriver::Chrome::Options.new
-            when :firefox
-              ::Selenium::WebDriver::Firefox::Options.new
-            end
-        end
         def set_default_options
           case name
           when :headless_chrome
@@ -71,6 +68,10 @@ module ActionDispatch
             capabilities.add_argument("-headless")
           end
         end
+        def resolve_driver_path(namespace)
+          namespace::Service.driver_path = ::Selenium::WebDriver::DriverFinder.path(options, namespace::Service)
+        end
     end
   end
 end

data/lib/action_dispatch/system_testing/driver.rb CHANGED Viewed

@@ -12,14 +12,6 @@ module ActionDispatch
         @name = @options.delete(:name) || driver_type
         @capabilities = capabilities
-        if [:poltergeist, :webkit].include?(driver_type)
-          ActiveSupport::Deprecation.warn <<~MSG.squish
-            Poltergeist and capybara-webkit are not maintained already.
-            Driver registration of :poltergeist or :webkit is deprecated and will be removed in Rails 7.1.
-            You can still use :selenium, and also :cuprite is available for alternative to Poltergeist.
-          MSG
-        end
         if driver_type == :selenium
           gem "selenium-webdriver", ">= 4.0.0"
           require "selenium/webdriver"
@@ -38,7 +30,7 @@ module ActionDispatch
       private
         def registerable?
-          [:selenium, :poltergeist, :webkit, :cuprite, :rack_test].include?(@driver_type)
+          [:selenium, :cuprite, :rack_test, :playwright].include?(@driver_type)
         end
         def register
@@ -47,16 +39,15 @@ module ActionDispatch
           Capybara.register_driver name do |app|
             case @driver_type
             when :selenium then register_selenium(app)
-            when :poltergeist then register_poltergeist(app)
-            when :webkit then register_webkit(app)
             when :cuprite then register_cuprite(app)
             when :rack_test then register_rack_test(app)
+            when :playwright then register_playwright(app)
             end
           end
         end
         def browser_options
-          @options.merge(capabilities: @browser.options).compact
+          @options.merge(options: @browser.options).compact
         end
         def register_selenium(app)
@@ -65,16 +56,6 @@ module ActionDispatch
           end
         end
-        def register_poltergeist(app)
-          Capybara::Poltergeist::Driver.new(app, @options.merge(window_size: @screen_size))
-        end
-        def register_webkit(app)
-          Capybara::Webkit::Driver.new(app, Capybara::Webkit::Configuration.to_hash.merge(@options)).tap do |driver|
-            driver.resize_window_to(driver.current_window_handle, *@screen_size)
-          end
-        end
         def register_cuprite(app)
           Capybara::Cuprite::Driver.new(app, @options.merge(window_size: @screen_size))
         end
@@ -83,6 +64,17 @@ module ActionDispatch
           Capybara::RackTest::Driver.new(app, respect_data_method: true, **@options)
         end
+        def register_playwright(app)
+          screen = { width: @screen_size[0], height: @screen_size[1] } if @screen_size
+          options = {
+            screen: screen,
+            viewport: screen,
+            **@options
+          }.compact
+          Capybara::Playwright::Driver.new(app, **options)
+        end
         def setup
           Capybara.current_driver = name
         end

data/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb CHANGED Viewed

@@ -13,28 +13,28 @@ module ActionDispatch
         # to investigate changes at different points during your test. These will be
         # named with a sequential prefix (or 'failed' for failing tests)
         #
-        # The screenshot will be displayed in your console, if supported.
-        #
         # The default screenshots directory is +tmp/screenshots+ but you can set a different
         # one with +Capybara.save_path+
         #
-        # You can set the +RAILS_SYSTEM_TESTING_SCREENSHOT_HTML+ environment variable to
-        # save the HTML from the page that is being screenshotted so you can investigate the
-        # elements on the page at the time of the screenshot
+        # You can use the +html+ argument or set the +RAILS_SYSTEM_TESTING_SCREENSHOT_HTML+
+        # environment variable to save the HTML from the page that is being screenshotted
+        # so you can investigate the elements on the page at the time of the screenshot
         #
-        # You can set the +RAILS_SYSTEM_TESTING_SCREENSHOT+ environment variable to
-        # control the output. Possible values are:
+        # You can use the +screenshot+ argument or set the +RAILS_SYSTEM_TESTING_SCREENSHOT+
+        # environment variable to control the output. Possible values are:
         # * [+simple+ (default)]    Only displays the screenshot path.
         #                           This is the default value.
         # * [+inline+]              Display the screenshot in the terminal using the
         #                           iTerm image protocol (https://iterm2.com/documentation-images.html).
         # * [+artifact+]            Display the screenshot in the terminal, using the terminal
         #                           artifact format (https://buildkite.github.io/terminal-to-html/inline-images/).
-        def take_screenshot
+        def take_screenshot(html: false, screenshot: nil)
+          showing_html = html || html_from_env?
           increment_unique
-          save_html if save_html?
+          save_html if showing_html
           save_image
-          puts display_image
+          show display_image(html: showing_html, screenshot_output: screenshot)
         end
         # Takes a screenshot of the current page in the browser if the test
@@ -42,13 +42,16 @@ module ActionDispatch
         #
         # +take_failed_screenshot+ is called during system test teardown.
         def take_failed_screenshot
-          take_screenshot if failed? && supports_screenshot? && Capybara::Session.instance_created?
+          return unless failed? && supports_screenshot? && Capybara::Session.instance_created?
+          take_screenshot
+          metadata[:failure_screenshot_path] = relative_image_path if Minitest::Runnable.method_defined?(:metadata)
         end
         private
           attr_accessor :_screenshot_counter
-          def save_html?
+          def html_from_env?
             ENV["RAILS_SYSTEM_TESTING_SCREENSHOT_HTML"] == "1"
           end
@@ -62,7 +65,7 @@ module ActionDispatch
           end
           def image_name
-            sanitized_method_name = method_name.tr("/\\", "--")
+            sanitized_method_name = method_name.gsub(/[^\w]+/, "-")
             name = "#{unique}_#{sanitized_method_name}"
             name[0...225]
           end
@@ -87,6 +90,10 @@ module ActionDispatch
             "#{absolute_path}.png"
           end
+          def relative_image_path
+            "#{absolute_path.relative_path_from(Rails.root)}.png"
+          end
           def absolute_html_path
             "#{absolute_path}.html"
           end
@@ -109,11 +116,15 @@ module ActionDispatch
             output_type
           end
-          def display_image
+          def show(img)
+            puts img
+          end
+          def display_image(html:, screenshot_output:)
             message = +"[Screenshot Image]: #{image_path}\n"
-            message << +"[Screenshot HTML]: #{html_path}\n" if save_html?
+            message << +"[Screenshot HTML]: #{html_path}\n" if html
-            case output_type
+            case screenshot_output || output_type
             when "artifact"
               message << "\e]1338;url=artifact://#{absolute_image_path}\a\n"
             when "inline"

data/lib/action_dispatch/testing/assertion_response.rb CHANGED Viewed

@@ -36,7 +36,7 @@ module ActionDispatch
     private
       def code_from_name(name)
-        GENERIC_RESPONSE_CODES[name] || Rack::Utils::SYMBOL_TO_STATUS_CODE[name]
+        GENERIC_RESPONSE_CODES[name] || Rack::Utils.status_code(name)
       end
       def name_from_code(code)