Merge pull request keen#106 from srapp/fix-deep-extend

Don't attempt to clone a function attribute in deepExtend
dustinlarimer · Apr 20, 2018 · 171272a · 171272a
2 parents cc2214a + 60bd81a
commit 171272a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/dist/keen-tracking.js b/dist/keen-tracking.js
diff --git a/dist/keen-tracking.min.js b/dist/keen-tracking.min.js
diff --git a/lib/utils/deepExtend.js b/lib/utils/deepExtend.js
@@ -18,7 +18,7 @@ function deepExtend(target){
           deepExtend(target[prop], clone(arguments[i][prop]));
         }
         // Otherwise just copy it over...
-        else if (arguments[i][prop] !== undefined) {
+        else if (arguments[i][prop] !== undefined && 'function' !== typeof arguments[i][prop]) {
           target[prop] = clone(arguments[i][prop]);
         }
       }

diff --git a/test/unit/modules/utils/deep-extend-spec.js b/test/unit/modules/utils/deep-extend-spec.js
@@ -15,7 +15,10 @@ describe('Keen.utils.deepExtend', function() {
         a5: 'a5'
       },
       b: [],
-      c: [ 1, 2, 3 ]
+      c: [ 1, 2, 3 ],
+      d: {
+        value: 'd1'
+      }
     };
 
     var b = {
@@ -28,7 +31,11 @@ describe('Keen.utils.deepExtend', function() {
         }
       },
       b: false,
-      c: [ '3', 3, 5 ]
+      c: [ '3', 3, 5 ],
+      d: {
+        value: 'd2',
+        f: function() {}
+      }
     };
 
     assert.deepEqual(deepExtend(a, b), {
@@ -42,7 +49,26 @@ describe('Keen.utils.deepExtend', function() {
         a5: 'a5'
       },
       b: false,
-      c: [ 1, 2, 3, '3', 5 ]
+      c: [ 1, 2, 3, '3', 5 ],
+      d: {
+        value: 'd2'
+      }
+    });
+
+  });
+
+  it('should not blend function attributes', function() {
+    var a = {
+      value: 'a'
+    };
+
+    var b = {
+      value: 'b',
+      f: function() {}
+    };
+
+    assert.deepEqual(deepExtend(a, b), {
+      value: 'b'
     });
 
   });