Merge pull request #608 from magento-qmt/FT-PR-1

[Epam] Extend functional test coverage

Author: Alexander Akimov

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml

@@ -90,6 +90,10 @@
                 <input>input</input>
                 <selector>input[name='url_key']</selector>
             </url_key>
+            <use_default_url_key>
+                <input>checkbox</input>
+                <selector>input[name='use_default[url_key]']</selector>
+            </use_default_url_key>
             <meta_title>
                 <input>input</input>
                 <selector>input[name='meta_title']</selector>

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php

@@ -7,19 +7,39 @@
 namespace Magento\Catalog\Test\Block\Adminhtml\Category\Edit;
 
 use Magento\Backend\Test\Block\FormPageActions;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Category page actions.
  */
 class PageActions extends FormPageActions
 {
+    /**
+     * Top page element to implement a scrolling in case of floating blocks overlay.
+     */
+    const TOP_ELEMENT_TO_SCROLL = '.page-title';
+
     /**
      * Locator for "OK" button in warning block
      *
      * @var string
      */
     protected $warningBlock = '.ui-widget-content .ui-dialog-buttonset button:first-child';
 
+    /**
+     * Change Store View selector.
+     *
+     * @var string
+     */
+    protected $storeChangeButton = '#store-change-button';
+
+    /**
+     * Selector for confirm.
+     *
+     * @var string
+     */
+    protected $confirmModal = '.confirm._show[data-role=modal]';
+
     /**
      * Click on "Save" button
      *
@@ -33,4 +53,23 @@ public function save()
             $warningBlock->click();
         }
     }
+
+    /**
+     * Select Store View.
+     *
+     * @param string $name
+     * @return void
+     */
+    public function selectStoreView($name)
+    {
+        $this->browser->find(self::TOP_ELEMENT_TO_SCROLL)->click();
+        $this->_rootElement->find($this->storeChangeButton)->click();
+        $this->waitForElementVisible($name, Locator::SELECTOR_LINK_TEXT);
+        $this->_rootElement->find($name, Locator::SELECTOR_LINK_TEXT)->click();
+        $element = $this->browser->find($this->confirmModal);
+        /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
+        $modal = $this->blockFactory->create(\Magento\Ui\Test\Block\Adminhtml\Modal::class, ['element' => $element]);
+        $modal->acceptAlert();
+        $this->waitForElementVisible($this->storeChangeButton);
+    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php

@@ -60,6 +60,13 @@ class Tree extends Block
      */
     protected $header = 'header';
 
+    /**
+     * Xpath locator for category in tree.
+     *
+     * @var string
+     */
+    protected $categoryInTree = '//*[@class="x-tree-node-ct"]/li/div/a/span[contains(text(), "%s")]/..';
+
     /**
      * Get backend abstract block.
      *
@@ -153,6 +160,26 @@ public function isCategoryVisible(Category $category)
             ->isElementVisible($categoryPath);
     }
 
+    /**
+     * Assign child category to the parent.
+     *
+     * @param string $parentCategoryName
+     * @param string $childCategoryName
+     *
+     * @return void
+     */
+    public function assignCategory($parentCategoryName, $childCategoryName)
+    {
+        $this->_rootElement->find(sprintf($this->categoryInTree, $childCategoryName), Locator::SELECTOR_XPATH)->click();
+        $this->getTemplateBlock()->waitLoader();
+        $targetElement = $this->_rootElement->find(
+            sprintf($this->categoryInTree, $parentCategoryName),
+            Locator::SELECTOR_XPATH
+        );
+        $this->_rootElement->find(sprintf($this->categoryInTree, $childCategoryName), Locator::SELECTOR_XPATH)
+            ->dragAndDrop($targetElement);
+    }
+
     /**
      * Expand all categories tree.
      *

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

@@ -14,9 +14,12 @@
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Ui\Test\Block\Adminhtml\DataGrid;
+use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\ProductDetails\NewCategoryIds;
 
 /**
  * Product form on backend product page.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductForm extends FormSections
 {
@@ -48,6 +51,13 @@ class ProductForm extends FormSections
      */
     protected $attributeBlock = '[data-index="%s"]';
 
+    /**
+     * NewCategoryIds block selector.
+     *
+     * @var string
+     */
+    protected $newCategoryModalForm = '.product_form_product_form_create_category_modal';
+
     /**
      * Magento form loader.
      *
@@ -70,8 +80,6 @@ class ProductForm extends FormSections
      * @param FixtureInterface|null $category
      * @return $this
      * @throws \Exception
-     *
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function fill(FixtureInterface $product, SimpleElement $element = null, FixtureInterface $category = null)
     {
@@ -88,9 +96,14 @@ public function fill(FixtureInterface $product, SimpleElement $element = null, F
             $this->callRender($typeId, 'fill', $renderArguments);
         } else {
             $sections = $this->getFixtureFieldsByContainers($product);
-
+            $category = $product->hasData('category_ids')
+                ? $product->getDataFieldConfig('category_ids')['source']->getCategories()[0] : $category;
             if ($category) {
-                $sections['product-details']['category_ids']['value'] = $category->getName();
+                if ((int)$category->getId()) {
+                    $sections['product-details']['category_ids']['value'] = $category->getName();
+                } else {
+                    $this->getNewCategoryModalForm()->addNewCategory($category);
+                }
             }
             $this->fillContainers($sections, $element);
         }
@@ -193,6 +206,19 @@ public function getAttributeForm()
         );
     }
 
+    /**
+     * Get New Category Modal Form.
+     *
+     * @return NewCategoryIds
+     */
+    public function getNewCategoryModalForm()
+    {
+        return $this->blockFactory->create(
+            \Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\ProductDetails\NewCategoryIds::class,
+            ['element' => $this->browser->find($this->newCategoryModalForm)]
+        );
+    }
+
     /**
      * Get attribute element.
      *

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/TopToolbar.php

@@ -36,12 +36,11 @@ public function getSelectSortType()
     /**
      * Get all available method of sorting product
      *
-     * @return array|string
+     * @return array
      */
     public function getSortType()
     {
         $content = $this->_rootElement->find($this->sorter)->getText();
-        preg_match_all('/\w+\s?\w+/', $content, $matches);
-        return $matches[0];
+        return explode("\n", $content);
     }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml

@@ -41,6 +41,7 @@
         <field name="use_config_price_range" is_required="0" group="display_setting" />
         <field name="layered_navigation_price_step" is_required="0" group="display_setting" />
         <field name="url_key" group="seo" />
+        <field name="use_default_url_key" group="seo" />
         <field name="meta_title" is_required="" group="seo" />
         <field name="meta_keywords" is_required="" group="seo" />
         <field name="meta_description" is_required="" group="seo" />