MAGETWO-99302: Edit customer State and Province is duplicated in the drop down

Author: romadjelf

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerActionGroup.xml

@@ -12,11 +12,11 @@
             <argument name="customerData" defaultValue="Simple_US_Customer"/>
         </arguments>
         <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-        <fillField userInput="{{Simple_Customer_Without_Address.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
-        <fillField userInput="{{Simple_Customer_Without_Address.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
-        <fillField userInput="{{Simple_Customer_Without_Address.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
-        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
-        <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-        <reloadPage stepKey="reloadPage"/>
+        <fillField userInput="{{customerData.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
+        <fillField userInput="{{customerData.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
+        <fillField userInput="{{customerData.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveCustomer"/>
+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+        <see userInput="You saved the customer." selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>

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

@@ -10,7 +10,8 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminVerifyCustomerAddressStateContainValuesOnceTest">
         <annotations>
-            <stories value="Verify customer address state"/>
+            <features value="Customer"/>
+            <stories value="Update Customer Address"/>
             <title value="State/Province dropdown contain values once"/>
             <description value="When editing a customer in the backend from the Magento Admin Panel the State/Province should only be listed once"/>
             <severity value="MAJOR"/>
@@ -25,8 +26,9 @@
         <after>
             <deleteData createDataKey="customer" stepKey="deleteFirstCustomer"/>
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteSecondCustomer">
-                <argument name="customerEmail" value="Simple_Customer_Without_Address.email"/>
+                <argument name="customerEmail" value="Simple_US_Customer.email"/>
             </actionGroup>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
@@ -54,7 +56,7 @@
 
         <!--Select new created customer, Click Edit mode-->
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPageWithoutAddresses">
-            <argument name="customer" value="Simple_Customer_Without_Address"/>
+            <argument name="customer" value="Simple_US_Customer"/>
         </actionGroup>
 
         <!--Select Addresses tab, Click on  create new addresses btn-->