MAGETWO-71670: Fix issue #10565 #10575

magento · Aug 19, 2017 · 16006c5 · 16006c5
2 parents fc28ea6 + fcb90c9
commit 16006c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js b/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
@@ -52,7 +52,7 @@ define([
          * @param {Array} data - current component value
          */
         setPrepareToSendData: function (data) {
-            if (!data.length) {
+            if (_.isUndefined(data) || !data.length) {
                 data = '';
             }
 

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/multiselect.test.js
@@ -52,6 +52,12 @@ define([
                 expect(obj.source.set).toHaveBeenCalledWith(dataScope + '-prepared-for-send', '');
             });
 
+            it('Check method call with undefined as parameter.', function () {
+
+                expect(obj.setPrepareToSendData(undefined)).toBeUndefined();
+                expect(obj.source.set).toHaveBeenCalledWith(dataScope + '-prepared-for-send', '');
+            });
+
             it('Check method call with array with data as parameter.', function () {
                 expect(obj.setPrepareToSendData(['1', '2', '3'])).toBeUndefined();
                 expect(obj.source.set).toHaveBeenCalledWith(dataScope + '-prepared-for-send', ['1', '2', '3']);