Merge remote-tracking branch 'origin/MAGETWO-64834' into bugfixes

Author: olysenko

app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js

@@ -45,10 +45,15 @@ define([
                 totals: result,
                 address: address,
                 cartVersion: customerData.get('cart')()['data_id'],
-                shippingMethodCode: quote.shippingMethod()['method_code'],
-                shippingCarrierCode: quote.shippingMethod()['carrier_code']
+                shippingMethodCode: null,
+                shippingCarrierCode: null
             };
 
+            if (quote.shippingMethod()) {
+                data.shippingMethodCode = quote.shippingMethod()['method_code'];
+                data.shippingCarrierCode = quote.shippingMethod()['carrier_code'];
+            }
+
             quote.setTotals(result);
             cartCache.set('cart-data', data);
         }).fail(function (response) {
@@ -72,9 +77,19 @@ define([
          * @param {Object} address
          */
         estimateTotals: function (address) {
+            var data = {
+                shippingMethodCode: null,
+                shippingCarrierCode: null
+            };
+
+            if (quote.shippingMethod()) {
+                data.shippingMethodCode = quote.shippingMethod()['method_code'];
+                data.shippingCarrierCode = quote.shippingMethod()['carrier_code'];
+            }
+
             if (!cartCache.isChanged('cartVersion', customerData.get('cart')()['data_id']) &&
-                !cartCache.isChanged('shippingMethodCode', quote.shippingMethod()['method_code']) &&
-                !cartCache.isChanged('shippingCarrierCode', quote.shippingMethod()['carrier_code']) &&
+                !cartCache.isChanged('shippingMethodCode', data.shippingMethodCode) &&
+                !cartCache.isChanged('shippingCarrierCode', data.shippingCarrierCode) &&
                 !cartCache.isChanged('address', address) &&
                 cartCache.get('totals')
             ) {

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml

@@ -74,7 +74,6 @@
             <constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
         </variation>
         <variation name="AddProductsToShoppingCartEntityTestVariation6">
-            <data name="issue" xsi:type="string">MAGETWO-64874: Eternal loader in shipping and tax block</data>
             <data name="tag" xsi:type="string">severity:S2</data>
             <data name="productsData/0" xsi:type="string">downloadableProduct::with_two_separately_links</data>
             <data name="cart/data/grand_total" xsi:type="string">22.43</data>

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml

@@ -38,7 +38,6 @@
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
         </variation>
         <variation name="OnePageCheckoutTestVariation1" summary="Checkout as UK guest with virtual product and downloadable product using coupon for not logged in customers">
-            <data name="issue" xsi:type="string">MAGETWO-64874: Eternal loader in shipping and tax block</data>
             <data name="tag" xsi:type="string">severity:S0</data>
             <data name="products/0" xsi:type="string">catalogProductVirtual::default</data>
             <data name="products/1" xsi:type="string">downloadableProduct::with_two_separately_links</data>
@@ -156,7 +155,6 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
         </variation>
         <variation name="OnePageCheckoutTestVariation6" summary="Checkout as UK guest with virtual product using coupon for not logged in customers with Zero Subtotal Checkout payment method">
-            <data name="issue" xsi:type="string">MAGETWO-64874: Eternal loader in shipping and tax block</data>
             <data name="tag" xsi:type="string">severity:S0</data>
             <data name="products/0" xsi:type="string">catalogProductVirtual::product_50_dollar</data>
             <data name="salesRule" xsi:type="string">active_sales_rule_with_fixed_price_discount_coupon</data>