MTO-104: [Test] Export Customer Addresses

- Tests fixed.

Author: SiarheiAndreyeu

dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.php

@@ -121,6 +121,7 @@ public function test(
 
         /** @var Customer $initCustomer */
         $initCustomer = $this->fixtureFactory->createByCode('customer', ['data' => $data]);
+        //Add + 1 to attempts to get over maximum attempts count.
         $this->customerEdit($initCustomer, $attempts + 1);
     }
 

dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php

@@ -22,15 +22,24 @@ class AssertImportCustomerAddresses extends AbstractConstraint
      * @var array
      */
     private $mappingKeys = [
-        'firstname' => 'firstname',
-        'lastname' => 'lastname',
-        'postcode' => 'postcode',
-        'region' => 'region_id',
-        'city' => 'city',
-        'company' => 'company',
-        'country_id' => 'country_id',
-        'street' => 'street',
-        'telephone' => 'telephone',
+        'region' => 'region_id'
+    ];
+
+    /**
+     * Imported fields keys.
+     *
+     * @var array
+     */
+    private $importedFieldsKeys = [
+        'firstname',
+        'lastname',
+        'postcode',
+        'region_id',
+        'city',
+        'company',
+        'country_id',
+        'street',
+        'telephone'
     ];
 
     /**
@@ -156,7 +165,7 @@ private function getResultCsv()
      */
     private function deleteWasteData(array $csvData)
     {
-        $necessaryData = array_flip($this->mappingKeys);
+        $necessaryData = array_flip($this->importedFieldsKeys);
 
         return array_intersect_key($csvData, $necessaryData);
     }

dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/TestCase/ImportCustomerAddressTest.xml

@@ -20,8 +20,7 @@
                         <item name="0" xsi:type="string">customer::johndoe_with_addresses</item>
                     </item>
                     <item name="template" xsi:type="array">
-                        <item name="filename"
-                              xsi:type="string">Magento/CustomerImportExport/Test/_files/template/address/customer_addresses_variation_1</item>
+                        <item name="filename" xsi:type="string">Magento/CustomerImportExport/Test/_files/template/address/customer_addresses_variation_1</item>
                         <item name="count" xsi:type="number">1</item>
                     </item>
                 </item>
@@ -43,8 +42,7 @@
                         <item name="1" xsi:type="string">customer::default</item>
                     </item>
                     <item name="template" xsi:type="array">
-                        <item name="filename"
-                              xsi:type="string">Magento/CustomerImportExport/Test/_files/template/address/customer_addresses_variation_2</item>
+                        <item name="filename" xsi:type="string">Magento/CustomerImportExport/Test/_files/template/address/customer_addresses_variation_2</item>
                         <item name="count" xsi:type="number">2</item>
                     </item>
                 </item>

dev/tests/functional/tests/app/Magento/ImportExport/Test/Block/Adminhtml/Import/Edit/CustomForm.xml

@@ -33,6 +33,6 @@
         <import_file>
             <input>upload</input>
         </import_file>
-        <import_images_file_dir/>
+        <import_images_file_dir />
     </fields>
 </mapping>