diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-15 18:22:35 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-15 18:22:35 -0800 |
commit | 89056885b030b981193d73ebde56cf60829a924c (patch) | |
tree | 9d432f7226754115ac4d2ef8aa1134221ff294bb /actionpack/test/controller/rack_test.rb | |
parent | 19be3d35b38b6685789d8d343617d465a3652717 (diff) | |
parent | 43ac42c46a462e1453b1b97da00e11bff7bba55d (diff) | |
download | rails-89056885b030b981193d73ebde56cf60829a924c.tar.gz rails-89056885b030b981193d73ebde56cf60829a924c.tar.bz2 rails-89056885b030b981193d73ebde56cf60829a924c.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/rack_test.rb')
-rw-r--r-- | actionpack/test/controller/rack_test.rb | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/actionpack/test/controller/rack_test.rb b/actionpack/test/controller/rack_test.rb index 641ef9626e..e2ec686c41 100644 --- a/actionpack/test/controller/rack_test.rb +++ b/actionpack/test/controller/rack_test.rb @@ -229,7 +229,7 @@ end class RackResponseTest < BaseRackTest def setup super - @response = ActionController::RackResponse.new(@request) + @response = ActionController::RackResponse.new end def test_simple_output @@ -265,34 +265,12 @@ class RackResponseTest < BaseRackTest body.each { |part| parts << part } assert_equal ["0", "1", "2", "3", "4"], parts end - - def test_set_session_cookie - cookie = CGI::Cookie.new({"name" => "name", "value" => "Josh"}) - @request.cgi.send :instance_variable_set, '@output_cookies', [cookie] - - @response.body = "Hello, World!" - @response.prepare! - - status, headers, body = @response.out - assert_equal "200 OK", status - assert_equal({ - "Content-Type" => "text/html; charset=utf-8", - "Cache-Control" => "private, max-age=0, must-revalidate", - "ETag" => '"65a8e27d8879283831b664bd8b7f0ad4"', - "Set-Cookie" => ["name=Josh; path="], - "Content-Length" => "13" - }, headers) - - parts = [] - body.each { |part| parts << part } - assert_equal ["Hello, World!"], parts - end end class RackResponseHeadersTest < BaseRackTest def setup super - @response = ActionController::RackResponse.new(@request) + @response = ActionController::RackResponse.new @response.headers['Status'] = "200 OK" end |