MTA-554: Re-factor Test for Unassign Products from Category

Author: orykh

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

@@ -13,12 +13,12 @@
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab;
-use Magento\Catalog\Test\Fixture\Product;
 use Magento\Mtf\Client\Element;
 use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\DataFixture;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\Fixture\InjectableFixture;
+use Magento\Catalog\Test\Fixture\Category;
 
 /**
  * Product form on backend product page.
@@ -60,41 +60,6 @@ class ProductForm extends FormTabs
      */
     protected $customTab = './/*/a[contains(@id,"product_info_tabs_%s")]';
 
-    /**
-     * Button "New Category".
-     *
-     * @var string
-     */
-    protected $buttonNewCategory = '#add_category_button';
-
-    /**
-     * Dialog box "Create Category".
-     *
-     * @var string
-     */
-    protected $createCategoryDialog = './/ancestor::body//*[contains(@class,"mage-new-category-dialog")]';
-
-    /**
-     * "Parent Category" block on dialog box.
-     *
-     * @var string
-     */
-    protected $parentCategoryBlock = '//*[contains(@class,"field-new_category_parent")]';
-
-    /**
-     * Field "Category Name" on dialog box.
-     *
-     * @var string
-     */
-    protected $fieldNewCategoryName = '//input[@id="new_category_name"]';
-
-    /**
-     * Button "Create Category" on dialog box.
-     *
-     * @var string
-     */
-    protected $createCategoryButton = '//button[contains(@class,"action-create")]';
-
     /**
      * Tabs title css selector.
      *
@@ -148,13 +113,11 @@ public function fill(FixtureInterface $product, SimpleElement $element = null, F
         } else {
             $tabs = $this->getFieldsByTabs($product);
 
+            //TODO: Remove after old product fixture will be deleted
             if (null === $category && $product instanceof DataFixture) {
                 $categories = $product->getCategories();
                 $category = reset($categories);
             }
-            if ($category) {
-                $tabs['product-details']['category_ids']['value'] = $category->getName();
-            }
 
             $this->showAdvancedSettings();
             $this->fillTabs($tabs, $element);
@@ -164,9 +127,41 @@ public function fill(FixtureInterface $product, SimpleElement $element = null, F
             }
         }
 
+        //TODO: Remove "!($product instanceof DataFixture)" after old product fixture will be deleted
+        $category = !($product instanceof DataFixture) && $product->hasData('category_ids')
+            ? $product->getDataFieldConfig('category_ids')['source']->getCategories()
+            : [$category];
+        if ($category[0]) {
+            $this->fillCategory($category, $element);
+        }
+
         return $this;
     }
 
+    /**
+     * Fill category data from product fixture.
+     *
+     * @param array|null $categoryList
+     * @param SimpleElement|null $element
+     * @return void
+     */
+    public function fillCategory($categoryList, $element)
+    {
+        /** @var Category $category */
+        foreach ($categoryList as $category) {
+            if ($category->hasData('id')) {
+                $tabs['product-details']['category_ids']['value'] = $category->getName();
+                $this->fillTabs($tabs, $element);
+            } else {
+                $this->openTab('product-details');
+                $this->blockFactory->create(
+                    'Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails\NewCategoryIds',
+                    ['element' => $this->browser->find('body')]
+                )->addNewCategory($category);
+            }
+        }
+    }
+
     /**
      * Create custom attribute.
      *
@@ -226,43 +221,6 @@ public function openTab($tabName)
         return parent::openTab($tabName);
     }
 
-    /**
-     * Save new category.
-     *
-     * @param Product $fixture
-     * @return void
-     */
-    public function addNewCategory(Product $fixture)
-    {
-        $this->openTab('product-details');
-        $this->openNewCategoryDialog();
-        $this->_rootElement->find(
-            $this->createCategoryDialog . $this->fieldNewCategoryName,
-            Locator::SELECTOR_XPATH
-        )->setValue($fixture->getNewCategoryName());
-
-        $this->clearCategorySelect();
-        $this->selectParentCategory();
-
-        $buttonCreateCategory = $this->createCategoryDialog . $this->createCategoryButton;
-        $this->_rootElement->find($buttonCreateCategory, Locator::SELECTOR_XPATH)->click();
-        $this->waitForElementNotVisible($buttonCreateCategory, Locator::SELECTOR_XPATH);
-    }
-
-    /**
-     * Select parent category for new one.
-     *
-     * @return void
-     */
-    protected function selectParentCategory()
-    {
-        $this->_rootElement->find(
-            $this->createCategoryDialog . $this->parentCategoryBlock,
-            Locator::SELECTOR_XPATH,
-            '\Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\ProductDetails\ParentCategoryIds'
-        )->setValue('Default Category');
-    }
-
     /**
      * Clear category field.
      *
@@ -276,17 +234,6 @@ public function clearCategorySelect()
         }
     }
 
-    /**
-     * Open new category dialog.
-     *
-     * @return void
-     */
-    protected function openNewCategoryDialog()
-    {
-        $this->_rootElement->find($this->buttonNewCategory)->click();
-        $this->waitForElementVisible($this->createCategoryDialog, Locator::SELECTOR_XPATH);
-    }
-
     /**
      * Check visibility of the attribute on the product page.
      *

dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CategoryIds.php

@@ -57,6 +57,10 @@ public function __construct(
         } elseif (isset($data['presets'])) {
             $presets = explode(',', $data['presets']);
             foreach ($presets as $preset) {
+                if ($preset == "") {
+                    $this->data[] = '';
+                    continue;
+                }
                 $category = $fixtureFactory->createByCode('category', ['dataSet' => $preset]);
                 $category->persist();
 

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.php

@@ -80,7 +80,7 @@ public function test(CatalogProductSimple $initialProduct, CatalogProductSimple
         $initialCategory = $initialProduct->hasData('category_ids')
             ? $initialProduct->getDataFieldConfig('category_ids')['source']->getCategories()[0]
             : null;
-        $category = $product->hasData('category_ids')
+        $category = $product->hasData('category_ids') && $product->getCategoryIds()[0]
             ? $product->getDataFieldConfig('category_ids')['source']->getCategories()[0]
             : $initialCategory;
 

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest/test.csv

@@ -7,3 +7,4 @@
 "Update product status to offline";"product_with_category";"-";"Test simple product %isolation%";"test_simple_product_%isolation%";"74.00";"87.0000";"-";"test-simple-product-%isolation%";"333.0000";"-";"Product offline";"assertProductSaveMessage, assertProductForm, assertProductIsNotDisplayingOnFrontend"
 "Update category";"product_with_category";"default";"Test simple product %isolation%";"test_simple_product_%isolation%";"74.00";"87.0000";"-";"test-simple-product-%isolation%";"333.0000";"-";"-";"assertProductSaveMessage, assertProductForm, assertUrlRewriteUpdatedProductInGrid, assertProductVisibleInCategory"
 "MAGETWO-12428: Edit Simple Product";"product_with_category";"default";"Test simple product %isolation%";"test_simple_product_%isolation%";"133.00";"-";"-";"test-simple-product-%isolation%";"-";"-";"-";"assertProductSaveMessage, assertProductPage"
+"MAGETWO-12417: Unassign Products from the Category";"product_with_category";"";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductNotVisibleInCategory"