MAGETWO-92137: Refreshing page deletes shipping address on guest checkout if module-persistent is enabled

Author: OlgaVasyltsun

app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php

@@ -91,7 +91,7 @@ public function testExecuteWhenCanNotApplyPersistentData()
             ->expects($this->once())
             ->method('canProcess')
             ->with($this->observerMock)
-            ->will($this->returnValue(false));
+            ->willReturn(false);
         $this->persistentHelperMock->expects($this->never())->method('isEnabled');
         $this->model->execute($this->observerMock);
     }
@@ -102,8 +102,8 @@ public function testExecuteWhenPersistentIsNotEnabled()
             ->expects($this->once())
             ->method('canProcess')
             ->with($this->observerMock)
-            ->will($this->returnValue(true));
-        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->will($this->returnValue(false));
+            ->willReturn(true);
+        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->willReturn(false);
         $this->eventManagerMock->expects($this->never())->method('dispatch');
         $this->model->execute($this->observerMock);
     }
@@ -116,6 +116,7 @@ public function testExecuteWhenPersistentIsNotEnabled()
      * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expireCounter
      * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $dispatchCounter
      * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCustomerIdCounter
+     * @return void
      * @dataProvider requestDataProvider
      */
     public function testExecuteWhenPersistentIsEnabled(
@@ -124,29 +125,29 @@ public function testExecuteWhenPersistentIsEnabled(
         \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expireCounter,
         \PHPUnit_Framework_MockObject_Matcher_InvokedCount $dispatchCounter,
         \PHPUnit_Framework_MockObject_Matcher_InvokedCount $setCustomerIdCounter
-    ) {
+    ): void {
         $this->persistentHelperMock
             ->expects($this->once())
             ->method('canProcess')
             ->with($this->observerMock)
-            ->will($this->returnValue(true));
-        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
-        $this->sessionMock->expects($this->once())->method('isPersistent')->will($this->returnValue(false));
+            ->willReturn(true);
+        $this->persistentHelperMock->expects($this->once())->method('isEnabled')->willReturn(true);
+        $this->sessionMock->expects($this->once())->method('isPersistent')->willReturn(false);
         $this->customerSessionMock
             ->expects($this->atLeastOnce())
             ->method('isLoggedIn')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
         $this->checkoutSessionMock
             ->expects($this->atLeastOnce())
             ->method('getQuoteId')
-            ->will($this->returnValue(10));
+            ->willReturn(10);
         $this->eventManagerMock->expects($dispatchCounter)->method('dispatch');
         $this->quoteManagerMock->expects($expireCounter)->method('expire');
         $this->customerSessionMock
             ->expects($setCustomerIdCounter)
             ->method('setCustomerId')
             ->with(null)
-            ->will($this->returnSelf());
+            ->willReturnSelf();
         $this->requestMock->expects($this->atLeastOnce())->method('getRequestUri')->willReturn($refererUri);
         $this->requestMock
             ->expects($this->atLeastOnce())

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/ActionGroup/NavigateToCheckoutActionGroup.xml

@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="GuestCheckoutPage" url="/checkout/#payment" area="storefront" module="Checkout">
+    <page name="GuestCheckoutReviewAndPaymentsPage" url="/checkout/#payment" area="storefront" module="Magento_Checkout">
         <section name="PaymentMethodSection"/>
         <section name="ShipToSection"/>
     </page>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Page/GuestCheckoutReviewAndPaymentsPage.xml

@@ -17,5 +17,7 @@
         <element name="region" type="select" selector="select[name=region_id]"/>
         <element name="postcode" type="input" selector="input[name=postcode]"/>
         <element name="telephone" type="input" selector="input[name=telephone]"/>
+        <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
+        <element name="firstShippingMethod" type="radio" selector=".row:nth-of-type(1) .col-method .radio"/>
     </section>
 </sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml

@@ -26,60 +26,58 @@
         </before>
         <after>
             <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
-            <actionGroup ref="logout" stepKey="adminLogout"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
         </after>
         <!-- Add simple product to cart -->
-        <actionGroup stepKey="addProductToCart1" ref="AddSimpleProductToCart">
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart1">
             <argument name="product" value="$$createProduct$$"/>
         </actionGroup>
         <!-- Navigate to checkout -->
-        <actionGroup stepKey="addProductNavigateToCheckout" ref="NavigateToCheckoutActionGroup"/>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutFromMinicart"/>
         <!-- Fill Shipping Address form -->
-        <fillField selector="{{GuestCheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
-        <fillField selector="{{GuestCheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
-        <fillField selector="{{GuestCheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
-        <fillField selector="{{GuestCheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
-        <fillField selector="{{GuestCheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
-        <selectOption selector="{{GuestCheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
-        <fillField selector="{{GuestCheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
-        <fillField selector="{{GuestCheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-        <click selector="{{GuestCheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <click selector="{{CheckoutShippingGuestInfoSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <!-- Check that have the same values after page reload -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="amOnCheckoutPage2"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-        <seeInField stepKey="seeEmailtOnCheckout" selector="{{GuestCheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" />
-        <seeInField stepKey="seeFirstnameOnCheckout" selector="{{GuestCheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstName}}" />
-        <seeInField stepKey="seeLastnameOnCheckout" selector="{{GuestCheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastName}}" />
-        <seeInField stepKey="seeStreetOnCheckout" selector="{{GuestCheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" />
-        <seeInField stepKey="seeCityOnCheckout" selector="{{GuestCheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" />
-        <seeInField stepKey="seeStateOnCheckout" selector="{{GuestCheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" />
-        <seeInField stepKey="seePostcodeOnCheckout" selector="{{GuestCheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" />
-        <seeInField stepKey="seePhoneOnCheckout" selector="{{GuestCheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" />
-        <waitForElement selector="{{GuestCheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="amOnCheckoutShippingInfoPage"/>
+        <waitForPageLoad stepKey="waitForShippingPageReload"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeEmailOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstName}}" stepKey="seeFirstnameOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastName}}" stepKey="seeLastnameOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeStreetOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="seeCityOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="seeStateOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="seePostcodeOnCheckout" />
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="seePhoneOnCheckout" />
         <!-- Click next button to open payment section -->
-        <click selector="{{GuestCheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForElement selector="{{GuestCheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="guestSelectCheckMoneyOrderPayment" />
         <!-- Reload payment section -->
-        <amOnPage url="{{GuestCheckoutPage.url}}" stepKey="amOnCheckoutShipToPage"/>
-        <waitForElement selector="{{GuestCheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton2"/>
+        <amOnPage url="{{GuestCheckoutReviewAndPaymentsPage.url}}" stepKey="amOnCheckoutPaymentsPage"/>
+        <waitForPageLoad stepKey="waitForPaymentPageReload"/>
         <!-- Check that address block contains correct information -->
-        <see stepKey="seeBilllingFirstName" selector="{{PaymentMethodSection.billingAddress}}" userInput="{{CustomerAddressSimple.firstName}}" />
-        <see stepKey="seeBilllingLastName" selector="{{PaymentMethodSection.billingAddress}}" userInput="{{CustomerAddressSimple.lastName}}" />
-        <see stepKey="seeBilllingStreet" selector="{{PaymentMethodSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" />
-        <see stepKey="seeBilllingCity" selector="{{PaymentMethodSection.billingAddress}}" userInput="{{CustomerAddressSimple.city}}" />
-        <see stepKey="seeBilllingState" selector="{{PaymentMethodSection.billingAddress}}" userInput="{{CustomerAddressSimple.state}}" />
-        <see stepKey="seeBilllingPostcode" selector="{{PaymentMethodSection.billingAddress}}" userInput="{{CustomerAddressSimple.postcode}}" />
-        <see stepKey="seeBilllingTelephone" selector="{{PaymentMethodSection.billingAddress}}" userInput="{{CustomerAddressSimple.telephone}}" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.firstName}}" stepKey="seeBilllingFirstName" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.lastName}}" stepKey="seeBilllingLastName" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeBilllingStreet" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.city}}" stepKey="seeBilllingCity" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.state}}" stepKey="seeBilllingState" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="seeBilllingPostcode" />
+        <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="seeBilllingTelephone" />
         <!-- Check that "Ship To" block contains correct information -->
