Fixed problem with cookies not being set to path=/ by default and a test buggerboo

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

2 files changed, 5 insertions, 4 deletions

diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb
index 626a2ce814..1eb071bdbe 100644
--- a/actionpack/lib/action_controller/cookies.rb
+++ b/actionpack/lib/action_controller/cookies.rb
@@ -44,7 +44,7 @@ module ActionController #:nodoc:
         options.each { |key, value| options[key.to_s] = value }
         options["name"] = name.to_s
       else
-        options = [ name, options ]
+        options = { "name" => name, "value" => options }
       end
       
       set_cookie(name, options)
@@ -57,7 +57,8 @@ module ActionController #:nodoc:
 
     private
       def set_cookie(name, options) #:doc:
-        cookie = options.is_a?(Array) ? CGI::Cookie.new(*options) : CGI::Cookie.new(options)
+        options["path"] = "/" unless options["path"]
+        cookie = CGI::Cookie.new(options)
         @controller.logger.info "Cookie set: #{cookie}" unless @controller.logger.nil?
         @controller.response.headers["cookie"] << cookie
       end
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index e624c188db..61b642a19e 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -29,12 +29,12 @@ class UrlHelperTest < Test::Unit::TestCase
   
   def test_link_to_image
     assert_equal(
-      "<a href=\"http://www.world.com\"><img alt=\"Rss\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>", 
+      "<a href=\"http://www.world.com\"><img alt=\"Rss\" border=\"0\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>", 
       link_to_image("rss", "http://www.world.com", "size" => "30x45")
     )
 
     assert_equal(
-      "<a class=\"admin\" href=\"http://www.world.com\"><img alt=\"Feed\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>", 
+      "<a class=\"admin\" href=\"http://www.world.com\"><img alt=\"Feed\" border=\"0\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>", 
       link_to_image("rss.gif", "http://www.world.com", "size" => "30x45", "alt" => "Feed", "class" => "admin")
     )
   end