Merge remote-tracking branch 'magento-mpi/MC-21756' into MPI-PR-2019-10-18

Author: arnobsh

app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js

@@ -185,6 +185,10 @@ define([
          * @returns {Boolean} - initial visibility state.
          */
         resolveInitialPasswordVisibility: function () {
+            if (checkoutData.getInputFieldEmailValue() !== '' && checkoutData.getCheckedEmailValue() === '') {
+                return true;
+            }
+
             if (checkoutData.getInputFieldEmailValue() !== '') {
                 return checkoutData.getInputFieldEmailValue() === checkoutData.getCheckedEmailValue();
             }

app/code/Magento/Persistent/Model/QuoteManager.php

@@ -121,7 +121,6 @@ public function convertCustomerCartToGuest()
                 ->setCustomerEmail(null)
                 ->setCustomerFirstname(null)
                 ->setCustomerLastname(null)
-                ->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID)
                 ->setIsPersistent(false);
             $quote->getAddressesCollection()->walk('setCustomerAddressId', ['customerAddressId' => null]);
             $quote->getAddressesCollection()->walk('setCustomerId', ['customerId' => null]);

app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php

@@ -55,23 +55,28 @@ protected function setUp()
     {
         $this->persistentSessionMock = $this->createMock(\Magento\Persistent\Helper\Session::class);
         $this->sessionMock =
-            $this->createPartialMock(\Magento\Persistent\Model\Session::class, [
+            $this->createPartialMock(
+                \Magento\Persistent\Model\Session::class,
+                [
                     'setLoadInactive',
                     'setCustomerData',
                     'clearQuote',
                     'clearStorage',
                     'getQuote',
                     'removePersistentCookie',
                     '__wakeup',
-                ]);
+                ]
+            );
         $this->persistentDataMock = $this->createMock(\Magento\Persistent\Helper\Data::class);
         $this->checkoutSessionMock = $this->createMock(\Magento\Checkout\Model\Session::class);
 
         $this->abstractCollectionMock =
             $this->createMock(\Magento\Eav\Model\Entity\Collection\AbstractCollection::class);
 
         $this->quoteRepositoryMock = $this->createMock(\Magento\Quote\Api\CartRepositoryInterface::class);
-        $this->quoteMock = $this->createPartialMock(\Magento\Quote\Model\Quote::class, [
+        $this->quoteMock = $this->createPartialMock(
+            \Magento\Quote\Model\Quote::class,
+            [
                 'getId',
                 'getIsPersistent',
                 'getPaymentsCollection',
@@ -90,7 +95,8 @@ protected function setUp()
                 'getIsActive',
                 'getCustomerId',
                 '__wakeup'
-            ]);
+            ]
+        );
 
         $this->model = new QuoteManager(
             $this->persistentSessionMock,
@@ -258,21 +264,22 @@ public function testConvertCustomerCartToGuest()
             ->method('setCustomerFirstname')->with(null)->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->once())
             ->method('setCustomerLastname')->with(null)->willReturn($this->quoteMock);
-        $this->quoteMock->expects($this->once())->method('setCustomerGroupId')
-            ->with(\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID)
+        $this->quoteMock->expects($this->never())->method('setCustomerGroupId')
             ->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->once())
             ->method('setIsPersistent')->with(false)->willReturn($this->quoteMock);
         $this->quoteMock->expects($this->exactly(3))
             ->method('getAddressesCollection')->willReturn($this->abstractCollectionMock);
-        $this->abstractCollectionMock->expects($this->exactly(3))->method('walk')->with($this->logicalOr(
-            $this->equalTo('setCustomerAddressId'),
-            $this->equalTo($addressArgs),
-            $this->equalTo('setCustomerId'),
-            $this->equalTo($customerIdArgs),
-            $this->equalTo('setEmail'),
-            $this->equalTo($emailArgs)
-        ));
+        $this->abstractCollectionMock->expects($this->exactly(3))->method('walk')->with(
+            $this->logicalOr(
+                $this->equalTo('setCustomerAddressId'),
+                $this->equalTo($addressArgs),
+                $this->equalTo('setCustomerId'),
+                $this->equalTo($customerIdArgs),
+                $this->equalTo('setEmail'),
+                $this->equalTo($emailArgs)
+            )
+        );
         $this->quoteMock->expects($this->once())->method('collectTotals')->willReturn($this->quoteMock);
         $this->persistentSessionMock->expects($this->once())
             ->method('getSession')->willReturn($this->sessionMock);