1 files changed, 31 insertions, 21 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 7640bc12a2..0e5bad7482 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -531,6 +531,10 @@ class TestController < ActionController::Base
     head :created, :content_type => "application/json"
   end
 
+  def head_ok_with_image_png_content_type
+    head :ok, :content_type => "image/png"
+  end
+
   def head_with_location_header
     head :location => "/foo"
   end
@@ -789,15 +793,13 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_line_offset
-    begin
-      get :render_line_offset
-      flunk "the action should have raised an exception"
-    rescue StandardError => exc
-      line = exc.backtrace.first
-      assert(line =~ %r{:(\d+):})
-      assert_equal "1", $1,
-        "The line offset is wrong, perhaps the wrong exception has been raised, exception was: #{exc.inspect}"
-    end
+    get :render_line_offset
+    flunk "the action should have raised an exception"
+  rescue StandardError => exc
+    line = exc.backtrace.first
+    assert(line =~ %r{:(\d+):})
+    assert_equal "1", $1,
+      "The line offset is wrong, perhaps the wrong exception has been raised, exception was: #{exc.inspect}"
   end
 
   # :ported: compatibility
@@ -1217,20 +1219,27 @@ class RenderTest < ActionController::TestCase
 
   def test_head_created
     post :head_created
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_response :created
   end
 
   def test_head_created_with_application_json_content_type
     post :head_created_with_application_json_content_type
-    assert_blank @response.body
-    assert_equal "application/json", @response.content_type
+    assert @response.body.blank?
+    assert_equal "application/json", @response.header["Content-Type"]
     assert_response :created
   end
 
+  def test_head_ok_with_image_png_content_type
+    post :head_ok_with_image_png_content_type
+    assert @response.body.blank?
+    assert_equal "image/png", @response.header["Content-Type"]
+    assert_response :ok
+  end
+
   def test_head_with_location_header
     get :head_with_location_header
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal "/foo", @response.headers["Location"]
     assert_response :ok
   end
@@ -1243,7 +1252,7 @@ class RenderTest < ActionController::TestCase
       end
 
       get :head_with_location_object
-      assert_blank @response.body
+      assert @response.body.blank?
       assert_equal "http://www.nextangle.com/customers/1", @response.headers["Location"]
       assert_response :ok
     end
@@ -1251,14 +1260,14 @@ class RenderTest < ActionController::TestCase
 
   def test_head_with_custom_header
     get :head_with_custom_header
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal "something", @response.headers["X-Custom-Header"]
     assert_response :ok
   end
 
   def test_head_with_www_authenticate_header
     get :head_with_www_authenticate_header
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal "something", @response.headers["WWW-Authenticate"]
     assert_response :ok
   end
@@ -1433,10 +1442,11 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_locals_option_to_assert_template_is_not_supported
+    get :partial_collection_with_locals
+
     warning_buffer = StringIO.new
     $stderr = warning_buffer
 
-    get :partial_collection_with_locals
     assert_template partial: 'customer_greeting', locals: { greeting: 'Bonjour' }
     assert_equal "the :locals option to #assert_template is only supported in a ActionView::TestCase\n", warning_buffer.string
   ensure
@@ -1591,7 +1601,7 @@ class LastModifiedRenderTest < ActionController::TestCase
     @request.if_modified_since = @last_modified
     get :conditional_hello
     assert_equal 304, @response.status.to_i
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
@@ -1606,7 +1616,7 @@ class LastModifiedRenderTest < ActionController::TestCase
     @request.if_modified_since = 'Thu, 16 Jul 2008 00:00:00 GMT'
     get :conditional_hello
     assert_equal 200, @response.status.to_i
-    assert_present @response.body
+    assert @response.body.present?
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
@@ -1620,7 +1630,7 @@ class LastModifiedRenderTest < ActionController::TestCase
     @request.if_modified_since = @last_modified
     get :conditional_hello_with_record
     assert_equal 304, @response.status.to_i
-    assert_blank @response.body
+    assert @response.body.blank?
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
@@ -1635,7 +1645,7 @@ class LastModifiedRenderTest < ActionController::TestCase
     @request.if_modified_since = 'Thu, 16 Jul 2008 00:00:00 GMT'
     get :conditional_hello_with_record
     assert_equal 200, @response.status.to_i
-    assert_present @response.body
+    assert @response.body.present?
     assert_equal @last_modified, @response.headers['Last-Modified']
   end