MTA-1602: Sync qmt repository with mainline - Sprint 6

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php

@@ -6,53 +6,31 @@
 
 namespace Magento\Bundle\Test\Constraint;
 
-use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Fixture\Category;
+use Magento\Bundle\Test\Fixture\BundleProduct;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Magento\Cms\Test\Page\CmsIndex;
-use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Constraint\AssertProductInCategory;
+use Magento\Mtf\Fixture\FixtureInterface;
 
 /**
  * Check bundle product on the category page.
  */
-class AssertBundleInCategory extends AbstractConstraint
+class AssertBundleInCategory extends AssertProductInCategory
 {
     /* tags */
     const SEVERITY = 'low';
     /* end tags */
 
-    /**
-     * Check bundle product on the category page.
-     *
-     * @param CatalogCategoryView $catalogCategoryView
-     * @param CmsIndex $cmsIndex
-     * @param BundleProduct $product
-     * @param Category $category
-     * @return void
-     */
-    public function processAssert(
-        CatalogCategoryView $catalogCategoryView,
-        CmsIndex $cmsIndex,
-        BundleProduct $product,
-        Category $category
-    ) {
-        //Open category view page
-        $cmsIndex->open();
-        $cmsIndex->getTopmenu()->selectCategoryByName($category->getName());
-
-        //Process asserts
-        $this->assertPrice($product, $catalogCategoryView);
-    }
-
     /**
      * Verify product price on category view page.
      *
-     * @param BundleProduct $bundle
+     * @param FixtureInterface $bundle
      * @param CatalogCategoryView $catalogCategoryView
      * @return void
      */
-    protected function assertPrice(BundleProduct $bundle, CatalogCategoryView $catalogCategoryView)
+    protected function assertPrice(FixtureInterface $bundle, CatalogCategoryView $catalogCategoryView)
     {
+        /** @var BundleProduct $bundle */
         $priceData = $bundle->getDataFieldConfig('price')['source']->getPreset();
         //Price from/to verification
         $priceBlock = $catalogCategoryView->getListProductBlock()->getProductPriceBlock($bundle->getName());

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/NewCategoryIds.php

@@ -69,7 +69,7 @@ public function addNewCategory(Category $category)
      */
     protected function openNewCategoryDialog()
     {
-        $this->_rootElement->find($this->buttonNewCategory)->click();
+        $this->browser->find($this->buttonNewCategory)->click();
         $this->waitForElementVisible($this->createCategoryDialog);
     }
 }

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

@@ -62,7 +62,7 @@ public function __construct(
                     continue;
                 }
                 $category = $fixtureFactory->createByCode('category', ['dataSet' => $preset]);
-                if (!isset($data['new_category']) || $data['new_category'] !== 'no') {
+                if (!isset($data['new_category']) || $data['new_category'] !== 'yes') {
                     $category->persist();
                 }
 

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

@@ -671,7 +671,7 @@
         <variation name="CreateSimpleProductEntityTestVariation23">
             <data name="description">MAGETWO-13345: Create Simple Product with Creating New Category (Required Fields Only)</data>
             <data name="configData">-</data>
-            <data name="product/data/category_ids/new_category">no</data>
+            <data name="product/data/category_ids/new_category">yes</data>
             <data name="product/data/category_ids/presets">default_subcategory</data>
             <data name="product/data/url_key">simple%isolation%</data>
             <data name="product/data/name">simple%isolation%</data>