Merge branch 'master' into testing

rails · Nov 8, 2008 · c0310bd · c0310bd
2 parents 0994d11 + 0be5bc3
commit c0310bd
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb
@@ -266,6 +266,7 @@ def new_session(options = {})
 
         @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}"