Merge pull request #4561 from magento-performance/MC-18726-and-18727

Customer section 2.2

Author: vzabaznov

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

@@ -87,17 +87,7 @@ define([
                 data.shippingCarrierCode = quote.shippingMethod()['carrier_code'];
             }
 
-            if (!cartCache.isChanged('cartVersion', customerData.get('cart')()['data_id']) &&
-                !cartCache.isChanged('shippingMethodCode', data.shippingMethodCode) &&
-                !cartCache.isChanged('shippingCarrierCode', data.shippingCarrierCode) &&
-                !cartCache.isChanged('address', address) &&
-                cartCache.get('totals') &&
-                !cartCache.isChanged('subtotal', parseFloat(quote.totals().subtotal))
-            ) {
-                quote.setTotals(cartCache.get('totals'));
-            } else {
-                return loadFromServer(address);
-            }
+            return loadFromServer(address);
         }
     };
 });

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

@@ -102,8 +102,8 @@ define([
                 self.isLoading(true);
             });
 
-            if (cartData().website_id !== window.checkout.websiteId ||
-                cartData().store_id !== window.checkout.storeId
+            if (cartData().website_id !== window.checkout.websiteId &&
+                cartData().website_id !== undefined
             ) {
                 customerData.reload(['cart'], false);
             }

app/code/Magento/Persistent/Test/Mftf/Test/StorefrontQuoteShippingDataPersistedForGuestTest.xml

@@ -54,8 +54,6 @@
         <actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogout"/>
         <resetCookie userInput="persistent_shopping_cart" stepKey="resetPersistentCookie"/>
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePageAfterResetPersistentCookie"/>
-        <!--Check that the minicart is empty-->
-        <actionGroup ref="AssertMiniCartEmpty" after="amOnHomePageAfterResetPersistentCookie" stepKey="seeMinicartEmpty"/>
         <!--Step 4: Add the product to shopping cart and open cart-->
         <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToProductPageAsGuestUser"/>
         <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCartAsGuestUser">

app/code/Magento/Store/Model/StoreSwitcher/ManagePrivateContent.php

@@ -37,9 +37,12 @@ public function __construct(
     }
 
     /**
+     * Update version of private content on each store switch.
+     *
      * @param StoreInterface $fromStore store where we came from
      * @param StoreInterface $targetStore store where to go to
      * @param string $redirectUrl original url requested for redirect after switching
+     *
      * @return string redirect url
      * @throws CannotSwitchStoreException
      */
@@ -53,7 +56,7 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
                 ->setHttpOnly(false);
             $this->cookieManager->setPublicCookie(
                 \Magento\Framework\App\PageCache\Version::COOKIE_NAME,
-                'should_be_updated',
+                \uniqid('updated-', true),
                 $publicCookieMetadata
             );
         } catch (\Exception $e) {

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

@@ -23,9 +23,6 @@ define([
         result = {
             totals: 10
         },
-        totals = {
-            grandTotal: 5
-        },
         address = {
             countryId: 'US',
             region: null,
@@ -91,20 +88,6 @@ define([
 
     describe('Magento_Checkout/js/model/cart/totals-processor/default', function () {
 
-        it('estimateTotals if data was cached', function () {
-            spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'isChanged').and.returnValue(false);
-            spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(
-                ko.observable({
-                    'data_id': 1
-                })
-            );
-            spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'get').and.returnValue(totals);
-            spyOn(mocks['mage/storage'], 'post');
-            expect(defaultProcessor.estimateTotals(address)).toBeUndefined();
-            expect(mocks['Magento_Checkout/js/model/quote'].setTotals).toHaveBeenCalledWith(totals);
-            expect(mocks['mage/storage'].post).not.toHaveBeenCalled();
-        });
-
         it('estimateTotals if data wasn\'t cached and request was successfully sent', function () {
             var deferral = new $.Deferred();
 
@@ -122,12 +105,10 @@ define([
                 return deferral.resolve(result);
             });
             expect(defaultProcessor.estimateTotals(address)).toBe(deferral);
-            expect(mocks['Magento_Checkout/js/model/quote'].setTotals).toHaveBeenCalledWith(totals);
+            expect(mocks['Magento_Checkout/js/model/quote'].setTotals).toHaveBeenCalledWith(result);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(0)[0]).toBe(true);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(1)[0]).toBe(false);
             expect(mocks['mage/storage'].post).toHaveBeenCalled();
-            expect(mocks['Magento_Checkout/js/model/cart/cache'].get).not.toHaveBeenCalled();
-            expect(mocks['Magento_Checkout/js/model/cart/cache'].set).toHaveBeenCalledWith('cart-data', data);
         });
 
         it('estimateTotals if data wasn\'t cached and request returns error', function () {
@@ -147,7 +128,6 @@ define([
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(0)[0]).toBe(true);
             expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(1)[0]).toBe(false);
             expect(mocks['mage/storage'].post).toHaveBeenCalled();
-            expect(mocks['Magento_Checkout/js/model/cart/cache'].get).not.toHaveBeenCalled();
             expect(mocks['Magento_Checkout/js/model/error-processor'].process).toHaveBeenCalledWith('Error Message');
         });
     });