Reorder util.extend logic

googleapis · Aug 29, 2014 · 346df2e · 346df2e
1 parent 6fd7154
commit 346df2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/common/util.js b/lib/common/util.js
@@ -35,14 +35,14 @@ function extend(from, to) {
   if (from === null || typeof from !== 'object') {
     return from;
   }
-  if (from.constructor !== Object && from.constructor !== Array) {
-    return from;
-  }
   if (from.constructor === Date || from.constructor === Function ||
       from.constructor === String || from.constructor === Number ||
       from.constructor === Boolean) {
     return new from.constructor(from);
   }
+  if (from.constructor !== Object && from.constructor !== Array) {
+    return from;
+  }
   to = to || new from.constructor();
   for (var name in from) {
     to[name] = to[name] ? extend(from[name], null) : to[name];

diff --git a/test/common/util.js b/test/common/util.js
@@ -26,6 +26,13 @@ describe('extend', function() {
     var copy = util.extend(null, {});
     assert.strictEqual(copy, null);
   });
+
+  it('should return a new Date for Date input', function() {
+    var now = new Date();
+    var copy = util.extend(now, {});
+    assert.notStrictEqual(copy, now);
+    assert.strictEqual(copy.toString(), now.toString());
+  });
 });
 
 describe('arrayize', function() {