MAGETWO-63209: Fatal error on category page when changing display mode with flat category on

ameysar · ameysar · commit 35951f833fcb · 2017-01-19T22:35:41.000+02:00
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Model\ResourceModel\Category\Collection;
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Model\ResourceModel\Category;
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/FlatTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/FlatTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.php
@@ -37,6 +37,13 @@ class CategoryForm extends FormTabs
      */
     protected $confirmModal = '.confirm._show[data-role=modal]';
 
+    /**
+     * Category edit title.
+     *
+     * @var string
+     */
+    protected $categoryTitle = '.category-edit-title h3.title';
+
     /**
      * Fill form with tabs.
      *
@@ -59,4 +66,25 @@ public function fill(FixtureInterface $fixture, SimpleElement $element = null)
 
         return $this->fillTabs($tabs, $element);
     }
+
+    /**
+     * Return category Id.
+     *
+     * @return string
+     */
+    public function getCategoryId()
+    {
+        $titleElement = $this->_rootElement->find($this->categoryTitle);
+        $title = '';
+        if ($titleElement->isVisible()) {
+            $title = $titleElement->getText();
+        }
+
+        $categoryId = '';
+        if (preg_match('/ID:\s*(?<id>\d+)/', $title, $matches)) {
+            $categoryId = $matches['id'];
+        }
+
+        return $categoryId;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -11,6 +11,7 @@
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
  * Assert that displayed category data on category page equals to passed from fixture.
@@ -45,23 +46,49 @@ class AssertCategoryPage extends AbstractConstraint
      * Assert that displayed category data on category page equals to passed from fixture.
      *
      * @param Category $category
+     * @param FixtureFactory $fixtureFactory
      * @param CatalogCategoryView $categoryView
      * @param BrowserInterface $browser
      * @return void
      */
     public function processAssert(
         Category $category,
+        FixtureFactory $fixtureFactory,
         CatalogCategoryView $categoryView,
         BrowserInterface $browser
     ) {
         $this->browser = $browser;
         $this->categoryViewPage = $categoryView;
+        $this->prepareData($fixtureFactory, $category);
         $this->browser->open($this->getCategoryUrl($category));
         
         $this->assertGeneralInformation($category);
         $this->assertDisplaySetting($category);
     }
 
+    /**
+     * Prepare comparison data.
+     *
+     * @param FixtureFactory $fixtureFactory
+     * @param Category $category
+     * @return void
+     */
+    protected function prepareData(FixtureFactory $fixtureFactory, Category $category)
+    {
+        $product = $fixtureFactory->createByCode(
+            'catalogProductSimple',
+            [
+                'dataset' => 'default',
+                'data' => [
+                    'category_ids' => [
+                        'category' => $category,
+                    ],
+                ]
+            ]
+        );
+        $product->persist();
+    }
+
     /**
      * Get category url to open.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
  -->
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/CategoryProducts.php
@@ -41,6 +41,11 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, $data
                 $this->data[] = $product->getName();
                 $this->products[] = $product;
             }
+        } else if (isset($data['products']) && is_array($data['products'])) {
+            foreach ($data['products'] as $product) {
+                $this->data[] = $product->getName();
+                $this->products[] = $product;
+            }
         }
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/LandingPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/StoreId.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/StoreId.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Webapi.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Category/Webapi.php
@@ -71,7 +71,7 @@ public function __construct(
     public function persist(FixtureInterface $fixture = null)
     {
         $data = $this->prepareData($fixture);
-        $url = $_ENV['app_frontend_url'] . 'rest/V1/categories';
+        $url = $_ENV['app_frontend_url'] . 'rest/all/V1/categories';
 
         $this->webapiTransport->write($url, $data);
         $response = json_decode($this->webapiTransport->read(), true);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/ConfigData.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.php
@@ -9,10 +9,11 @@
 use Magento\Catalog\Test\Fixture\Category;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
+use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\TestCase\Injectable;
 
 /**
- * Test Creation for CreateCategoryEntity
+ * Test Creation for CreateCategoryEntity.
  *
  * Test Flow:
  * 1. Login as admin
@@ -34,38 +35,50 @@ class CreateCategoryEntityTest extends Injectable
     /* end tags */
 
     /**
-     * Catalog category index page
+     * Catalog category index page.
      *
      * @var CatalogCategoryIndex
      */
     protected $catalogCategoryIndex;
 
     /**
-     * Catalog category edit page
+     * Catalog category edit page.
      *
      * @var CatalogCategoryEdit
      */
     protected $catalogCategoryEdit;
 
     /**
-     * Inject pages
+     * Fixture create factory.
+     *
+     * @var FixtureFactory
+     */
+    protected $fixtureFactory;
+
+    /**
+     * Inject pages.
      *
      * @param CatalogCategoryIndex $catalogCategoryIndex
      * @param CatalogCategoryEdit $catalogCategoryEdit
+     * @param FixtureFactory $fixtureFactory
      * @return void
      */
-    public function __inject(CatalogCategoryIndex $catalogCategoryIndex, CatalogCategoryEdit $catalogCategoryEdit)
-    {
+    public function __inject(
+        CatalogCategoryIndex $catalogCategoryIndex,
+        CatalogCategoryEdit $catalogCategoryEdit,
+        FixtureFactory $fixtureFactory
+    ) {
         $this->catalogCategoryIndex = $catalogCategoryIndex;
         $this->catalogCategoryEdit = $catalogCategoryEdit;
+        $this->fixtureFactory = $fixtureFactory;
     }
 
     /**
-     * Create category
+     * Create category.
      *
      * @param Category $category
      * @param string $addCategory
-     * @return void
+     * @return array
      */
     public function test(Category $category, $addCategory)
     {
@@ -74,5 +87,54 @@ public function test(Category $category, $addCategory)
         $this->catalogCategoryIndex->getTreeCategories()->$addCategory();
         $this->catalogCategoryEdit->getEditForm()->fill($category);
         $this->catalogCategoryEdit->getFormPageActions()->save();
+        $categoryId = $this->catalogCategoryEdit->getEditForm()->getCategoryId();
+
+        return ['category' => $this->prepareCategory($category, $categoryId)];
+    }
+
+    /**
+     *  Prepare category fixture data.
+     *
+     * @param Category $category
+     * @param string $categoryId
+     * @return Category
+     */
+    private function prepareCategory(Category $category, $categoryId)
+    {
+        $parentCategory = null;
+        $cmsBlock = null;
+        $store = null;
+        $products = null;
+
+        $parentSource = $category->getDataFieldConfig('parent_id')['source'];
+        if (is_a($parentSource, Category\ParentId::class) && $parentSource->getParentCategory()) {
+            $parentCategory = $parentSource->getParentCategory();
+        }
+
+        $cmsBlockSource = $category->getDataFieldConfig('landing_page')['source'];
+        if (is_a($cmsBlockSource, Category\LandingPage::class) && $cmsBlockSource->getCmsBlock()) {
+            $cmsBlock = $cmsBlockSource->getCmsBlock();
+        }
+
+        $storeSource = $category->getDataFieldConfig('store_id')['source'];
+        if (is_a($storeSource, Category\StoreId::class) && $storeSource->getStore()) {
+            $store = $storeSource->getStore();
+        }
+
+        $productSource = $category->getDataFieldConfig('category_products')['source'];
+        if (is_a($productSource, Category\CategoryProducts::class) && $productSource->getProducts()) {
+            $products = $productSource->getProducts();
+        }
+
+        $data = array_merge(
+            $category->getData(),
+            ['id' => $categoryId],
+            ['parent_id' => ['source' => $parentCategory]],
+            ['landing_page' => ['source' => $cmsBlock]],
+            ['store_id' => ['source' => $store]],
+            ['category_products' => ['products' => $products]]
+        );
+
+        return $this->fixtureFactory->create(Category::class, ['data' => $data]);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
  -->

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,11 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, $data`
`41`	`41`	`$this->data[] = $product->getName();`
`42`	`42`	`$this->products[] = $product;`
`43`	`43`	`}`
	`44`	`+ } else if (isset($data['products']) && is_array($data['products'])) {`
	`45`	`+ foreach ($data['products'] as $product) {`
	`46`	`+ $this->data[] = $product->getName();`
	`47`	`+ $this->products[] = $product;`
	`48`	`+ }`
`44`	`49`	`}`
`45`	`50`	`}`
`46`	`51`