5 files changed, 75 insertions, 9 deletions
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index 6ae33be3c8..57cf2dafdf 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -183,6 +183,12 @@ class ACLogSubscriberTest < ActionController::TestCase
     assert_equal "test_value", @controller.last_payload[:test_key]
   end
 
+  def test_process_action_headers
+    get :show
+    wait
+    assert_equal "Rails Testing", @controller.last_payload[:headers]['User-Agent']
+  end
+
   def test_process_action_with_filter_parameters
     @request.env["action_dispatch.parameter_filter"] = [:lifo, :amount]
 
diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb
index d0c7b2e06a..993f4001de 100644
--- a/actionpack/test/controller/mime/respond_to_test.rb
+++ b/actionpack/test/controller/mime/respond_to_test.rb
@@ -74,6 +74,14 @@ class RespondToController < ActionController::Base
     end
   end
 
+  def missing_templates
+    respond_to do |type|
+      # This test requires a block that is empty
+      type.json { }
+      type.xml
+    end
+  end
+
   def using_defaults_with_type_list
     respond_to(:html, :xml)
   end
@@ -624,6 +632,13 @@ class RespondToControllerTest < ActionController::TestCase
     end
   end
 
+  def test_missing_templates
+    get :missing_templates, format: :json
+    assert_response :no_content
+    get :missing_templates, format: :xml
+    assert_response :no_content
+  end
+
   def test_invalid_variant
     assert_raises(ActionController::UnknownFormat) do
       get :variant_with_implicit_template_rendering, params: { v: :invalid }
diff --git a/actionpack/test/controller/parameters/accessors_test.rb b/actionpack/test/controller/parameters/accessors_test.rb
index cea265f9ab..17c62dc3fe 100644
--- a/actionpack/test/controller/parameters/accessors_test.rb
+++ b/actionpack/test/controller/parameters/accessors_test.rb
@@ -194,4 +194,24 @@ class ParametersAccessorsTest < ActiveSupport::TestCase
 
     assert_match(/permitted: true/, @params.inspect)
   end
+
+  if Hash.method_defined?(:dig)
+    test "#dig delegates the dig method to its values" do
+      assert_equal "David", @params.dig(:person, :name, :first)
+      assert_equal "Chicago", @params.dig(:person, :addresses, 0, :city)
+    end
+
+    test "#dig converts hashes to parameters" do
+      assert_kind_of ActionController::Parameters, @params.dig(:person)
+      assert_kind_of ActionController::Parameters, @params.dig(:person, :addresses, 0)
+      assert @params.dig(:person, :addresses).all? do |value|
+        value.is_a?(ActionController::Parameters)
+      end
+    end
+  else
+    test "ActionController::Parameters does not respond to #dig on Ruby 2.2" do
+      assert_not ActionController::Parameters.method_defined?(:dig)
+      assert_not @params.respond_to?(:dig)
+    end
+  end
 end
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index b7f3e121fd..82fc8b0f8a 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -703,7 +703,7 @@ end
 class HttpCacheForeverTest < ActionController::TestCase
   class HttpCacheForeverController < ActionController::Base
     def cache_me_forever
-      http_cache_forever(public: params[:public], version: params[:version] || 'v1') do
+      http_cache_forever(public: params[:public]) do
         render plain: 'hello'
       end
     end
@@ -742,13 +742,5 @@ class HttpCacheForeverTest < ActionController::TestCase
     assert_response :not_modified
     @request.if_modified_since = @response.headers['Last-Modified']
     @request.if_none_match = @response.etag
-
-    get :cache_me_forever, params: {version: 'v2'}
-    assert_response :success
-    @request.if_modified_since = @response.headers['Last-Modified']
-    @request.if_none_match = @response.etag
-
-    get :cache_me_forever, params: {version: 'v2'}
-    assert_response :not_modified
   end
 end
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index f42bef883f..ed78f859ce 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -147,6 +147,24 @@ class RescueController < ActionController::Base
     end
   end
 
+  def exception_with_more_specific_handler_for_wrapper
+    raise RecordInvalid
+  rescue
+    raise NotAuthorized
+  end
+
+  def exception_with_more_specific_handler_for_cause
+    raise NotAuthorized
+  rescue
+    raise RecordInvalid
+  end
+
+  def exception_with_no_handler_for_wrapper
+    raise RecordInvalid
+  rescue
+    raise RangeError
+  end
+
   protected
     def deny_access
       head :forbidden
@@ -301,6 +319,21 @@ class RescueControllerTest < ActionController::TestCase
     get :resource_unavailable_raise_as_string
     assert_equal "RescueController::ResourceUnavailableToRescueAsString", @response.body
   end
+
+  test 'rescue when wrapper has more specific handler than cause' do
+    get :exception_with_more_specific_handler_for_wrapper
+    assert_response :unprocessable_entity
+  end
+
+  test 'rescue when cause has more specific handler than wrapper' do
+    get :exception_with_more_specific_handler_for_cause
+    assert_response :unprocessable_entity
+  end
+
+  test 'rescue when cause has handler, but wrapper doesnt' do
+    get :exception_with_no_handler_for_wrapper
+    assert_response :unprocessable_entity
+  end
 end
 
 class RescueTest < ActionDispatch::IntegrationTest