Fixing cache test and adding proxy test

Author: geek

test/integration/proxy.js

@@ -43,7 +43,8 @@ describe('Proxy', function () {
             { method: 'POST', path: '/item', config: { proxy: { host: '127.0.0.1', port: 18093 } } },
             { method: 'POST', path: '/notfound', config: { proxy: { host: '127.0.0.1', port: 18093 } } },
             { method: 'GET', path: '/postResponseError', config: { proxy: { host: '127.0.0.1', port: 18093, postResponse: postResponseWithError }, cache: routeCache } },
-            { method: 'POST', path: '/echo', config: { proxy: { mapUri: mapUri } } }
+            { method: 'POST', path: '/echo', config: { proxy: { mapUri: mapUri } } },
+            { method: 'GET', path: '/maperror', config: { proxy: { mapUri: mapUriWithError } } }
         ]);
 
         dummyServer.listener.on('listening', function () {
@@ -72,6 +73,11 @@ describe('Proxy', function () {
         return callback(null, 'http://127.0.0.1:18093' + request.path, request.query);
     }
 
+    function mapUriWithError(request, callback) {
+
+        return callback(new Error('myerror'));
+    }
+
     function profile(request) {
 
         request.reply({
@@ -209,4 +215,13 @@ describe('Proxy', function () {
             done();
         });
     });
+
+    it('replies with an error when it occurs in mapUri', function(done) {
+
+        makeRequest({ path: '/maperror', method: 'get' }, function (rawRes) {
+
+            expect(rawRes.body).to.contain('myerror');
+            done();
+        });
+    });
 });

test/unit/cache.js

@@ -785,6 +785,7 @@ require('../suite')(function (useRedis, useMongo) {
             it('returns a positive number when using a future expiresAt', function (done) {
 
                 var hour = new Date(Date.now() + 60 * 60 * 1000).getHours();
+                hour = hour === 0 ? 1 : hour;
 
                 var config = {
                     expiresAt: hour + ':00'