Minor refactor, clear up test gaps

Resolved Instanbul warnings (100%)

Author: nuxy

src/Router.js

@@ -79,7 +79,6 @@ class Router {
 
     const result = this.stack.exec(this.req, this.res);
 
-    /* istanbul ignore if (tested in: test/e2e/async) */
     if (isPromise(result)) {
       return result.then(() => this.res.data());
     }
@@ -311,23 +310,21 @@ class Router {
 function loadRoutes(router) {
   const routeDir = moduleParent() + '/routes';
 
-  if (fs.existsSync(routeDir)) {
-    const files = getRoutes(routeDir);
+  const files = getRoutes(routeDir);
 
-    files.forEach(file => {
-      file = path.relative(routeDir, file);
-      const {dir, name} = path.parse(file);
+  files.forEach(file => {
+    file = path.relative(routeDir, file);
+    const {dir, name} = path.parse(file);
 
-      const filePath = [dir, name].join('/');
-      const route = require(`${routeDir}/${filePath}`);
+    const filePath = [dir, name].join('/');
+    const route = require(`${routeDir}/${filePath}`);
 
-      route.path = (
-        filePath[0] === '/' ? filePath : `/${filePath}`
-      ).toLowerCase();
+    route.path = (
+      filePath[0] === '/' ? filePath : `/${filePath}`
+    ).toLowerCase();
 
-      Route(router, route);
-    });
-  }
+    Route(router, route);
+  });
 }
 
 /**
@@ -343,13 +340,14 @@ function loadRoutes(router) {
  */
 function getRoutes(dir, files = []) {
   fs.readdirSync(dir).forEach(function(file) {
-    const filePath = path.join(dir, file); // nosemgrep
+    const filePath = path.join(dir, file);
 
     if (fs.lstatSync(filePath).isDirectory()) {
 
       // Perform recursive traversal.
       getRoutes(filePath, files);
-    } else if (path.extname(filePath) === '.js') {
+
+    } else /* istanbul ignore next */ if (path.extname(filePath) === '.js') {
       files.push(filePath);
     }
   });

src/router/Request.js

@@ -97,16 +97,17 @@ class RouterRequest {
   param(name) {
     let obj = {};
 
-    /* istanbul ignore else (tested in: test/unit/Request) */
     if (this.queryString()) {
       obj = RouterRequest.parseParams(this.queryString());
     } else if (this.body()) {
       obj = RouterRequest.parseBody(this.body());
     }
 
-    if (name && obj[name]) {
-      return obj[name];
-    } else if (!name && obj) {
+    if (Object.keys(obj).length > 0) {
+      if (name) {
+        return obj[name];
+      }
+
       return obj;
     }
   }
@@ -188,12 +189,12 @@ class RouterRequest {
     const plugin = this.plugins[name];
 
     if ((!plugin && name && value) || (plugin && value)) {
-      this.plugins[name] = value;
+      return this.plugins[name] = value;
     } else if (plugin && !value) {
       return this.plugins[name];
-    } else if (!plugin) {
-      throw new RouterError(`Plugin "${name}" doesn't exist`);
     }
+
+    throw new RouterError(`Plugin "${name}" doesn't exist`);
   }
 
   /**

src/router/Route.js

@@ -60,8 +60,6 @@ module.exports = (router, route) => {
 
   // Add route-bound middleware, if available.
   if (route.middleware) {
-
-    /* istanbul ignore else (tested in: test/e2e) */
     if (Array.isArray(route.middleware)) {
       route.middleware.forEach(func => router.use(path, func));
     } else {

test/e2e/async/handler/routes/foo/bar/baz/Qux.js

@@ -7,8 +7,8 @@ const contentNegotiation = require(`${PACKAGE_ROOT}/test/e2e/async/handler/middl
  * @export {Object}
  */
 module.exports = {
-  middleware: [contentNegotiation],
-  resource: true,
+  middleware: contentNegotiation,
+  resource: ['get', 'put', 'patch', 'delete', 'post'],
 
   /**
    * GET /api/<path>/<resourceId>

test/unit/Request.js

@@ -46,12 +46,12 @@ describe('Request module', function() {
     });
 
     describe('param', function() {
-      const obj = clone(event.Records[0].cf.request);
-
       describe('queryString', function() {
+        const obj = clone(event.Records[0].cf.request);
 
         // Alter cloned request.
         obj.querystring = 'foo=bar&biz=baz';
+        obj.body.data   = '';
 
         const request = new Request(obj);
 
@@ -79,9 +79,11 @@ describe('Request module', function() {
       });
 
       describe('body', function() {
+        const obj = clone(event.Records[0].cf.request);
 
         // Alter cloned request.
-        obj.body = 'Zm9vPWJhciZiaXo9YmF6==';
+        obj.querystring = '';
+        obj.body.data   = 'Zm9vPWJhciZiaXo9YmF6==';
 
         const request = new Request(obj);
 
@@ -107,6 +109,32 @@ describe('Request module', function() {
           });
         });
       });
+
+      describe('undefined', function() {
+        const obj = clone(event.Records[0].cf.request);
+
+        // Alter cloned request.
+        obj.querystring = '';
+        obj.body.data   = '';
+
+        const request = new Request(obj);
+
+        describe('param()', function() {
+          it('should not return value', function() {
+            const result = request.param();
+
+            expect(result).to.be.undefined;
+          });
+        });
+
+        describe('param(argument)', function() {
+          it('should not return value', function() {
+            const result = request.param('qux');
+
+            expect(result).to.be.undefined;
+          });
+        });
+      });
     });
 
     describe('method', function() {
@@ -213,11 +241,16 @@ describe('Request module', function() {
     describe('parseBody', function() {
       const result1 = Request.parseBody('Zm9vPWJhciZiaXo9YmF6==');
       const result2 = Request.parseBody('eyJmb28iOiAiYmFyIiwgImJpeiI6ICJiYXoifQ==');
+      const result3 = Request.parseBody('');
 
       it('should return value', function() {
         expect(result1).to.deep.equal({foo: 'bar', biz: 'baz'});
         expect(result2).to.deep.equal({foo: 'bar', biz: 'baz'});
       });
+
+      it('should return no value', function() {
+        expect(result3).to.be.undefined;
+      });
     });
 
     describe('parseParams', function() {

test/unit/Stack.js

@@ -314,7 +314,7 @@ describe('Stack module', function() {
             });
           });
 
-          describe('with Error', function() {
+          describe('with RouterError', function() {
             const stack = new Stack();
 
             const func1 = async function(req, res, next) {
@@ -342,6 +342,35 @@ describe('Stack module', function() {
               return expect(promise).to.be.rejectedWith(RouterError, /Output to error/);
             });
           });
+
+          describe('undefined', function() {
+            const stack = new Stack();
+
+            const func1 = async function(req, res, next) {
+              res.setHeader('Middleware', true);
+            };
+
+            Utils.setFuncName(func1, 'middleware');
+
+            const func2 = async function(req, res, next) {
+              res.setHeader('Middleware', true);
+
+              return Promise.reject();
+            };
+
+            Utils.setFuncName(func2, 'middleware');
+
+            stack.middleware = [func1, func2];
+
+            const req = new Request(event.Records[0].cf.request, {});
+            const res = new Response({});
+
+            it('should ignore exception', function() {
+              const promise = stack.exec(req, res);
+
+              return expect(promise).to.be.fulfilled;
+            });
+          });
         });
       });
     });