Merge pull request #2007 from montagejs/bugs/object-assign-shim

Allow undefined arguments to be passed to Object.assign
montagejs · Feb 5, 2019 · ad7e919 · ad7e919
2 parents 591e60e + a078d12
commit ad7e919
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/core/shim/object.js b/core/shim/object.js
@@ -81,9 +81,11 @@ if (!Object.assign) {
             }
             for (s = 1, ss = arguments.length; s < ss; ++s) {
                 source = arguments[s];
-                keys = Object.keys(source);
-                for (k = 0, kk = keys.length; k < kk; ++k) {
-                    target[keys[k]] = source[keys[k]];
+                if (source) {
+                    keys = Object.keys(source);
+                    for (k = 0, kk = keys.length; k < kk; ++k) {
+                        target[keys[k]] = source[keys[k]];
+                    }
                 }
             }
             return target;

diff --git a/test/spec/core/core-spec.js b/test/spec/core/core-spec.js
@@ -658,4 +658,19 @@ describe("core/core-spec", function () {
             expect(delegate.methodToBeCalled).toHaveBeenCalled();
         });
     });
+
+    describe("Object shim", function () {
+
+        it("should accept undefined arguments to assign()", function () {
+            var object = {aProperty: 23},
+                error = null;
+            try {
+                Object.assign(object, undefined);
+            } catch (e) {
+                error = e;
+            }
+            expect(error).toBeNull();
+        });
+    });
+
 });