Merge remote-tracking branch 'origin/port-2618' into port-2618

Author: viktym

app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

@@ -9,11 +9,12 @@ define([
     'Magento_Customer/js/customer-data',
     'Magento_Ui/js/modal/alert',
     'Magento_Ui/js/modal/confirm',
+    'underscore',
     'jquery/ui',
     'mage/decorate',
     'mage/collapsible',
     'mage/cookies'
-], function ($, authenticationPopup, customerData, alert, confirm) {
+], function ($, authenticationPopup, customerData, alert, confirm, _) {
     'use strict';
 
     $.widget('mage.sidebar', {
@@ -242,11 +243,13 @@ define([
          * @private
          */
         _removeItemAfter: function (elem) {
-            var productData = customerData.get('cart')().items.find(function (item) {
+            var productData = _.find(customerData.get('cart')().items, function (item) {
                 return Number(elem.data('cart-item')) === Number(item['item_id']);
             });
 
-            $(document).trigger('ajax:removeFromCart', productData['product_sku']);
+            if (!_.isUndefined(productData)) {
+                $(document).trigger('ajax:removeFromCart', productData['product_sku']);
+            }
         },
 
         /**

app/code/Magento/Checkout/view/frontend/web/js/view/configure/product-customer-data.js

@@ -1,8 +1,9 @@
 require([
     'jquery',
     'Magento_Customer/js/customer-data',
+    'underscore',
     'domReady!'
-], function ($, customerData) {
+], function ($, customerData, _) {
     'use strict';
 
     var selectors = {
@@ -41,7 +42,7 @@ require([
         if (!(data && data.items && data.items.length && productId)) {
             return;
         }
-        product = data.items.find(function (item) {
+        product = _.find(data.items, function (item) {
             if (item['item_id'] === itemId) {
                 return item['product_id'] === productId ||
                     item['item_id'] === productId;

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/sidebar.test.js

@@ -0,0 +1,78 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* eslint-disable max-nested-callbacks */
+/*jscs:disable jsDoc*/
+
+define([
+    'squire',
+    'jquery',
+    'ko'
+], function (Squire, $, ko) {
+    'use strict';
+
+    describe('Magento_Checkout/js/sidebar', function () {
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Customer/js/customer-data': {
+                    get: function () {
+                        return ko.observable();
+                    }
+                }
+            },
+            sidebar;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require(['Magento_Checkout/js/sidebar'], function (Constr) {
+                sidebar = new Constr;
+                done();
+            });
+        });
+
+        describe('Check remove mini-cart item callback.', function () {
+            var cartData = {
+                    'items': [
+                        {
+                            'item_id': 1,
+                            'product_sku': 'bundle'
+                        },
+                        {
+                            'item_id': 5,
+                            'product_sku': 'simple'
+                        },
+                        {
+                            'item_id': 7,
+                            'product_sku': 'configurable'
+                        }
+                    ]
+                },
+                cart = ko.observable(cartData);
+
+            beforeEach(function () {
+                spyOn(jQuery.fn, 'trigger');
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(cart);
+            });
+
+            it('Method "_removeItemAfter" is defined', function () {
+                expect(sidebar._removeItemAfter).toBeDefined();
+            });
+
+            it('Cart item is exists', function () {
+                var elem = $('<input>').data('cart-item', 5);
+
+                sidebar._removeItemAfter(elem);
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
+                expect(jQuery('body').trigger).toHaveBeenCalledWith('ajax:removeFromCart', 'simple');
+            });
+
+            it('Cart item doesn\'t exists', function () {
+                var elem = $('<input>').data('cart-item', 100);
+
+                sidebar._removeItemAfter(elem);
+                expect(jQuery('body').trigger).not.toHaveBeenCalled();
+            });
+        });
+    });
+});