Using Array.isArray, removing console.logs and renaming the protonewr…

…oute to protomultiple
malijs · Jul 4, 2021 · f520378 · f520378
1 parent 154c362
commit f520378
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/lib/app.js b/lib/app.js
@@ -88,7 +88,7 @@ class Mali extends Emitter {
         protoFilePath = path.file
         if (!loadOptions.includeDirs) {
           // Support either multiple or single paths.
-          loadOptions.includeDirs = path.root instanceof Array ? path.root : [path.root]
+          loadOptions.includeDirs = Array.isArray(path.root) ? path.root : [path.root]
         }
       }
 

diff --git a/test/app.test.js b/test/app.test.js
@@ -262,8 +262,6 @@ test.cb('should handle multiple protos request', t => {
 
   const app = new Mali()
   t.truthy(app)
-  console.log(PROTO_ROOT_MULTIPLE)
-  console.log(PROTO_ROOT_FOLDER)
   app.addService({ root: [PROTO_ROOT_MULTIPLE, PROTO_ROOT_FOLDER], file: 'helloworld.proto' }, 'helloworld.Greeter')
   app.use('helloworld.Greeter', 'SayHello', sayHello)
   app.start(APP_HOST).then(server => {
@@ -285,17 +283,15 @@ test.cb('should handle multiple protos with second folder definitions request',
   t.plan(5)
   const APP_HOST = tu.getHost()
   const PROTO_ROOT_FOLDER = path.resolve(__dirname, './protos')
-  const PROTO_ROOT_MULTIPLE = path.resolve(__dirname, './protosnewroute')
-  const PROTO_PATH = path.resolve(__dirname, './protosnewroute/hellomultiple.proto')
+  const PROTO_ROOT_MULTIPLE = path.resolve(__dirname, './protosmultiple')
+  const PROTO_PATH = path.resolve(__dirname, './protosmultiple/hellomultiple.proto')
 
   function sayMultiple (ctx) {
     ctx.res = { message: 'Hello Multiple ' + ctx.req.name }
   }
 
   const app = new Mali()
   t.truthy(app)
-  console.log(PROTO_ROOT_MULTIPLE)
-  console.log(PROTO_ROOT_FOLDER)
   app.addService({ root: [PROTO_ROOT_MULTIPLE, PROTO_ROOT_FOLDER], file: 'hellomultiple.proto' }, 'multiple.hello.GreeterMultiple')
   app.use('multiple.hello.GreeterMultiple', 'SayMultiple', sayMultiple)
   app.start(APP_HOST).then(server => {

diff --git a/test/protosnewroute/hellomultiple.proto → test/protosmultiple/hellomultiple.proto b/test/protosnewroute/hellomultiple.proto → test/protosmultiple/hellomultiple.proto