Ticket #10974: head_should_return_empty_body.diff

test/controller/render_test.rb

@@ -72 +72 @@
-  def render_nothing_with_appendix
-    render :text => "appended"
-  end
+
+  def render_nothing
+    render :nothing => true
+  end
-  
-  def render_invalid_args
-    render("test/hello")
@@ -95 +99 @@
-    render :text => line
-  end
-
+  def render_empty_body
+    render :empty_body => true
+  end
+
-  def heading
-    head :ok
-  end
-
+  def heading_with_301
+    head 301
+  end
+
-  def greeting
-    # let's just rely on the template
-  end
@@ -312 +324 @@
-    assert_response 200
-    assert_equal 'appended', @response.body
-  end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  def test_attempt_to_render_with_invalid_arguments
-    assert_raises(ActionController::RenderError) { get :render_invalid_args }
-  end

test/controller/rescue_test.rb

@@ -198 +198 @@
-    end
-
-    assert_response :internal_server_error
- 
+
-  end
-
-  def test_rescue_unknown_action_in_public_with_error_file
@@ -221 +221 @@
-    end
-
-    assert_response :not_found
- 
+
-  end
-
-  def test_rescue_missing_template_in_public

test/controller/filters_test.rb

@@ -823 +823 @@
-  def test_first_filter_in_multiple_before_filter_chain_halts
-    controller = ::FilterTest::TestMultipleFiltersController.new
-    response = test_process(controller, 'fail_1')
- 
+
-    assert_equal 1, controller.instance_variable_get(:@try)
-    assert controller.instance_variable_get(:@before_filter_chain_aborted)
-  end
@@ -831 +831 @@
-  def test_second_filter_in_multiple_before_filter_chain_halts
-    controller = ::FilterTest::TestMultipleFiltersController.new
-    response = test_process(controller, 'fail_2')
- 
+
-    assert_equal 2, controller.instance_variable_get(:@try)
-    assert controller.instance_variable_get(:@before_filter_chain_aborted)
-  end
@@ -839 +839 @@
-  def test_last_filter_in_multiple_before_filter_chain_halts
-    controller = ::FilterTest::TestMultipleFiltersController.new
-    response = test_process(controller, 'fail_3')
- 
+
-    assert_equal 3, controller.instance_variable_get(:@try)
-    assert controller.instance_variable_get(:@before_filter_chain_aborted)
-  end

lib/action_controller/base.rb

@@ -913 +913 @@
-          elsif options[:nothing]
-            # Safari doesn't pass the headers of the return if the response is zero length
-            render_for_text(" ", options[:status])
-
+
+
+
+
+
-          else
-            render_for_file(default_template_name, options[:status], true)
-          end
@@ -954 +958 @@
-        options.each do |key, value|
-          headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s
-        end
-
-nothing
+
+empty_body
-      end
-
-

lib/action_controller/layout.rb

@@ -273 +273 @@
-
-      def candidate_for_layout?(options)
-        (options.has_key?(:layout) && options[:layout] != false) || 
-
+, :empty_body
-          !template_exempt_from_layout?(options[:template] || default_template_name(options[:action]))
-      end
-