test/test_http_cookie.rb in http-cookie-1.0.0.pre12 vs test/test_http_cookie.rb in http-cookie-1.0.0

@@ -1,16 +1,9 @@
 # -*- coding: utf-8 -*-
 require File.expand_path('helper', File.dirname(__FILE__))
 
 class TestHTTPCookie < Test::Unit::TestCase
-  def silently
-    warn_level, $VERBOSE = $VERBOSE, false
-    yield
-  ensure
-    $VERBOSE = warn_level
-  end
-
   def setup
     httpdate = 'Sun, 27-Sep-2037 00:00:00 GMT'
 
     @cookie_params = {
       'expires'  => 'expires=%s' % httpdate,
@@ -44,16 +37,14 @@
               #"95-06-08 19:32:48 EDT",
     ]
 
     dates.each do |date|
       cookie = "PREF=1; expires=#{date}"
-      silently do
-        assert_equal 1, HTTP::Cookie.parse(cookie, url) { |c|
-          assert c.expires, "Tried parsing: #{date}"
-          assert_send [c.expires, :<, yesterday]
-        }.size
-      end
+      assert_equal 1, HTTP::Cookie.parse(cookie, url) { |c|
+        assert c.expires, "Tried parsing: #{date}"
+        assert_send [c.expires, :<, yesterday]
+      }.size
     end
 
     [
       ["PREF=1; expires=Wed, 01 Jan 100 12:34:56 GMT", nil],
       ["PREF=1; expires=Sat, 01 Jan 1600 12:34:56 GMT", nil],
@@ -175,18 +166,16 @@
 
     dates = [
       "20/06/95 21:07",
     ]
 
-    silently do
-      dates.each do |date|
-        cookie = "PREF=1; expires=#{date}"
-        assert_equal 1, HTTP::Cookie.parse(cookie, url) { |c|
-          assert_equal(true, c.expires.nil?)
-        }.size
-      end
-    end
+    dates.each { |date|
+      cookie = "PREF=1; expires=#{date}"
+      assert_equal 1, HTTP::Cookie.parse(cookie, url) { |c|
+        assert_equal(true, c.expires.nil?)
+      }.size
+    }
   end
 
   def test_parse_domain_dot
     url = URI.parse('http://host.example.com/')
 
@@ -533,9 +522,33 @@
     assert_equal 'key', cookie.name
     assert_equal 'value', cookie.value
     assert_equal expires, cookie.expires
     assert_raises(RuntimeError) {
       cookie.acceptable?
+    }
+
+    # various keywords
+    [
+      ["Expires", /use downcased symbol/],
+    ].each { |key, pattern|
+      assert_warning(pattern, "warn of key: #{key.inspect}") {
+        cookie = HTTP::Cookie.new(:value => 'value', :name => 'key', key => expires.dup)
+        assert_equal 'key', cookie.name
+        assert_equal 'value', cookie.value
+        assert_equal expires, cookie.expires, "key: #{key.inspect}"
+      }
+    }
+    [
+      [:Expires,   /unknown attribute name/],
+      [:expires?,  /unknown attribute name/],
+      [[:expires], /invalid keyword/],
+    ].each { |key, pattern|
+      assert_warning(pattern, "warn of key: #{key.inspect}") {
+        cookie = HTTP::Cookie.new(:value => 'value', :name => 'key', key => expires.dup)
+        assert_equal 'key', cookie.name
+        assert_equal 'value', cookie.value
+        assert_equal nil, cookie.expires, "key: #{key.inspect}"
+      }
     }
 
     cookie = HTTP::Cookie.new(:value => 'value', :name => 'key', :expires => expires.dup)
     assert_equal 'key', cookie.name
     assert_equal 'value', cookie.value