Merge pull request #1292 from stephenplusplus/spp--1290

callmehiphop · callmehiphop · commit 4d6ebe3f3628 · 2016-05-06T12:33:04.000-04:00
logging: fix severity helper methods
diff --git a/lib/logging/log.js b/lib/logging/log.js
@@ -24,7 +24,6 @@ var arrify = require('arrify');
 var extend = require('extend');
 var is = require('is');
 var nodeutil = require('util');
-var propAssign = require('prop-assign');
 
 /**
  * @type {module:logging/entry}
@@ -112,8 +111,11 @@ nodeutil.inherits(Log, GrpcServiceObject);
  * @param {string} severity - The desired severity level.
  */
 Log.assignSeverityToEntries_ = function(entries, severity) {
-  var entriesClone = [].slice.call(entries);
-  return arrify(entriesClone).map(propAssign('severity', severity));
+  return arrify(entries).map(function(entry) {
+    return extend(new Entry(), entry, {
+      severity: severity
+    });
+  });
 };
 
 /**
diff --git a/system-test/logging.js b/system-test/logging.js
@@ -291,10 +291,18 @@ describe('Logging', function() {
       });
     });
 
-    it('should write to a log', function(done) {
+    it('should write a single entry to a log', function(done) {
+      log.write(logEntries[0], options, done);
+    });
+
+    it('should write multiple entries to a log', function(done) {
       log.write(logEntries, options, done);
     });
 
+    it('should write a single entry with alert helper', function(done) {
+      log.alert(logEntries[0], options, done);
+    });
+
     it('should write to a log with alert helper', function(done) {
       log.alert(logEntries, options, done);
     });
diff --git a/test/logging/log.js b/test/logging/log.js
@@ -124,20 +124,29 @@ describe('Log', function() {
 
   describe('assignSeverityToEntries_', function() {
     var ENTRIES = [
-      {},
-      {}
+      { data: { a: 'b' } },
+      { data: { c: 'd' } }
     ];
 
     var SEVERITY = 'severity';
 
-    it('should assign severity property to every entry', function() {
-      var entries = Log.assignSeverityToEntries_(ENTRIES, SEVERITY);
-
-      var allEntriesAssignedWithSeverity = entries.every(function(entry) {
-        return entry.severity === SEVERITY;
-      });
+    it('should assign severity to a single entry', function() {
+      assert.deepEqual(
+        Log.assignSeverityToEntries_(ENTRIES[0], SEVERITY),
+        [
+          extend(true, {}, ENTRIES[0], { severity: SEVERITY })
+        ]
+      );
+    });
 
-      assert.strictEqual(allEntriesAssignedWithSeverity, true);
+    it('should assign severity property to multiple entries', function() {
+      assert.deepEqual(
+        Log.assignSeverityToEntries_(ENTRIES, SEVERITY),
+        [
+          extend(true, {}, ENTRIES[0], { severity: SEVERITY }),
+          extend(true, {}, ENTRIES[1], { severity: SEVERITY })
+        ]
+      );
     });
 
     it('should not affect original array', function() {
