From dbbe2e74ff5b6363da74fe63045b043c24041b1a Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 26 Apr 2009 10:26:53 -0500
Subject: Create a new file for response tests

---
 actionpack/test/dispatch/rack_test.rb     | 90 -------------------------------
 actionpack/test/dispatch/response_test.rb | 83 ++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 90 deletions(-)
 create mode 100644 actionpack/test/dispatch/response_test.rb

(limited to 'actionpack/test')

diff --git a/actionpack/test/dispatch/rack_test.rb b/actionpack/test/dispatch/rack_test.rb
index 9fad4b22ee..94eba2a24f 100644
--- a/actionpack/test/dispatch/rack_test.rb
+++ b/actionpack/test/dispatch/rack_test.rb
@@ -201,93 +201,3 @@ class RackRequestNeedsRewoundTest < BaseRackTest
     assert_equal 0, request.body.pos
   end
 end
-
-class RackResponseTest < BaseRackTest
-  def setup
-    super
-    @response = ActionDispatch::Response.new
-  end
-
-  test "simple output" do
-    @response.body = "Hello, World!"
-    @response.prepare!
-
-    status, headers, body = @response.to_a
-    assert_equal 200, status
-    assert_equal({
-      "Content-Type" => "text/html; charset=utf-8",
-      "Cache-Control" => "private, max-age=0, must-revalidate",
-      "ETag" => '"65a8e27d8879283831b664bd8b7f0ad4"',
-      "Set-Cookie" => "",
-      "Content-Length" => "13"
-    }, headers)
-
-    parts = []
-    body.each { |part| parts << part }
-    assert_equal ["Hello, World!"], parts
-  end
-
-  def test_utf8_output
-    @response.body = [1090, 1077, 1089, 1090].pack("U*")
-    @response.prepare!
-
-    status, headers, body = @response.to_a
-    assert_equal 200, status
-    assert_equal({
-      "Content-Type" => "text/html; charset=utf-8",
-      "Cache-Control" => "private, max-age=0, must-revalidate",
-      "ETag" => '"ebb5e89e8a94e9dd22abf5d915d112b2"',
-      "Set-Cookie" => "",
-      "Content-Length" => "8"
-    }, headers)
-  end
-
-  def test_streaming_block
-    @response.body = Proc.new do |response, output|
-      5.times { |n| output.write(n) }
-    end
-    @response.prepare!
-
-    status, headers, body = @response.to_a
-    assert_equal 200, status
-    assert_equal({
-      "Content-Type" => "text/html; charset=utf-8",
-      "Cache-Control" => "no-cache",
-      "Set-Cookie" => ""
-    }, headers)
-
-    parts = []
-    body.each { |part| parts << part.to_s }
-    assert_equal ["0", "1", "2", "3", "4"], parts
-  end
-end
-
-class RackResponseHeadersTest < BaseRackTest
-  def setup
-    super
-    @response = ActionDispatch::Response.new
-    @response.status = "200 OK"
-  end
-
-  test "content type" do
-    [204, 304].each do |c|
-      @response.status = c.to_s
-      assert !response_headers.has_key?("Content-Type"), "#{c} should not have Content-Type header"
-    end
-
-    [200, 302, 404, 500].each do |c|
-      @response.status = c.to_s
-      assert response_headers.has_key?("Content-Type"), "#{c} did not have Content-Type header"
-    end
-  end
-
-  test "status" do
-    assert !response_headers.has_key?('Status')
-  end
-
-  private
-    def response_headers
-      @response.prepare!
-      @response.to_a[1]
-    end
-end
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
new file mode 100644
index 0000000000..fb593a6c31
--- /dev/null
+++ b/actionpack/test/dispatch/response_test.rb
@@ -0,0 +1,83 @@
+require 'abstract_unit'
+
+class ResponseTest < ActiveSupport::TestCase
+  def setup
+    @response = ActionDispatch::Response.new
+  end
+
+  test "simple output" do
+    @response.body = "Hello, World!"
+    @response.prepare!
+
+    status, headers, body = @response.to_a
+    assert_equal 200, status
+    assert_equal({
+      "Content-Type" => "text/html; charset=utf-8",
+      "Cache-Control" => "private, max-age=0, must-revalidate",
+      "ETag" => '"65a8e27d8879283831b664bd8b7f0ad4"',
+      "Set-Cookie" => "",
+      "Content-Length" => "13"
+    }, headers)
+
+    parts = []
+    body.each { |part| parts << part }
+    assert_equal ["Hello, World!"], parts
+  end
+
+  test "utf8 output" do
+    @response.body = [1090, 1077, 1089, 1090].pack("U*")
+    @response.prepare!
+
+    status, headers, body = @response.to_a
+    assert_equal 200, status
+    assert_equal({
+      "Content-Type" => "text/html; charset=utf-8",
+      "Cache-Control" => "private, max-age=0, must-revalidate",
+      "ETag" => '"ebb5e89e8a94e9dd22abf5d915d112b2"',
+      "Set-Cookie" => "",
+      "Content-Length" => "8"
+    }, headers)
+  end
+
+  test "streaming block" do
+    @response.body = Proc.new do |response, output|
+      5.times { |n| output.write(n) }
+    end
+    @response.prepare!
+
+    status, headers, body = @response.to_a
+    assert_equal 200, status
+    assert_equal({
+      "Content-Type" => "text/html; charset=utf-8",
+      "Cache-Control" => "no-cache",
+      "Set-Cookie" => ""
+    }, headers)
+
+    parts = []
+    body.each { |part| parts << part.to_s }
+    assert_equal ["0", "1", "2", "3", "4"], parts
+  end
+
+  test "content type" do
+    [204, 304].each do |c|
+      @response.status = c.to_s
+      @response.prepare!
+      status, headers, body = @response.to_a
+      assert !headers.has_key?("Content-Type"), "#{c} should not have Content-Type header"
+    end
+
+    [200, 302, 404, 500].each do |c|
+      @response.status = c.to_s
+      @response.prepare!
+      status, headers, body = @response.to_a
+      assert headers.has_key?("Content-Type"), "#{c} did not have Content-Type header"
+    end
+  end
+
+  test "does not include Status header" do
+    @response.status = "200 OK"
+    @response.prepare!
+    status, headers, body = @response.to_a
+    assert !headers.has_key?('Status')
+  end
+end
-- 
cgit v1.2.3