Merge remote-tracking branch 'origin/MAGETWO-70641' into pr-regression-ece

Author: iivashchenko

dev/tests/js/jasmine/tests/lib/mage/multiselect.test.js

@@ -133,5 +133,26 @@ define([
             expect(instance.data('mage-multiselect2').appendOptions).toHaveBeenCalled();
             expect(instance.data('mage-multiselect2').setCurrentPage).toHaveBeenCalledWith(2);
         });
+
+        it('multiselect2 item click', function () {
+            var option = '<div><label><input type="checkbox" value="1"/><span>Label</span></label></div>',
+                checkbox;
+
+            $('body').append(option);
+
+            checkbox = $(option).find('input[type="checkbox"]');
+            checkbox.on('click', instance.data('mage-multiselect2').onCheck);
+
+            spyOn(instance.data('mage-multiselect2'), '_createSelectedOption').and.returnValue(true);
+
+            checkbox.click();
+
+            expect(instance.data('mage-multiselect2')._createSelectedOption).toHaveBeenCalledWith({
+                value: '1',
+                label: 'Label'
+            });
+
+            $(option).remove();
+        });
     });
 });

lib/web/mage/multiselect.js

@@ -135,7 +135,7 @@ define([
             var checkbox = event.target,
                 option = {
                     value: checkbox.value,
-                    label: $(checkbox.labels[0]).text()
+                    label: $(checkbox).parent('label').text()
                 };
 
             checkbox.checked ? this._createSelectedOption(option) : this._removeSelectedOption(option);
@@ -275,7 +275,7 @@ define([
          * @private
          */
         _createSelectedOption: function (option) {
-            var selectOption = new Option(option.value, option.value, false, true);
+            var selectOption = new Option(option.label, option.value, false, true);
 
             this.element.append(selectOption);
             this.selectedValues.push(option.value);