diff options
author | Bryan Helmkamp <bryan@brynary.com> | 2009-05-11 23:04:39 -0400 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-05-19 22:43:21 -0500 |
commit | 0029d5e5943dd20d38485ac7127cc150659da9e5 (patch) | |
tree | 656c3db47a88830e6b3ad9b4875bf2e0d6780d7e /actionpack/test/controller/integration_test.rb | |
parent | 321168b17bce2e73ab7ba22309491ad5c245dcf8 (diff) | |
download | rails-0029d5e5943dd20d38485ac7127cc150659da9e5.tar.gz rails-0029d5e5943dd20d38485ac7127cc150659da9e5.tar.bz2 rails-0029d5e5943dd20d38485ac7127cc150659da9e5.zip |
Integrating Rack::MockSession (from Rack::Test)
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
-rw-r--r-- | actionpack/test/controller/integration_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index a2b3ad2106..eae6835714 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -253,7 +253,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest assert_response 200 assert_response :success assert_response :ok - assert_equal({}, cookies) + assert_equal({}, cookies.to_hash) assert_equal "OK", body assert_equal "OK", response.body assert_kind_of HTML::Document, html_document @@ -269,7 +269,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest assert_response 201 assert_response :success assert_response :created - assert_equal({}, cookies) + assert_equal({}, cookies.to_hash) assert_equal "Created", body assert_equal "Created", response.body assert_kind_of HTML::Document, html_document @@ -287,7 +287,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest assert_response 410 assert_response :gone assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"] - assert_equal({"cookie_1"=>nil, "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies) + assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies.to_hash) assert_equal "Gone", response.body end end |