actionpack 5.2.8.1 → 6.0.6

data/lib/action_dispatch/testing/assertions/routing.rb

@@ -9,6 +9,11 @@ module ActionDispatch
   module Assertions
     # Suite of assertions to test routes generated by \Rails and the handling of requests made to them.
     module RoutingAssertions
+      def setup # :nodoc:
+        @routes ||= nil
+        super
+      end
+
       # Asserts that the routing of the given +path+ was handled correctly and that the parsed options (given in the +expected_options+ hash)
       # match +path+. Basically, it asserts that \Rails recognizes the route given by +expected_options+.
       #
@@ -78,7 +83,7 @@ module ActionDispatch
       #   # Asserts that the generated route gives us our custom route
       #   assert_generates "changesets/12", { controller: 'scm', action: 'show_diff', revision: "12" }
       def assert_generates(expected_path, options, defaults = {}, extras = {}, message = nil)
-        if expected_path =~ %r{://}
+        if %r{://}.match?(expected_path)
           fail_on(URI::InvalidURIError, message) do
             uri = URI.parse(expected_path)
             expected_path = uri.path.to_s.empty? ? "/" : uri.path
@@ -155,9 +160,16 @@ module ActionDispatch
           @controller.singleton_class.include(_routes.url_helpers)
 
           if @controller.respond_to? :view_context_class
-            @controller.view_context_class = Class.new(@controller.view_context_class) do
+            view_context_class = Class.new(@controller.view_context_class) do
               include _routes.url_helpers
             end
+
+            custom_view_context = Module.new {
+              define_method(:view_context_class) do
+                view_context_class
+              end
+            }
+            @controller.extend(custom_view_context)
           end
         end
         yield @routes
@@ -189,7 +201,7 @@ module ActionDispatch
 
           request = ActionController::TestRequest.create @controller.class
 
-          if path =~ %r{://}
+          if %r{://}.match?(path)
             fail_on(URI::InvalidURIError, msg) do
               uri = URI.parse(path)
               request.env["rack.url_scheme"] = uri.scheme || "http"

data/lib/action_dispatch/testing/assertions.rb

@@ -14,7 +14,7 @@ module ActionDispatch
     include Rails::Dom::Testing::Assertions
 
     def html_document
-      @html_document ||= if @response.content_type.to_s.end_with?("xml")
+      @html_document ||= if @response.media_type.to_s.end_with?("xml")
         Nokogiri::XML::Document.parse(@response.body)
       else
         Nokogiri::HTML::Document.parse(@response.body)

data/lib/action_dispatch/testing/integration.rb

@@ -44,16 +44,17 @@ module ActionDispatch
 
       # Performs a HEAD request with the given parameters. See ActionDispatch::Integration::Session#process
       # for more details.
-      def head(path, *args)
-        process(:head, path, *args)
+      def head(path, **args)
+        process(:head, path, **args)
       end
 
       # Follow a single redirect response. If the last response was not a
       # redirect, an exception will be raised. Otherwise, the redirect is
-      # performed on the location header.
-      def follow_redirect!
+      # performed on the location header. Any arguments are passed to the
+      # underlying call to `get`.
+      def follow_redirect!(**args)
         raise "not a redirect! #{status} #{status_message}" unless redirect?
-        get(response.location)
+        get(response.location, **args)
         status
       end
     end
@@ -189,6 +190,12 @@ module ActionDispatch
       #   merged into the Rack env hash.
       # - +env+: Additional env to pass, as a Hash. The headers will be
       #   merged into the Rack env hash.
+      # - +xhr+: Set to `true` if you want to make and Ajax request.
+      #   Adds request headers characteristic of XMLHttpRequest e.g. HTTP_X_REQUESTED_WITH.
+      #   The headers will be merged into the Rack env hash.
+      # - +as+: Used for encoding the request with different content type.
+      #   Supports `:json` by default and will set the appropriate request headers.
+      #   The headers will be merged into the Rack env hash.
       #
       # This method is rarely used directly. Use +#get+, +#post+, or other standard
       # HTTP methods in integration tests. +#process+ is only required when using a
@@ -210,7 +217,7 @@ module ActionDispatch
           method = :post
         end
 
-        if path =~ %r{://}
+        if %r{://}.match?(path)
           path = build_expanded_path(path) do |location|
             https! URI::HTTPS === location if location.scheme
 
@@ -303,6 +310,7 @@ module ActionDispatch
       APP_SESSIONS = {}
 
       attr_reader :app
+      attr_accessor :root_session # :nodoc:
 
       def initialize(*args, &blk)
         super(*args, &blk)
@@ -328,7 +336,7 @@ module ActionDispatch
         klass = APP_SESSIONS[app] ||= Class.new(Integration::Session) {
           # If the app is a Rails app, make url_helpers available on the session.
           # This makes app.url_for and app.foo_path available in the console.
-          if app.respond_to?(:routes)
+          if app.respond_to?(:routes) && app.routes.is_a?(ActionDispatch::Routing::RouteSet)
             include app.routes.url_helpers
             include app.routes.mounted_helpers
           end
@@ -341,15 +349,19 @@ module ActionDispatch
       end
 
       %w(get post patch put head delete cookies assigns follow_redirect!).each do |method|
-        define_method(method) do |*args|
+        define_method(method) do |*args, **options|
           # reset the html_document variable, except for cookies/assigns calls
           unless method == "cookies" || method == "assigns"
             @html_document = nil
           end
 
-          integration_session.__send__(method, *args).tap do
-            copy_session_variables!
+          result = if options.any?
+            integration_session.__send__(method, *args, **options)
+          else
+            integration_session.__send__(method, *args)
           end
+          copy_session_variables!
+          result
         end
       end
 
@@ -366,10 +378,19 @@ module ActionDispatch
       def open_session
         dup.tap do |session|
           session.reset!
+          session.root_session = self.root_session || self
           yield session if block_given?
         end
       end
 
+      def assertions # :nodoc:
+        root_session ? root_session.assertions : super
+      end
+
+      def assertions=(assertions) # :nodoc:
+        root_session ? root_session.assertions = assertions : super
+      end
+
       # Copy the instance variables from the current session instance into the
       # test instance.
       def copy_session_variables! #:nodoc:
@@ -634,8 +655,8 @@ module ActionDispatch
           @@app = app
         end
 
-        def register_encoder(*args)
-          RequestEncoder.register_encoder(*args)
+        def register_encoder(*args, **options)
+          RequestEncoder.register_encoder(*args, **options)
         end
       end
 

data/lib/action_dispatch/testing/request_encoder.rb

@@ -38,8 +38,8 @@ module ActionDispatch
     end
 
     def self.parser(content_type)
-      mime = Mime::Type.lookup(content_type)
-      encoder(mime ? mime.ref : nil).response_parser
+      type = Mime::Type.lookup(content_type).ref if content_type
+      encoder(type).response_parser
     end
 
     def self.encoder(name)

data/lib/action_dispatch/testing/test_process.rb

@@ -8,12 +8,12 @@ module ActionDispatch
     module FixtureFile
       # Shortcut for <tt>Rack::Test::UploadedFile.new(File.join(ActionDispatch::IntegrationTest.fixture_path, path), type)</tt>:
       #
-      #   post :change_avatar, avatar: fixture_file_upload('files/spongebob.png', 'image/png')
+      #   post :change_avatar, params: { avatar: fixture_file_upload('files/spongebob.png', 'image/png') }
       #
       # To upload binary files on Windows, pass <tt>:binary</tt> as the last parameter.
       # This will not affect other platforms:
       #
-      #   post :change_avatar, avatar: fixture_file_upload('files/spongebob.png', 'image/png', :binary)
+      #   post :change_avatar, params: { avatar: fixture_file_upload('files/spongebob.png', 'image/png', :binary) }
       def fixture_file_upload(path, mime_type = nil, binary = false)
         if self.class.respond_to?(:fixture_path) && self.class.fixture_path &&
             !File.exist?(path)

data/lib/action_dispatch/testing/test_response.rb

@@ -14,40 +14,12 @@ module ActionDispatch
       new response.status, response.headers, response.body
     end
 
-    def initialize(*) # :nodoc:
-      super
-      @response_parser = RequestEncoder.parser(content_type)
-    end
-
-    # Was the response successful?
-    def success?
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-       The success? predicate is deprecated and will be removed in Rails 6.0.
-       Please use successful? as provided by Rack::Response::Helpers.
-      MSG
-      successful?
-    end
-
-    # Was the URL not found?
-    def missing?
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-       The missing? predicate is deprecated and will be removed in Rails 6.0.
-       Please use not_found? as provided by Rack::Response::Helpers.
-      MSG
-      not_found?
-    end
-
-    # Was there a server-side error?
-    def error?
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-       The error? predicate is deprecated and will be removed in Rails 6.0.
-       Please use server_error? as provided by Rack::Response::Helpers.
-      MSG
-      server_error?
+    def parsed_body
+      @parsed_body ||= response_parser.call(body)
     end
 
-    def parsed_body
-      @parsed_body ||= @response_parser.call(body)
+    def response_parser
+      @response_parser ||= RequestEncoder.parser(media_type)
     end
   end
 end

data/lib/action_dispatch.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2004-2018 David Heinemeier Hansson
+# Copyright (c) 2004-2019 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -40,6 +40,9 @@ module ActionDispatch
   class IllegalStateError < StandardError
   end
 
+  class MissingController < NameError
+  end
+
   eager_autoload do
     autoload_under "http" do
       autoload :ContentSecurityPolicy
@@ -49,11 +52,14 @@ module ActionDispatch
   end
 
   autoload_under "middleware" do
+    autoload :HostAuthorization
     autoload :RequestId
     autoload :Callbacks
     autoload :Cookies
+    autoload :ActionableExceptions
     autoload :DebugExceptions
     autoload :DebugLocks
+    autoload :DebugView
     autoload :ExceptionWrapper
     autoload :Executor
     autoload :Flash
@@ -77,7 +83,6 @@ module ActionDispatch
     autoload :MimeNegotiation
     autoload :Parameters
     autoload :ParameterFilter
-    autoload :Upload
     autoload :UploadedFile, "action_dispatch/http/upload"
     autoload :URL
   end

data/lib/action_pack/gem_version.rb

@@ -7,10 +7,10 @@ module ActionPack
   end
 
   module VERSION
-    MAJOR = 5
-    MINOR = 2
-    TINY  = 8
-    PRE   = "1"
+    MAJOR = 6
+    MINOR = 0
+    TINY  = 6
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_pack.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2004-2018 David Heinemeier Hansson
+# Copyright (c) 2004-2019 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack
 version: !ruby/object:Gem::Version
-  version: 5.2.8.1
+  version: 6.0.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.8.1
+        version: 6.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.8.1
+        version: 6.0.6
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rails-dom-testing
   requirement: !ruby/object:Gem::Requirement
@@ -98,28 +98,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.8.1
+        version: 6.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.8.1
+        version: 6.0.6
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.8.1
+        version: 6.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.8.1
+        version: 6.0.6
 description: Web apps on Rails. Simple, battle-tested conventions for building and
   testing MVC web applications. Works with any Rack-compatible server.
 email: david@loudthinking.com
@@ -157,6 +157,7 @@ files:
 - lib/action_controller/metal/content_security_policy.rb
 - lib/action_controller/metal/cookies.rb
 - lib/action_controller/metal/data_streaming.rb
+- lib/action_controller/metal/default_headers.rb
 - lib/action_controller/metal/etag_with_flash.rb
 - lib/action_controller/metal/etag_with_template_digest.rb
 - lib/action_controller/metal/exceptions.rb
@@ -187,6 +188,7 @@ files:
 - lib/action_controller/test_case.rb
 - lib/action_dispatch.rb
 - lib/action_dispatch/http/cache.rb
+- lib/action_dispatch/http/content_disposition.rb
 - lib/action_dispatch/http/content_security_policy.rb
 - lib/action_dispatch/http/filter_parameters.rb
 - lib/action_dispatch/http/filter_redirect.rb
@@ -224,13 +226,16 @@ files:
 - lib/action_dispatch/journey/visualizer/fsm.css
 - lib/action_dispatch/journey/visualizer/fsm.js
 - lib/action_dispatch/journey/visualizer/index.html.erb
+- lib/action_dispatch/middleware/actionable_exceptions.rb
 - lib/action_dispatch/middleware/callbacks.rb
 - lib/action_dispatch/middleware/cookies.rb
 - lib/action_dispatch/middleware/debug_exceptions.rb
 - lib/action_dispatch/middleware/debug_locks.rb
+- lib/action_dispatch/middleware/debug_view.rb
 - lib/action_dispatch/middleware/exception_wrapper.rb
 - lib/action_dispatch/middleware/executor.rb
 - lib/action_dispatch/middleware/flash.rb
+- lib/action_dispatch/middleware/host_authorization.rb
 - lib/action_dispatch/middleware/public_exceptions.rb
 - lib/action_dispatch/middleware/reloader.rb
 - lib/action_dispatch/middleware/remote_ip.rb
@@ -243,17 +248,23 @@ files:
 - lib/action_dispatch/middleware/ssl.rb
 - lib/action_dispatch/middleware/stack.rb
 - lib/action_dispatch/middleware/static.rb
+- lib/action_dispatch/middleware/templates/rescues/_actions.html.erb
+- lib/action_dispatch/middleware/templates/rescues/_actions.text.erb
 - lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb
 - lib/action_dispatch/middleware/templates/rescues/_request_and_response.text.erb
 - lib/action_dispatch/middleware/templates/rescues/_source.html.erb
 - lib/action_dispatch/middleware/templates/rescues/_source.text.erb
 - lib/action_dispatch/middleware/templates/rescues/_trace.html.erb
 - lib/action_dispatch/middleware/templates/rescues/_trace.text.erb
+- lib/action_dispatch/middleware/templates/rescues/blocked_host.html.erb
+- lib/action_dispatch/middleware/templates/rescues/blocked_host.text.erb
 - lib/action_dispatch/middleware/templates/rescues/diagnostics.html.erb
 - lib/action_dispatch/middleware/templates/rescues/diagnostics.text.erb
 - lib/action_dispatch/middleware/templates/rescues/invalid_statement.html.erb
 - lib/action_dispatch/middleware/templates/rescues/invalid_statement.text.erb
 - lib/action_dispatch/middleware/templates/rescues/layout.erb
+- lib/action_dispatch/middleware/templates/rescues/missing_exact_template.html.erb
+- lib/action_dispatch/middleware/templates/rescues/missing_exact_template.text.erb
 - lib/action_dispatch/middleware/templates/rescues/missing_template.html.erb
 - lib/action_dispatch/middleware/templates/rescues/missing_template.text.erb
 - lib/action_dispatch/middleware/templates/rescues/routing_error.html.erb
@@ -282,7 +293,6 @@ files:
 - lib/action_dispatch/system_testing/server.rb
 - lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb
 - lib/action_dispatch/system_testing/test_helpers/setup_and_teardown.rb
-- lib/action_dispatch/system_testing/test_helpers/undef_methods.rb
 - lib/action_dispatch/testing/assertion_response.rb
 - lib/action_dispatch/testing/assertions.rb
 - lib/action_dispatch/testing/assertions/response.rb
@@ -295,12 +305,16 @@ files:
 - lib/action_pack.rb
 - lib/action_pack/gem_version.rb
 - lib/action_pack/version.rb
-homepage: http://rubyonrails.org
+homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.8.1/actionpack
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.8.1/actionpack/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.6/actionpack/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.6/
+  mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.6/actionpack
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -309,7 +323,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/action_dispatch/system_testing/test_helpers/undef_methods.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module ActionDispatch
-  module SystemTesting
-    module TestHelpers
-      module UndefMethods # :nodoc:
-        extend ActiveSupport::Concern
-        included do
-          METHODS = %i(get post put patch delete).freeze
-
-          METHODS.each do |verb|
-            undef_method verb
-          end
-
-          def method_missing(method, *args, &block)
-            if METHODS.include?(method)
-              raise NoMethodError, "System tests cannot make direct requests via ##{method}; use #visit and #click_on instead. See http://www.rubydoc.info/github/teamcapybara/capybara/master#The_DSL for more information."
-            else
-              super
-            end
-          end
-        end
-      end
-    end
-  end
-end