neater test logs; fix for #662

senecajs · Aug 10, 2017 · ac0084a · ac0084a
1 parent 9717b38
commit ac0084a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/lib/common.js b/lib/common.js
@@ -584,7 +584,6 @@ History.prototype.place = function place(timelimit) {
   var i = this._list.length
   var s = 0
   var e = i
-  //var c = 'u'
 
   if (0 === this._list.length) {
     return 0

diff --git a/lib/logging.js b/lib/logging.js
@@ -59,8 +59,10 @@ logging.preload = function() {
 
           if ('test' === origspec || 'print' === origspec) {
             var logb = [
-              time + '/' + seneca.id.substring(0, 2),
-              (data.kind || 'data') + (data.case ? '/' + data.case : '')
+              time + '/' + seneca.id.substring(0, 2) + '/' + seneca.tag,
+              (data.kind || 'data') +
+                (data.case ? '/' + data.case : '') +
+                (data.meta ? (data.meta.sync ? '/s' : '/a' ) : '') 
             ]
 
             if ('act' === data.kind) {
@@ -105,11 +107,15 @@ logging.preload = function() {
             } else if ('notice' === data.kind) {
               logb.push(data.notice)
             } else if ('listen' === data.kind || 'client' === data.kind) {
-              logb.push(Util.inspect(data.options).replace(/\n/g, ' '))
-              //} else if (null == data.kind) {
-              // deliberately omit
+              var config = data.options && data.options[0]
+              logb.push([
+                config.type,
+                config.pin,
+                config.host,
+                _.isFunction(config.port) ? '' : config.port
+              ].join(';'))
             } else {
-              logb.push(Util.inspect(data).replace(/\n/g, ' '))
+              logb.push(Util.inspect(data).replace(/\n/g, ' ').substring(0, 88))
             }
 
             logstr = logb.join('\t')

diff --git a/seneca.js b/seneca.js
@@ -1443,19 +1443,23 @@ intern.handle_inward_break = function(
 intern.make_actmsg = function(origmsg) {
   var actmsg = Object.assign({}, origmsg)
 
+  if (actmsg.id$) {
+    delete actmsg.id$
+  }
+
   if (actmsg.caller$) {
     delete actmsg.caller$
   }
 
   if (actmsg.meta$) {
     delete actmsg.meta$
   }
-
+  
   // backwards compatibility for Seneca 3.x transports
   if (origmsg.transport$) {
     actmsg.transport$ = origmsg.transport$
   }
-
+  
   return actmsg
 }
 

diff --git a/test/actions.test.js b/test/actions.test.js
@@ -42,7 +42,7 @@ describe('actions', function() {
   })
 
   it('cmd_close', function(fin) {
-    var si = Seneca({ log: 'silent' })
+    var si = Seneca().test(fin)
 
     var log = []
     si.on('close', function() {

diff --git a/test/prior.test.js b/test/prior.test.js
@@ -29,7 +29,7 @@ describe('prior', function() {
       })
 
       .act('a:1,x:2', function(ignore, out) {
-        console.log(out)
+        expect(out.x).equal(3)
         fin()
       })
   })