Merge pull request #1417 from magento-engcom/develop-prs

[EngCom] Public Pull Requests
 - MAGETWO-71578: Magento\Test\Js\LiveCodeTest is failing because of reference to missing file in blacklist #10536
 - MAGETWO-71544: Handle lifetime value 0 for form_key cookie #10528
 - MAGETWO-71542: Show shipping methods in shipping estimator as loading during estimation #10514

Author: ishakhsuvarov

app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js

@@ -14,6 +14,7 @@ define(
         'uiRegistry',
         'Magento_Checkout/js/model/quote',
         'Magento_Checkout/js/model/checkout-data-resolver',
+        'Magento_Checkout/js/model/shipping-service',
         'mage/validation'
     ],
     function (
@@ -26,7 +27,8 @@ define(
         shippingRatesValidator,
         registry,
         quote,
-        checkoutDataResolver
+        checkoutDataResolver,
+        shippingService
     ) {
         'use strict';
 
@@ -41,9 +43,15 @@ define(
              */
             initialize: function () {
                 this._super();
+
+                // Prevent shipping methods showing none available whilst we resolve
+                shippingService.isLoading(true);
+
                 registry.async('checkoutProvider')(function (checkoutProvider) {
                     var address, estimatedAddress;
 
+                    shippingService.isLoading(false);
+
                     checkoutDataResolver.resolveEstimationAddress();
                     address = quote.isVirtual() ? quote.billingAddress() : quote.shippingAddress();
 

app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html

@@ -5,7 +5,7 @@
  */
 -->
 <form id="co-shipping-method-form" data-bind="blockLoader: isLoading, visible: isVisible()">
-    <p class="field note" data-bind="visible: (shippingRates().length <= 0)">
+    <p class="field note" data-bind="visible: (!isLoading() && shippingRates().length <= 0)">
         <!-- ko text: $t('Sorry, no quotes are available for this order at this time')--><!-- /ko -->
     </p>
     <fieldset class="fieldset rate" data-bind="visible: (shippingRates().length > 0)">

app/code/Magento/PageCache/Observer/RegisterFormKeyFromCookie.php

@@ -88,7 +88,10 @@ private function updateCookieFormKey($formKey)
             ->createPublicCookieMetadata();
         $cookieMetadata->setDomain($this->sessionConfig->getCookieDomain());
         $cookieMetadata->setPath($this->sessionConfig->getCookiePath());
-        $cookieMetadata->setDuration($this->sessionConfig->getCookieLifetime());
+        $lifetime = $this->sessionConfig->getCookieLifetime();
+        if ($lifetime !== 0) {
+            $cookieMetadata->setDuration($lifetime);
+        }
 
         $this->cookieFormKey->set(
             $formKey,

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less

@@ -63,10 +63,6 @@
 
             .field {
                 margin: 0 0 16px;
-
-                &.note {
-                    display: none;
-                }
             }
 
             .actions-toolbar {

dev/tests/static/testsuite/Magento/Test/Js/_files/jshint/blacklist/core.txt

@@ -3,7 +3,6 @@ module Magento_Captcha view/frontend/web/onepage.js
 module Magento_Catalog view/adminhtml/web/catalog/category/edit.js
 module Magento_Catalog view/adminhtml/web/catalog/product.js
 module Magento_Catalog view/adminhtml/web/catalog/product/composite/configure.js
-module Magento_Checkout view/frontend/web/js/opcheckout.js
 module Magento_Rule view/adminhtml/web/rules.js
 module Magento_Sales view/adminhtml/web/order/create/giftmessage.js
 module Magento_Sales view/adminhtml/web/order/create/scripts.js