MTA-1499: Analyse functional test failures

Author: Dmytro Aponasenko

dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/FrontendDecorator.php

@@ -6,7 +6,7 @@
 
 namespace Magento\Mtf\Util\Protocol\CurlTransport;
 
-use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Customer\Test\Fixture\Customer;
 use Magento\Mtf\Util\Protocol\CurlInterface;
 use Magento\Mtf\Util\Protocol\CurlTransport;
 
@@ -48,9 +48,9 @@ class FrontendDecorator implements CurlInterface
      * Constructor
      *
      * @param CurlTransport $transport
-     * @param CustomerInjectable $customer
+     * @param Customer $customer
      */
-    public function __construct(CurlTransport $transport, CustomerInjectable $customer)
+    public function __construct(CurlTransport $transport, Customer $customer)
     {
         $this->transport = $transport;
         $this->authorize($customer);
@@ -59,11 +59,11 @@ public function __construct(CurlTransport $transport, CustomerInjectable $custom
     /**
      * Authorize customer on frontend
      *
-     * @param CustomerInjectable $customer
+     * @param Customer $customer
      * @throws \Exception
      * @return void
      */
-    protected function authorize(CustomerInjectable $customer)
+    protected function authorize(Customer $customer)
     {
         $url = $_ENV['app_frontend_url'] . 'customer/account/login/';
         $this->transport->write(CurlInterface::POST, $url);

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

@@ -29,6 +29,13 @@ class GridPageAction extends ParentGridPageActions
      */
     protected $productItem = '[data-ui-id=products-list-add-new-product-button-item-%productType%]';
 
+    /**
+     * Product type list
+     *
+     * @var string
+     */
+    protected $typeList = '[data-ui-id=products-list-add-new-product-button-dropdown-menu]';
+
     /**
      * Add product using split button
      *
@@ -43,4 +50,18 @@ public function addProduct($productType = 'simple')
             Locator::SELECTOR_CSS
         )->click();
     }
+
+    /**
+     * Get product list
+     *
+     * @return array
+     */
+    public function getTypeList()
+    {
+        $this->_rootElement->find($this->toggleButton, Locator::SELECTOR_CSS)->click();
+        return $this->_rootElement->find(
+            $this->typeList,
+            Locator::SELECTOR_CSS
+        )->getText();
+    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View/CustomOptions.php

@@ -138,7 +138,7 @@ public function getOptions(FixtureInterface $product)
 
             /** @var SimpleElement $optionElement */
             $optionElement = $listCustomOptions[$title];
-            $typeMethod = preg_replace('/[^a-zA-Z]/', '', $this->getOptionType($option['type']));
+            $typeMethod = preg_replace('/[^a-zA-Z]/i', '', $this->getOptionType($option['type']));
             $getTypeData = 'get' . ucfirst(strtolower($typeMethod)) . 'Data';
 
             $optionData = $this->$getTypeData($optionElement);
@@ -495,7 +495,7 @@ protected function fillOptions(array $options)
      */
     protected function getOptionType($option)
     {
-        $option = substr($option, strpos($option, "/") + 1);
+        $option = strpos($option, "/") !== false ? substr($option, strpos($option, "/") + 1) : $option;
         return strtolower(preg_replace('/[^a-z]/i', '', $option));
     }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php

@@ -26,22 +26,23 @@ class AssertAddToCartButtonAbsent extends AbstractConstraint
      * Assert that "Add to cart" button is not display on page.
      *
      * @param InjectableFixture $product
-     * @param Category $category
      * @param CmsIndex $cmsIndex
      * @param CatalogCategoryView $catalogCategoryView
      * @param CatalogProductView $catalogProductView
+     * @param Category $category [optional]
      *
      * @return void
      */
     public function processAssert(
         InjectableFixture $product,
-        Category $category,
         CmsIndex $cmsIndex,
         CatalogCategoryView $catalogCategoryView,
-        CatalogProductView $catalogProductView
+        CatalogProductView $catalogProductView,
+        Category $category = null
     ) {
         $cmsIndex->open();
-        $cmsIndex->getTopmenu()->selectCategoryByName($category->getName());
+        $categoryName = $category === null ? $product->getCategoryIds()[0] : $category->getName();
+        $cmsIndex->getTopmenu()->selectCategoryByName($categoryName);
 
         $isProductVisible = $catalogCategoryView->getListProductBlock()->isProductVisible($product->getName());
         while (!$isProductVisible && $catalogCategoryView->getBottomToolbar()->nextPage()) {

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php

@@ -26,22 +26,23 @@ class AssertAddToCartButtonPresent extends AbstractConstraint
      * Assert that "Add to cart" button is present on page.
      *
      * @param InjectableFixture $product
-     * @param Category $category
      * @param CmsIndex $cmsIndex
      * @param CatalogCategoryView $catalogCategoryView
      * @param CatalogProductView $catalogProductView
+     * @param Category $category [optional]
      *
      * @return void
      */
     public function processAssert(
         InjectableFixture $product,
-        Category $category,
         CmsIndex $cmsIndex,
         CatalogCategoryView $catalogCategoryView,
-        CatalogProductView $catalogProductView
+        CatalogProductView $catalogProductView,
+        Category $category = null
     ) {
         $cmsIndex->open();
-        $cmsIndex->getTopmenu()->selectCategoryByName($category->getName());
+        $categoryName = $category === null ? $product->getCategoryIds()[0] : $category->getName();
+        $cmsIndex->getTopmenu()->selectCategoryByName($categoryName);
 
         $isProductVisible = $catalogCategoryView->getListProductBlock()->isProductVisible($product->getName());
         while (!$isProductVisible && $catalogCategoryView->getBottomToolbar()->nextPage()) {

dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/SimpleProduct.php

@@ -140,7 +140,7 @@ protected function getSimpleCustomOption()
                                 [
                                     'title' => 'custom option drop down',
                                     'is_require' => true,
-                                    'type' => 'Drop-down',
+                                    'type' => 'Select/Drop-down',
                                     'options' => [
                                         [
                                             'title' => 'Title Drop - down 1',

dev/tests/functional/tests/app/Magento/Reports/Test/Repository/ConfigData.xml

@@ -8,7 +8,7 @@
 <repository xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
     <storage class="Magento\Core\Test\Repository\ConfigData">
         <dataset name="compare_products">
-            <field path="catalog/recently_products/scope" scope="catalog" scope_id="1" label="Website" xsi:type="string">website</field>
+            <field path="catalog/recently_products/scope" scope="catalog" scope_id="1" label="Website" xsi:type="string">Website</field>
             <field path="catalog/recently_products/viewed_count" scope="catalog" scope_id="1" label="" xsi:type="string">5</field>
             <field path="catalog/recently_products/compared_count" scope="catalog" scope_id="1" label="" xsi:type="string">12</field>
         </dataset>

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/basic.xml

@@ -12,4 +12,9 @@
             <namespace value="Magento" />
         </allow>
     </rule>
+    <rule scope="testcase">
+        <deny>
+            <tag group="test_type" value="3rd_party_test" />
+        </deny>
+    </rule>
 </config>