-        <see stepKey="seeShipToFirstName" selector="{{ShipToSection.shippingInformation}}" userInput="{{CustomerAddressSimple.firstName}}" />
-        <see stepKey="seeShipToLastName" selector="{{ShipToSection.shippingInformation}}" userInput="{{CustomerAddressSimple.lastName}}" />
-        <see stepKey="seeShipToStreet" selector="{{ShipToSection.shippingInformation}}" userInput="{{CustomerAddressSimple.street[0]}}" />
-        <see stepKey="seeShipToCity" selector="{{ShipToSection.shippingInformation}}" userInput="{{CustomerAddressSimple.city}}" />
-        <see stepKey="seeShipToState" selector="{{ShipToSection.shippingInformation}}" userInput="{{CustomerAddressSimple.state}}" />
-        <see stepKey="seeShipToPostcode" selector="{{ShipToSection.shippingInformation}}" userInput="{{CustomerAddressSimple.postcode}}" />
-        <see stepKey="seeShipToTelephone" selector="{{ShipToSection.shippingInformation}}" userInput="{{CustomerAddressSimple.telephone}}" />
+        <see selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{CustomerAddressSimple.firstName}}" stepKey="seeShipToFirstName" />
+        <see selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{CustomerAddressSimple.lastName}}" stepKey="seeShipToLastName" />
+        <see selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeShipToStreet" />
+        <see selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{CustomerAddressSimple.city}}" stepKey="seeShipToCity" />
+        <see selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{CustomerAddressSimple.state}}" stepKey="seeShipToState" />
+        <see selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="seeShipToPostcode" />
+        <see selector="{{CheckoutPaymentSection.shipToInfomation}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="seeShipToTelephone" />
     </test>
 </tests>