Ruby 1.9 compat: account for new, non-flattening Array#to_s

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8407 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/lib/action_controller/cookies.rb

@@ -50,8 +50,8 @@ module ActionController #:nodoc:
     def [](name)
       cookie = @cookies[name.to_s]
       if cookie && cookie.respond_to?(:value)
-        cookie.size > 1 ? cookie.value : cookie.value.to_s
-      end 
+        cookie.size > 1 ? cookie.value : cookie.value[0]
+      end
     end
 
     def []=(name, options)
@@ -81,4 +81,4 @@ module ActionController #:nodoc:
         @controller.response.headers["cookie"] << cookie
       end
   end
-end
+end

actionpack/test/controller/cookie_test.rb

@@ -67,7 +67,7 @@ class CookieTest < Test::Unit::TestCase
   def test_setting_cookie_with_http_only
     get :authenticate_with_http_only
     assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "http_only" => true) ], @response.headers["cookie"]
-    assert_equal CGI::Cookie::new("name" => "user_name", "value" => "david", "path" => "/", "http_only" => true).to_s, @response.headers["cookie"].to_s
+    assert_equal CGI::Cookie::new("name" => "user_name", "value" => "david", "path" => "/", "http_only" => true).to_s, @response.headers["cookie"][0].to_s
   end
 
   def test_multiple_cookies