Ticket #9524: head_method_content_type_default.2.diff

actionpack/test/controller/new_render_test.rb

@@ -251 +251 @@
-  def head_with_location_header
-    head :location => "/foo"
-  end
+  
+  def head_with_content_type_header
+    head :content_type => "text/enriched"
+  end
-
-  def head_with_symbolic_status
-    head :status => params[:status].intern
@@ -799 +803 @@
-    assert_equal "something", @response.headers["X-Custom-Header"]
-    assert_response :forbidden
-  end
+  
+  def test_head_sets_content_type_header_to_text_plain_by_default
+    get :head_with_location_header
+    assert @response.body.blank?
+    assert_equal "text/plain", @response.content_type
+    assert_response :ok    
+  end
+  
+  def test_head_sets_content_type_header_to_value_supplied_in_options
+    get :head_with_content_type_header
+    assert @response.body.blank?
+    assert_equal "text/enriched", @response.content_type
+    assert_response :ok    
+  end
-
-  def test_rendering_with_location_should_set_header
-    get :render_with_location

actionpack/test/controller/rescue_test.rb

@@ -115 +115 @@
-
-    assert_response :not_found
-    assert_equal ' ', @response.body
+    assert_equal 'text/plain', @response.content_type
-  end
-
-

actionpack/lib/action_controller/base.rb

@@ -903 +903 @@
-        end
-
-        raise ArgumentError, "head requires an options hash" if !options.is_a?(Hash)
+        
+        options.reverse_merge!(:content_type => Mime::TEXT)
-
-        status = interpret_status(status || options.delete(:status) || :ok)
-