MC-20703: Admin: Delete a category

Author: ysapiga

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/DeleteTest.php

@@ -15,23 +15,33 @@
  * Test for class \Magento\Catalog\Controller\Adminhtml\Category\Delete
  *
  * @magentoAppArea adminhtml
- * @magentoDbIsolation enabled
  */
 class DeleteTest extends AbstractBackendController
 {
     /**
      * @return void
      */
-    public function testWithError(): void
+    public function testDeleteMissingCategory(): void
     {
         $incorrectId = 825852;
-        $postData = ['id' => $incorrectId];
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
-        $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setPostValue(['id' => $incorrectId]);
         $this->dispatch('backend/catalog/category/delete');
         $this->assertSessionMessages(
             $this->equalTo([(string)__(sprintf('No such entity with id = %s', $incorrectId))]),
             MessageInterface::TYPE_ERROR
         );
     }
+
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testDeleteCategory(): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(['id' => 333]);
+        $this->dispatch('backend/catalog/category/delete');
+        $this->assertSessionMessages($this->equalTo([(string)__('You deleted the category.')]));
+    }
 }

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Framework\Acl\Builder;
 use Magento\Framework\ObjectManagerInterface;
@@ -51,6 +52,9 @@ class CategoryRepositoryTest extends TestCase
     /** @var ObjectManagerInterface */
     private $objectManager;
 
+    /** @var CategoryCollectionFactory */
+    private $categoryCollectionFactory;
+
     /**
      * Sets up common objects.
      *
@@ -64,6 +68,7 @@ protected function setUp()
         $this->aclBuilder = $this->objectManager->get(Builder::class);
         $this->categoryFactory = $this->objectManager->get(CategoryInterfaceFactory::class);
         $this->productCollectionFactory = $this->objectManager->get(CollectionFactory::class);
+        $this->categoryCollectionFactory = $this->objectManager->create(CategoryCollectionFactory::class);
     }
 
     /**
@@ -127,20 +132,23 @@ public function testSaveDesign(): void
      * @magentoAppArea adminhtml
      * @return void
      */
-    public function testDeleteCategory(): void
+    public function testCheckCategoryBehaviourAfterDelete(): void
     {
         $productCollection = $this->productCollectionFactory->create();
-        $deletedCategories = [3, 4, 5, 13];
-        $categoryCollection = $this->categoryFactory->create()->getCollection()->toArray();
+        $deletedCategories = ['3', '4', '5', '13'];
+        $categoryCollectionIds = $this->categoryCollectionFactory->create()->getAllIds();
         $this->repo->deleteByIdentifier(3);
-        $this->assertEmpty(
-            $productCollection->addCategoriesFilter(['in' => $deletedCategories])->getItems(),
+        $this->assertEquals(
+            0,
+            $productCollection->addCategoriesFilter(['in' => $deletedCategories])->getSize(),
             'The category-products relations was not deleted after category delete'
         );
-        $newCategoryCollection = $this->categoryFactory->create()->getCollection()->toArray();
+        $newCategoryCollectionIds = $this->categoryCollectionFactory->create()->getAllIds();
+        $difference = array_diff($categoryCollectionIds, $newCategoryCollectionIds);
+        sort($difference);
         $this->assertEquals(
             $deletedCategories,
-            array_keys(array_diff_key($categoryCollection, $newCategoryCollection)),
+            $difference,
             'Wrong categories was deleted'
         );
     }