MTA-552: Re-factor Test for Create Product with New Category

- Added check for the old fixture
- Fixed test variation

Author: orykh

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

@@ -15,6 +15,7 @@
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab;
 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;
@@ -112,6 +113,12 @@ 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);
+            }
+
             $this->showAdvancedSettings();
             $this->fillTabs($tabs, $element);
 
@@ -120,7 +127,8 @@ public function fill(FixtureInterface $product, SimpleElement $element = null, F
             }
         }
 
-        $category = $product->hasData('category_ids')
+        //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]) {

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

@@ -58,7 +58,7 @@ public function __construct(
             $presets = explode(',', $data['presets']);
             foreach ($presets as $preset) {
                 $category = $fixtureFactory->createByCode('category', ['dataSet' => $preset]);
-                if ($data['persist'] !== 'no') {
+                if (!isset($data['persist']) || $data['persist'] !== 'no') {
                     $category->persist();
                 }
 

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv

@@ -21,4 +21,4 @@
 "Create product with up-sell products";"-";"-";"-";"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10019";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"59";"75";"In Stock";"-";"-";"-";"-";"-";"-";"-";"-";"catalogProductSimple::default, configurableProductInjectable::default";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductUpSells";""
 "Create product with related products";"-";"-";"-";"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10020";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"59";"75";"In Stock";"-";"-";"-";"-";"-";"-";"-";"-";"-";"catalogProductSimple::default, configurableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductRelatedProducts";""
 "MAGETWO-12423: Can't Add Out of Stock Products to Shopping Cart";"display_out_of_stock";"-";"-";"simple-product-%isolation%";"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10021";"-";"-";"-";"68";"0";"Out of Stock";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertAddToCartButtonAbsent";"test_type:acceptance_test"
-"MAGETWO-13345: Create Simple Product with Creating New Category (Required Fields Only)";"-";"no";"default_subcategory";"simple%isolation%";"simple%isolation%";"simple%isolation%";"-";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInCategory, assertProductPage";"test_type:acceptance_test"
+"MAGETWO-13345: Create Simple Product with Creating New Category (Required Fields Only)";"-";"no";"default_subcategory";"simple%isolation%";"simple%isolation%";"simple%isolation%";"-";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInCategory, assertProductPage";"test_type:acceptance_test"