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

@@ -49,7 +49,7 @@ define([
                 shippingCarrierCode: null
             };
 
-            if (quote.shippingMethod()) {
+            if (quote.shippingMethod() && quote.shippingMethod()['method_code']) {
                 data.shippingMethodCode = quote.shippingMethod()['method_code'];
                 data.shippingCarrierCode = quote.shippingMethod()['carrier_code'];
             }
@@ -82,7 +82,7 @@ define([
                 shippingCarrierCode: null
             };
 
-            if (quote.shippingMethod()) {
+            if (quote.shippingMethod() && quote.shippingMethod()['method_code']) {
                 data.shippingMethodCode = quote.shippingMethod()['method_code'];
                 data.shippingCarrierCode = quote.shippingMethod()['carrier_code'];
             }

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js

@@ -32,6 +32,13 @@ define([
             regionId: 'California',
             postcode: 90210
         },
+        data = {
+            totals: result,
+            address: address,
+            cartVersion: 1,
+            shippingMethodCode: null,
+            shippingCarrierCode: null
+        },
         mocks = {
             'Magento_Checkout/js/model/resource-url-manager': {
                 getUrlForTotalsEstimationForNewAddress: jasmine.createSpy().and.returnValue(
@@ -42,8 +49,7 @@ define([
                 shippingMethod: ko.observable({
                     'method_code': 'flatrate',
                     'carrier_code': 'flatrate'
-                }
-                ),
+                }),
                 setTotals: jasmine.createSpy()
             },
             'mage/storage': {
@@ -66,13 +72,6 @@ define([
                 set: jasmine.createSpy()
             }
         },
-        data = {
-            totals: result,
-            address: address,
-            cartVersion: 1,
-            shippingMethodCode: 'flatrate',
-            shippingCarrierCode: 'flatrate'
-        },
         defaultProcessor;
 
     beforeEach(function (done) {
@@ -112,6 +111,9 @@ define([
             );
             spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'get');
             spyOn(mocks['mage/storage'], 'post').and.callFake(function () {
+                data.shippingMethodCode = mocks['Magento_Checkout/js/model/quote'].shippingMethod()['method_code'];
+                data.shippingCarrierCode = mocks['Magento_Checkout/js/model/quote'].shippingMethod()['carrier_code'];
+
                 return new $.Deferred().resolve(result);
             });
             expect(defaultProcessor.estimateTotals(address)).toBeUndefined();