tough-cookie 0.13.0 → 2.0.0

package/test/parsing_test.js

@@ -40,7 +40,7 @@ vows
   .addBatch({
     "simple": {
       topic: function() {
-        return Cookie.parse('a=bcd',true) || null;
+        return Cookie.parse('a=bcd') || null;
       },
       "parsed": function(c) { assert.ok(c) },
       "key": function(c) { assert.equal(c.key, 'a') },
@@ -51,7 +51,7 @@ vows
     },
     "with expiry": {
       topic: function() {
-        return Cookie.parse('a=bcd; Expires=Tue, 18 Oct 2011 07:05:03 GMT',true) || null;
+        return Cookie.parse('a=bcd; Expires=Tue, 18 Oct 2011 07:05:03 GMT') || null;
       },
       "parsed": function(c) { assert.ok(c) },
       "key": function(c) { assert.equal(c.key, 'a') },
@@ -63,11 +63,11 @@ vows
     },
     "with expiry and path": {
       topic: function() {
-        return Cookie.parse('abc="xyzzy!"; Expires=Tue, 18 Oct 2011 07:05:03 GMT; Path=/aBc',true) || null;
+        return Cookie.parse('abc="xyzzy!"; Expires=Tue, 18 Oct 2011 07:05:03 GMT; Path=/aBc') || null;
       },
       "parsed": function(c) { assert.ok(c) },
       "key": function(c) { assert.equal(c.key, 'abc') },
-      "value": function(c) { assert.equal(c.value, 'xyzzy!') },
+      "value": function(c) { assert.equal(c.value, '"xyzzy!"') },
       "has expires": function(c) {
         assert.ok(c.expires !== Infinity, 'expiry is infinite when it shouldn\'t be');
         assert.equal(c.expires.getTime(), 1318921503000);
@@ -80,11 +80,11 @@ vows
     },
     "with everything": {
       topic: function() {
-        return Cookie.parse('abc="xyzzy!"; Expires=Tue, 18 Oct 2011 07:05:03 GMT; Path=/aBc; Domain=example.com; Secure; HTTPOnly; Max-Age=1234; Foo=Bar; Baz', true) || null;
+        return Cookie.parse('abc="xyzzy!"; Expires=Tue, 18 Oct 2011 07:05:03 GMT; Path=/aBc; Domain=example.com; Secure; HTTPOnly; Max-Age=1234; Foo=Bar; Baz') || null;
       },
       "parsed": function(c) { assert.ok(c) },
       "key": function(c) { assert.equal(c.key, 'abc') },
-      "value": function(c) { assert.equal(c.value, 'xyzzy!') },
+      "value": function(c) { assert.equal(c.value, '"xyzzy!"') },
       "has expires": function(c) {
         assert.ok(c.expires !== Infinity, 'expiry is infinite when it shouldn\'t be');
         assert.equal(c.expires.getTime(), 1318921503000);
@@ -100,57 +100,35 @@ vows
         assert.equal(c.extensions[1], 'Baz');
       }
     },
-    "invalid expires": {
-      "strict": function() { assert.ok(!Cookie.parse("a=b; Expires=xyzzy", true)) },
-      "non-strict": function() {
-        var c = Cookie.parse("a=b; Expires=xyzzy");
-        assert.ok(c);
-        assert.equal(c.expires, Infinity);
-      }
+    "invalid expires": function() {
+      var c = Cookie.parse("a=b; Expires=xyzzy");
+      assert.ok(c);
+      assert.equal(c.expires, Infinity);
     },
-    "zero max-age": {
-      "strict": function() { assert.ok(!Cookie.parse("a=b; Max-Age=0", true)) },
-      "non-strict": function() {
-        var c = Cookie.parse("a=b; Max-Age=0");
-        assert.ok(c);
-        assert.equal(c.maxAge, 0);
-      }
+    "zero max-age": function() {
+      var c = Cookie.parse("a=b; Max-Age=0");
+      assert.ok(c);
+      assert.equal(c.maxAge, 0);
     },
-    "negative max-age": {
-      "strict": function() { assert.ok(!Cookie.parse("a=b; Max-Age=-1", true)) },
-      "non-strict": function() {
-        var c = Cookie.parse("a=b; Max-Age=-1");
-        assert.ok(c);
-        assert.equal(c.maxAge, -1);
-      }
+    "negative max-age": function() {
+      var c = Cookie.parse("a=b; Max-Age=-1");
+      assert.ok(c);
+      assert.equal(c.maxAge, -1);
     },
-    "empty domain": {
-      "strict": function() { assert.ok(!Cookie.parse("a=b; domain=", true)) },
-      "non-strict": function() {
-        var c = Cookie.parse("a=b; domain=");
-        assert.ok(c);
-        assert.equal(c.domain, null);
-      }
+    "empty domain": function() {
+      var c = Cookie.parse("a=b; domain=");
+      assert.ok(c);
+      assert.equal(c.domain, null);
     },
-    "dot domain": {
-      "strict": function() { assert.ok(!Cookie.parse("a=b; domain=.", true)) },
-      "non-strict": function() {
-        var c = Cookie.parse("a=b; domain=.");
-        assert.ok(c);
-        assert.equal(c.domain, null);
-      }
+    "dot domain": function() {
+      var c = Cookie.parse("a=b; domain=.");
+      assert.ok(c);
+      assert.equal(c.domain, null);
     },
-    "uppercase domain": {
-      "strict lowercases": function() {
-        var c = Cookie.parse("a=b; domain=EXAMPLE.COM");
-        assert.ok(c);
-        assert.equal(c.domain, 'example.com');
-      },
-      "non-strict lowercases": function() {
-        var c = Cookie.parse("a=b; domain=EXAMPLE.COM");
-        assert.ok(c);
-        assert.equal(c.domain, 'example.com');
-      }
+    "uppercase domain": function() {
+      var c = Cookie.parse("a=b; domain=EXAMPLE.COM");
+      assert.ok(c);
+      assert.equal(c.domain, 'example.com');
     },
     "trailing dot in domain": {
       topic: function() {
@@ -159,21 +137,15 @@ vows
       "has the domain": function(c) { assert.equal(c.domain,"example.com.") },
       "but doesn't validate": function(c) { assert.equal(c.validate(),false) }
     },
-    "empty path": {
-      "strict": function() { assert.ok(!Cookie.parse("a=b; path=", true)) },
-      "non-strict": function() {
-        var c = Cookie.parse("a=b; path=");
-        assert.ok(c);
-        assert.equal(c.path, null);
-      }
+    "empty path": function() {
+      var c = Cookie.parse("a=b; path=");
+      assert.ok(c);
+      assert.equal(c.path, null);
     },
-    "no-slash path": {
-      "strict": function() { assert.ok(!Cookie.parse("a=b; path=xyzzy", true)) },
-      "non-strict": function() {
-        var c = Cookie.parse("a=b; path=xyzzy");
-        assert.ok(c);
-        assert.equal(c.path, null);
-      }
+    "no-slash path": function() {
+      var c = Cookie.parse("a=b; path=xyzzy");
+      assert.ok(c);
+      assert.equal(c.path, null);
     },
     "trailing semi-colons after path": {
       topic: function () {
@@ -182,11 +154,7 @@ vows
           "c=d;;;;"
         ];
       },
-      "strict": function (t) {
-        assert.ok(!Cookie.parse(t[0], true));
-        assert.ok(!Cookie.parse(t[1], true));
-      },
-      "non-strict": function (t) {
+      "strips semi-colons": function (t) {
         var c1 = Cookie.parse(t[0]);
         var c2 = Cookie.parse(t[1]);
         assert.ok(c1);
@@ -194,21 +162,15 @@ vows
         assert.equal(c1.path, '/');
       }
     },
-    "secure-with-value": {
-      "strict": function() { assert.ok(!Cookie.parse("a=b; Secure=xyzzy", true)) },
-      "non-strict": function() {
-        var c = Cookie.parse("a=b; Secure=xyzzy");
-        assert.ok(c);
-        assert.equal(c.secure, true);
-      }
+    "secure-with-value": function() {
+      var c = Cookie.parse("a=b; Secure=xyzzy");
+      assert.ok(c);
+      assert.equal(c.secure, true);
     },
-    "httponly-with-value": {
-      "strict": function() { assert.ok(!Cookie.parse("a=b; HttpOnly=xyzzy", true)) },
-      "non-strict": function() {
-        var c = Cookie.parse("a=b; HttpOnly=xyzzy");
-        assert.ok(c);
-        assert.equal(c.httpOnly, true);
-      }
+    "httponly-with-value": function() {
+      var c = Cookie.parse("a=b; HttpOnly=xyzzy");
+      assert.ok(c);
+      assert.equal(c.httpOnly, true);
     },
     "garbage": {
       topic: function() {
@@ -296,61 +258,37 @@ vows
       "httponly": function(c) { assert.ok(c.httpOnly) }
     },
     "spaces in value": {
-      "strict": {
-        topic: function() {
-          return Cookie.parse('a=one two three',true) || null;
-        },
-        "did not parse": function(c) { assert.isNull(c) }
+      topic: function() {
+        return Cookie.parse('a=one two three',false) || null;
       },
-      "non-strict": {
-        topic: function() {
-          return Cookie.parse('a=one two three',false) || null;
-        },
-        "parsed": function(c) { assert.ok(c) },
-        "key": function(c) { assert.equal(c.key, 'a') },
-        "value": function(c) { assert.equal(c.value, 'one two three') },
-        "no path": function(c) { assert.equal(c.path, null) },
-        "no domain": function(c) { assert.equal(c.domain, null) },
-        "no extensions": function(c) { assert.ok(!c.extensions) }
-      }
+      "parsed": function(c) { assert.ok(c) },
+      "key": function(c) { assert.equal(c.key, 'a') },
+      "value": function(c) { assert.equal(c.value, 'one two three') },
+      "no path": function(c) { assert.equal(c.path, null) },
+      "no domain": function(c) { assert.equal(c.domain, null) },
+      "no extensions": function(c) { assert.ok(!c.extensions) }
     },
     "quoted spaces in value": {
-      "strict": {
-        topic: function() {
-          return Cookie.parse('a="one two three"',true) || null;
-        },
-        "did not parse": function(c) { assert.isNull(c) }
+      topic: function() {
+        return Cookie.parse('a="one two three"',false) || null;
       },
-      "non-strict": {
-        topic: function() {
-          return Cookie.parse('a="one two three"',false) || null;
-        },
-        "parsed": function(c) { assert.ok(c) },
-        "key": function(c) { assert.equal(c.key, 'a') },
-        "value": function(c) { assert.equal(c.value, '"one two three"') },
-        "no path": function(c) { assert.equal(c.path, null) },
-        "no domain": function(c) { assert.equal(c.domain, null) },
-        "no extensions": function(c) { assert.ok(!c.extensions) }
-      }
+      "parsed": function(c) { assert.ok(c) },
+      "key": function(c) { assert.equal(c.key, 'a') },
+      "value": function(c) { assert.equal(c.value, '"one two three"') },
+      "no path": function(c) { assert.equal(c.path, null) },
+      "no domain": function(c) { assert.equal(c.domain, null) },
+      "no extensions": function(c) { assert.ok(!c.extensions) }
     },
     "non-ASCII in value": {
-      "strict": {
-        topic: function() {
-          return Cookie.parse('farbe=weiß',true) || null;
-        },
-        "did not parse": function(c) { assert.isNull(c) }
+      topic: function() {
+        return Cookie.parse('farbe=weiß',false) || null;
       },
-      "non-strict": {
-        topic: function() {
-          return Cookie.parse('farbe=weiß',false) || null;
-        },
-        "parsed": function(c) { assert.ok(c) },
-        "key": function(c) { assert.equal(c.key, 'farbe') },
-        "value": function(c) { assert.equal(c.value, 'weiß') },
-        "no path": function(c) { assert.equal(c.path, null) },
-        "no domain": function(c) { assert.equal(c.domain, null) },
-        "no extensions": function(c) { assert.ok(!c.extensions) }
-      }
+      "parsed": function(c) { assert.ok(c) },
+      "key": function(c) { assert.equal(c.key, 'farbe') },
+      "value": function(c) { assert.equal(c.value, 'weiß') },
+      "no path": function(c) { assert.equal(c.path, null) },
+      "no domain": function(c) { assert.equal(c.domain, null) },
+      "no extensions": function(c) { assert.ok(!c.extensions) }
     }
   })
   .export(module);

package/test/regression_test.js

@@ -125,4 +125,19 @@ vows
       }
     }
   })
+  .addBatch({
+    "tough-cookie throws exception on malformed URI (GH-32)": {
+      topic: function () {
+        var url = "http://www.example.com/?test=100%";
+        var cj = new CookieJar();
+
+        cj.setCookieSync("Test=Test", url);
+
+        return cj.getCookieStringSync(url);
+      },
+      "cookies are set": function (cookieStr) {
+        assert.strictEqual(cookieStr, "Test=Test");
+      }
+    }
+  })
   .export(module);

package/tough-cookie-deps.tsv

@@ -1,6 +0,0 @@
-async (0.1.18)	MIT (http://github.com/caolan/async/raw/master/LICENSE)	node_modules/async/package.json
-diff (1.0.8)	BSD (http://github.com/kpdecker/jsdiff/blob/master/LICENSE)	node_modules/vows/node_modules/diff/package.json
-eyes (0.1.8)	MIT License (https://spdx.org/licenses/MIT)	node_modules/vows/node_modules/eyes/package.json
-punycode (1.0.0)	MIT (http://mths.be/mit)	node_modules/punycode/package.json
-tough-cookie (0.12.1)	MIT License (https://spdx.org/licenses/MIT)	package.json
-vows (0.7.0)	MIT License (https://spdx.org/licenses/MIT)	node_modules/vows/LICENSE