Merge remote-tracking branch 'arcticfoxes/MAGETWO-96385' into BugFixPR

Author: Joan He

app/code/Magento/Customer/Controller/Address/Delete.php

@@ -6,11 +6,16 @@
  */
 namespace Magento\Customer\Controller\Address;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 
-class Delete extends \Magento\Customer\Controller\Address implements HttpPostActionInterface
+/**
+ * Delete customer address controller action.
+ */
+class Delete extends \Magento\Customer\Controller\Address implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
+     * @inheritdoc
      * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()

app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml

@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerAddressesSection">
         <element name="addressesList" type="text" selector=".block-addresses-list" />
+        <element name="deleteAdditionalAddress" type="button" selector="//ol[@class='items addresses']/li[@class='item'][{{var}}]//a[@class='action delete']" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontDeleteCustomerAddressTest">
+        <annotations>
+            <stories value="Delete customer address from storefront"/>
+            <title value="User should be able to delete Customer address successfully from storefront"/>
+            <description value="User should be able to delete Customer address successfully from storefront"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-5713"/>
+            <group value="Customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
+        <fillField  stepKey="fillEmail" userInput="$$createCustomer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
+        <fillField  stepKey="fillPassword" userInput="$$createCustomer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
+        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
+        <actionGroup ref="EnterCustomerAddressInfo" stepKey="enterAddressInfo">
+            <argument name="Address" value="US_Address_NY"/>
+        </actionGroup>
+        <see userInput="You saved the address." stepKey="verifyAddressCreated"/>
+        <click selector="{{StorefrontCustomerAddressesSection.deleteAdditionalAddress('1')}}" stepKey="deleteAdditionalAddress"/>
+        <waitForElementVisible selector="{{ModalConfirmationSection.modalContent}}" stepKey="waitFortheConfirmationModal"/>
+        <see selector="{{ModalConfirmationSection.modalContent}}" userInput="Are you sure you want to delete this address?" stepKey="seeAddressDeleteConfirmationMessage"/>
+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
+        <see userInput="You deleted the address." stepKey="verifyDeleteAddress"/>
+    </test>
+</tests>

app/code/Magento/Ui/Test/Mftf/Section/ModalConfirmationSection.xml

@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ModalConfirmationSection">
+        <element name="modalContent" type="text" selector="aside.confirm div.modal-content"/>
         <element name="CancelButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-dismiss')]"/>
         <element name="OkButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-accept')]"/>
     </section>