3 files changed, 30 insertions, 19 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 57b45b8f7b..591d0eccc3 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -243,8 +243,8 @@ CACHED
   end
 
   private
-    def template_digest(name, format)
-      ActionView::Digestor.digest(name, format, @controller.lookup_context)
+    def template_digest(name, format, variant = nil)
+      ActionView::Digestor.digest(name: name, format: format, variant: variant, finder: @controller.lookup_context)
     end
 end
 
diff --git a/actionpack/test/controller/new_base/render_body_test.rb b/actionpack/test/controller/new_base/render_body_test.rb
index a7e4f87bd9..fad848349a 100644
--- a/actionpack/test/controller/new_base/render_body_test.rb
+++ b/actionpack/test/controller/new_base/render_body_test.rb
@@ -65,6 +65,11 @@ module RenderBody
       render body: "hello world", layout: "greetings"
     end
 
+    def with_custom_content_type
+      response.headers['Content-Type'] = 'application/json'
+      render body: '["troll","face"]'
+    end
+
     def with_ivar_in_layout
       @ivar = "hello world"
       render body: "hello world", layout: "ivar"
@@ -141,6 +146,13 @@ module RenderBody
       assert_status 200
     end
 
+    test "specified content type should not be removed" do
+      get "/render_body/with_layout/with_custom_content_type"
+
+      assert_equal %w{ troll face }, JSON.parse(response.body)
+      assert_equal 'application/json', response.headers['Content-Type']
+    end
+
     test "rendering body with layout: false" do
       get "/render_body/with_layout/with_layout_false"
 
@@ -154,22 +166,5 @@ module RenderBody
       assert_body "hello world"
       assert_status 200
     end
-
-    test "rendering from minimal controller returns response with no content type" do
-      get "/render_body/minimal/index"
-
-      assert_header_no_content_type
-    end
-
-    test "rendering from normal controller returns response with no content type" do
-      get "/render_body/simple/index"
-
-      assert_header_no_content_type
-    end
-
-    def assert_header_no_content_type
-      assert_not response.headers.has_key?("Content-Type"),
-        %(Expect response not to have Content-Type header, got "#{response.headers["Content-Type"]}")
-    end
   end
 end
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 1f5fc06410..99229b3baf 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -289,6 +289,22 @@ module RequestForgeryProtectionTests
     end
   end
 
+  def test_should_not_warn_if_csrf_logging_disabled
+    old_logger = ActionController::Base.logger
+    logger = ActiveSupport::LogSubscriber::TestHelper::MockLogger.new
+    ActionController::Base.logger = logger
+    ActionController::Base.log_warning_on_csrf_failure = false
+
+    begin
+      assert_blocked { post :index }
+
+      assert_equal 0, logger.logged(:warn).size
+    ensure
+      ActionController::Base.logger = old_logger
+      ActionController::Base.log_warning_on_csrf_failure = true
+    end
+  end
+
   def test_should_only_allow_same_origin_js_get_with_xhr_header
     assert_cross_origin_blocked { get :same_origin_js }
     assert_cross_origin_blocked { get :same_origin_js, format: 'js' }