[Cache] Fix bugs and add UTs.

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

Diff for: lib/commands/cache.js

@@ -34,7 +34,8 @@ cmd.handler = function(argv) {
       log.info(sprintf('%-50s %8s    %s ago',
             f.name,
             h.prettySize(f.size),
-            h.prettyTime(f.mtime)));
+            h.prettyTime((Date.now() - f.mtime) / 1000)
+            ));
     });
   } else if (argv.all) {
     cache.list().forEach(function(f) {

Diff for: lib/helper.js

@@ -33,19 +33,19 @@ h.prettySize = function(size) {
   return size.toFixed(2) + units[i];
 };
 
-h.prettyTime = function(t) {
+h.prettyTime = function(d) {
   var units = [
     [60, 'secs'],
     [60, 'mins'],
     [24, 'hours'],
-    [7, 'weeks'],
-    [4, 'months'],
-    [12, 'years']
+    [7, 'days'],
+    [4, 'weeks'],
+    [12, 'months'],
+    [9999, 'years']
   ];
 
-  var d = (Date.now() - t) / 1000;
   var i = 0;
-  while (d > units[i][0] && i < units.length) {
+  while (d >= units[i][0] && i < units.length) {
     d /= units[i][0];
     ++i;
   }

Diff for: test/mock/find-the-difference.html.20160911

@@ -33,4 +33,28 @@ describe('cache', function() {
     assert.deepEqual(cache.get(k), v);
     assert.equal(cache.del(k), true);
   });
+
+  it('should list ok when no cached', function() {
+    var items = cache.list();
+    assert.equal(items.length, 0);
+  });
+
+  it('should list ok when cached', function() {
+    assert.equal(cache.set(k, v), true);
+
+    var items = cache.list();
+    assert.equal(items.length, 1);
+
+    assert.equal(items[0].name, k);
+    assert.equal(items[0].size, JSON.stringify(v).length);
+  });
+
+  it('should list ok when cache dir not exist', function() {
+    h.getCacheDir = function() {
+      return '/not-exist-dir';
+    };
+
+    var items = cache.list();
+    assert.equal(items.length, 0);
+  });
 });

Diff for: test/mock/find-the-difference.html.20170424

@@ -46,6 +46,29 @@ describe('helper', function() {
     });
   }); // #prettyText
 
+  describe('#prettySize', function() {
+    it('should ok', function() {
+      assert.equal(h.prettySize(0), '0.00B');
+      assert.equal(h.prettySize(512), '512.00B');
+      assert.equal(h.prettySize(1024), '1.00K');
+      assert.equal(h.prettySize(1024 * 1024), '1.00M');
+      assert.equal(h.prettySize(1024 * 1024 * 1024), '1.00G');
+    });
+  }); // #prettySize
+
+  describe('#prettyTime', function() {
+    it('should ok', function() {
+      assert.equal(h.prettyTime(30), '30 secs');
+      assert.equal(h.prettyTime(60), '1 mins');
+      assert.equal(h.prettyTime(2400), '40 mins');
+      assert.equal(h.prettyTime(3600), '1 hours');
+      assert.equal(h.prettyTime(7200), '2 hours');
+      assert.equal(h.prettyTime(86400), '1 days');
+      assert.equal(h.prettyTime(86400 * 3), '3 days');
+      assert.equal(h.prettyTime(86400 * 7), '1 weeks');
+    });
+  }); // #prettyTime
+
   describe('#levelToName', function() {
     it('should ok', function() {
       assert.equal(h.levelToName(0), ' ');
@@ -161,6 +184,24 @@ describe('helper', function() {
     });
   }); // #getSetCookieValue
 
+  describe('#printSafeHTTP', function() {
+    it('should hide sensitive info', function() {
+      var raw = [
+        "Cookie: 'xxxxxx'",
+        "'X-CSRFToken': 'yyyyyy'",
+        "'set-cookie': ['zzzzzz']"
+      ].join('\r\n');
+
+      var hide = [
+        "Cookie: <hidden>",
+        "'X-CSRFToken': <hidden>",
+        "'set-cookie': <hidden>"
+      ].join('\r\n');
+
+      assert.equal(h.printSafeHTTP(raw), hide);
+    });
+  }); // #printSafeHTTP
+
   describe('#readStdin', function() {
     function hijackStdin(data) {
       var stream = require('stream');