aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-07 21:51:08 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-07 21:51:08 -0500
commitc0310bde4889fff7a297dcd50368a0297c00fcc9 (patch)
tree09e7be9ac572cb2c73d8a4abed89399648034a11 /actionpack
parent0994d11f26c318e63dd4189ea2dfec409132e529 (diff)
parent0be5bc3f5981f11d81c24ccfb97863a69406cf9d (diff)
downloadrails-c0310bde4889fff7a297dcd50368a0297c00fcc9.tar.gz
rails-c0310bde4889fff7a297dcd50368a0297c00fcc9.tar.bz2
rails-c0310bde4889fff7a297dcd50368a0297c00fcc9.zip
Merge branch 'master' into testing
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/session/cookie_store_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb
index 010c00fa14..30422314a1 100644
--- a/actionpack/test/controller/session/cookie_store_test.rb
+++ b/actionpack/test/controller/session/cookie_store_test.rb
@@ -266,6 +266,7 @@ class CookieStoreTest < Test::Unit::TestCase
@options = self.class.default_session_options.merge(options)
session = CGI::Session.new(cgi, @options)
+ ObjectSpace.undefine_finalizer(session)
assert_nil cgi.output_hidden, "Output hidden params should be empty: #{cgi.output_hidden.inspect}"
assert_nil cgi.output_cookies, "Output cookies should be empty: #{cgi.output_cookies.inspect}"