MTA-1994: Analyse functional test failures - Sprint 10

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/FormTabs.php

@@ -13,11 +13,8 @@
 use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\Client\Element\SimpleElement;
-use Magento\Mtf\Util\Iterator\File;
-use Magento\Mtf\Util\XmlConverter;
 
 /**
- * Class FormTabs
  * Is used to represent any form with tabs on the page
  *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
@@ -30,11 +27,6 @@ class FormTabs extends Form
      */
     protected $tabs = [];
 
-    /**
-     * @var XmlConverter
-     */
-    protected $xmlConverter;
-
     /**
      * Fields which aren't assigned to any tab
      *
@@ -48,54 +40,24 @@ class FormTabs extends Form
      * @param Mapper $mapper
      * @param BlockFactory $blockFactory
      * @param BrowserInterface $browser
-     * @param XmlConverter $xmlConverter
      * @param array $config
      */
     public function __construct(
         SimpleElement $element,
         Mapper $mapper,
         BlockFactory $blockFactory,
         BrowserInterface $browser,
-        XmlConverter $xmlConverter,
         array $config = []
     ) {
-        $this->xmlConverter = $xmlConverter;
         parent::__construct($element, $blockFactory, $mapper, $browser, $config);
     }
 
     /**
      * Initialize block
      */
-    protected function _init()
+    protected function init()
     {
-        $this->tabs = $this->getTabs();
-    }
-
-    /**
-     * Get all tabs on the form
-     *
-     * @return array
-     */
-    protected function getTabs()
-    {
-        $result = [];
-
-        $paths = glob(
-            MTF_TESTS_PATH . preg_replace('/Magento\/\w+/', '*/*', str_replace('\\', '/', get_class($this))) . '.xml'
-        );
-        $files = new File($paths);
-
-        foreach ($files as $file) {
-            $presetXml = simplexml_load_string($file);
-            if ($presetXml instanceof \SimpleXMLElement) {
-                $array = $this->xmlConverter->convert($presetXml);
-                if (is_array($array)) {
-                    $result = array_replace_recursive($result, $array);
-                }
-            }
-        }
-
-        return $result;
+        $this->tabs = $this->getFormMapping();
     }
 
     /**

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/AttributeForm.php

@@ -15,7 +15,6 @@
 use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
-use Magento\Mtf\Util\XmlConverter;
 
 /**
  * Edit attribute form on catalog product edit page.
@@ -49,18 +48,16 @@ class AttributeForm extends FormTabs
      * @param Mapper $mapper
      * @param BlockFactory $blockFactory
      * @param BrowserInterface $browser
-     * @param XmlConverter $xmlConverter
      * @param array $config
      */
     public function __construct(
         SimpleElement $element,
         Mapper $mapper,
         BlockFactory $blockFactory,
         BrowserInterface $browser,
-        XmlConverter $xmlConverter,
         array $config = []
     ) {
-        parent::__construct($element, $mapper, $blockFactory, $browser, $xmlConverter, $config);
+        parent::__construct($element, $mapper, $blockFactory, $browser, $config);
         $this->browser->switchToFrame(new Locator($this->iFrame));
     }
 

dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Customer.xml

@@ -55,17 +55,6 @@
             <field name="gender" xsi:type="string">Male</field>
         </dataset>
 
-        <dataset name="johndoe_with_balance">
-            <field name="firstname" xsi:type="string">John</field>
-            <field name="lastname" xsi:type="string">Doe</field>
-            <field name="email" xsi:type="string">JohnDoe_%isolation%@example.com</field>
-            <field name="password" xsi:type="string">123123q</field>
-            <field name="password_confirmation" xsi:type="string">123123q</field>
-            <field name="dob" xsi:type="string">01/01/1990</field>
-            <field name="gender" xsi:type="string">Male</field>
-            <field name="amount_delta" xsi:type="string">501</field>
-        </dataset>
-
         <dataset name="defaultBackend">
             <field name="website_id" xsi:type="string">Main Website</field>
             <field name="firstname" xsi:type="string">John</field>

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Form.xml

@@ -18,10 +18,5 @@
         <send_email>
             <input>checkbox</input>
         </send_email>
-        <refund_customerbalance_return_enable>
-            <selector>#creditmemo_customerbalance_return_enable</selector>
-            <input>checkbox</input>
-        </refund_customerbalance_return_enable>
-        <refund_customerbalance_return />
     </fields>
 </mapping>

dev/tests/functional/tests/app/Magento/Sales/Test/Handler/OrderInjectable/Curl.php

@@ -101,7 +101,7 @@ protected function prepareData(FixtureInterface $fixture)
             'collect_shipping_rates' => 1,
         ];
         $result['shipping_data_method_set'] = [
-            'order' => ['shipping_method' => isset($data['shipping_method']) ? $data['shipping_method'] : ''],
+            'order' => ['shipping_method' => $result['order_data']['order']['shipping_method']],
             'payment' => $data['payment_auth_expiration'],
         ];
 
@@ -280,7 +280,7 @@ protected function prepareOrderData(array $data)
                     'group_id' => $customerGroupId,
                     'email' => $this->customer->getEmail(),
                 ],
-                'shipping_method' => $data['shipping_method'],
+                'shipping_method' => isset($data['shipping_method']) ? $data['shipping_method'] : '',
             ],
             'item' => $this->prepareOrderProductsData($data['entity_id']),
             'billing_address' => $this->prepareBillingAddress($data['billing_address_id']),

dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Form.xml

@@ -18,9 +18,5 @@
         <send_email>
             <input>checkbox</input>
         </send_email>
-        <refund_customerbalance_return_enable>
-            <input>checkbox</input>
-        </refund_customerbalance_return_enable>
-        <refund_customerbalance_return />
     </fields>
 </mapping>