Merge branch 'MC-13852' of https://github.com/magento-arcticfoxes/magento2ce into MC-13852

Author: rganin

app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml

@@ -60,6 +60,6 @@
         <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addFirstPnroductToWishlist"/>
 
         <!--Assert Correct Error Message-->
-        <see userInput="You need to choose options for your item for" stepKey="assertCorrectErrorMessage"/>
+        <see userInput="This is a required field" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsError}}" stepKey="seeError"/>
     </test>
 </tests>

app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js

@@ -22,6 +22,7 @@ define([
         /** @inheritdoc */
         _create: function () {
             this._bind();
+            this.bindFormSubmit(false);
         },
 
         /**
@@ -63,12 +64,6 @@ define([
                 isFileUploaded = false,
                 self = this;
 
-            if (event.handleObj.selector == this.options.qtyInfo) { //eslint-disable-line eqeqeq
-                this._updateAddToWishlistButton({});
-                event.stopPropagation();
-
-                return;
-            }
             $(event.handleObj.selector).each(function (index, element) {
                 if ($(element).is('input[type=text]') ||
                     $(element).is('input[type=email]') ||
@@ -89,9 +84,7 @@ define([
                 }
             });
 
-            if (isFileUploaded) {
-                this.bindFormSubmit();
-            }
+            this.bindFormSubmit(isFileUploaded);
             this._updateAddToWishlistButton(dataToAdd);
             event.stopPropagation();
         },
@@ -190,33 +183,41 @@ define([
         /**
          * Bind form submit.
          */
-        bindFormSubmit: function () {
+        bindFormSubmit: function (isFileUploaded) {
             var self = this;
 
-            $('[data-action="add-to-wishlist"]').on('click', function (event) {
+            $('[data-action="add-to-wishlist"]').off('click').on('click', function (event) {
                 var element, params, form, action;
 
-                event.stopPropagation();
-                event.preventDefault();
+                if (!$($(self.options.qtyInfo).closest('form')).valid()) {
+                    event.stopPropagation();
+                    event.preventDefault();
 
-                element = $('input[type=file]' + self.options.customOptionsInfo);
-                params = $(event.currentTarget).data('post');
-                form = $(element).closest('form');
-                action = params.action;
-
-                if (params.data.id) {
-                    $('<input>', {
-                        type: 'hidden',
-                        name: 'id',
-                        value: params.data.id
-                    }).appendTo(form);
+                    return;
                 }
 
-                if (params.data.uenc) {
-                    action += 'uenc/' + params.data.uenc;
+                if (isFileUploaded) {
+                    element = $('input[type=file]' + self.options.customOptionsInfo);
+                    params = $(event.currentTarget).data('post');
+                    form = $(element).closest('form');
+                    action = params.action;
+
+                    if (params.data.id) {
+                        $('<input>', {
+                            type: 'hidden',
+                            name: 'id',
+                            value: params.data.id
+                        }).appendTo(form);
+                    }
+
+                    if (params.data.uenc) {
+                        action += 'uenc/' + params.data.uenc;
+                    }
+
+                    $(form).attr('action', action).submit();
+                    event.stopPropagation();
+                    event.preventDefault();
                 }
-
-                $(form).attr('action', action).submit();
             });
         }
     });