MC-37543: Create automated test for "Add static block on a category page"

Author: IvanPletnyov

dev/tests/integration/testsuite/Magento/Catalog/Block/Category/ViewTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Catalog\Model\GetCategoryByName;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
@@ -39,6 +40,9 @@ class ViewTest extends TestCase
     /** @var LayoutInterface */
     private $layout;
 
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
     /**
      * @inheritdoc
      */
@@ -51,6 +55,7 @@ protected function setUp(): void
         $this->getCategoryByName = $this->objectManager->get(GetCategoryByName::class);
         $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
         $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
     }
 
     /**
@@ -70,8 +75,9 @@ protected function tearDown(): void
      */
     public function testCmsBlockDisplayedOnCategory(): void
     {
+        $storeId = (int)$this->storeManager->getStore('default')->getId();
         $categoryId = $this->getCategoryByName->execute('Category with cms block')->getId();
-        $category = $this->categoryRepository->get($categoryId, 1);
+        $category = $this->categoryRepository->get($categoryId, $storeId);
         $this->registerCategory($category);
         $block = $this->layout->createBlock(View::class)->setTemplate('Magento_Catalog::category/cms.phtml');
         $this->assertStringContainsString('<h1>Fixture Block Title</h1>', $block->toHtml());

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

@@ -12,12 +12,13 @@
 use Magento\Catalog\Model\Category;
 use Magento\Cms\Api\GetBlockByIdentifierInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Test cases for save category controller.
  *
  * @magentoAppArea adminhtml
- * @magentoDbIsolation disabled
+ * @magentoDbIsolation enabled
  */
 class SaveCategoryTest extends AbstractSaveCategoryTest
 {
@@ -30,6 +31,9 @@ class SaveCategoryTest extends AbstractSaveCategoryTest
     /** @var string */
     private $createdCategoryId;
 
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
     /**
      * @inheritdoc
      */
@@ -39,19 +43,22 @@ protected function setUp(): void
 
         $this->categoryRepository = $this->_objectManager->get(CategoryRepositoryInterface::class);
         $this->getBlockByIdentifier = $this->_objectManager->get(GetBlockByIdentifierInterface::class);
+        $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
     }
 
     /**
      * @inheritdoc
      */
     protected function tearDown(): void
     {
-        try {
-            $this->categoryRepository->deleteByIdentifier($this->createdCategoryId);
-        } catch (NoSuchEntityException $e) {
-            //Category already deleted.
+        if(!empty($this->createdCategoryId)) {
+            try {
+                $this->categoryRepository->deleteByIdentifier($this->createdCategoryId);
+            } catch (NoSuchEntityException $e) {
+                //Category already deleted.
+            }
+            $this->createdCategoryId = null;
         }
-        $this->createdCategoryId = null;
 
         parent::tearDown();
     }
@@ -63,15 +70,16 @@ protected function tearDown(): void
      */
     public function testCreateCategoryWithCmsBlock(): void
     {
-        $blockId = $this->getBlockByIdentifier->execute('fixture_block', 1)->getId();
+        $storeId = (int)$this->storeManager->getStore('default')->getId();
+        $blockId = $this->getBlockByIdentifier->execute('fixture_block', $storeId)->getId();
         $postData = [
             CategoryInterface::KEY_NAME => 'Category with cms block',
             CategoryInterface::KEY_IS_ACTIVE => 1,
             CategoryInterface::KEY_INCLUDE_IN_MENU => 1,
             'display_mode' => Category::DM_MIXED,
             'landing_page' => $blockId,
-            'available_sort_by' => 1,
-            'default_sort_by' => 1,
+            CategoryInterface::KEY_AVAILABLE_SORT_BY => ['position'],
+            'default_sort_by' => 'position',
         ];
         $responseData = $this->performSaveCategoryRequest($postData);
         $this->assertRequestIsSuccessfullyPerformed($responseData);

dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block.php

@@ -31,7 +31,6 @@
 $getBlockByIdentifier = $objectManager->get(GetBlockByIdentifierInterface::class);
 $block = $getBlockByIdentifier->execute('fixture_block', $currentStoreId);
 
-$storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
 $category = $categoryFactory->create();
 $category->setName('Category with cms block')
     ->setParentId($categoryHelper->getId())
@@ -42,5 +41,9 @@
     ->setPosition(1)
     ->setDisplayMode(Category::DM_MIXED)
     ->setLandingPage($block->getId());
-$categoryRepository->save($category);
-$storeManager->setCurrentStore($currentStoreId);
+try {
+    $storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+    $categoryRepository->save($category);
+} finally {
+    $storeManager->setCurrentStore($currentStoreId);
+}