Merge remote-tracking branch 'origin/MC-29686' into 2.4-develop-com-pr2

Author: ysapiga

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/ProductInCategoriesViewTest.php

@@ -100,6 +100,19 @@ public function productDataProvider(): array
         ];
     }
 
+    /**
+     * @magentoConfigFixture default_store cataloginventory/options/show_out_of_stock 1
+     * @magentoDataFixture Magento/Catalog/_files/out_of_stock_product_with_category.php
+     * @return void
+     */
+    public function testCategoryOutOfStockProductView(): void
+    {
+        $collection = $this->getCategoryProductCollection(333);
+
+        $this->assertEquals(1, $collection->getSize());
+        $this->assertEquals('out-of-stock-product', $collection->getFirstItem()->getSku());
+    }
+
     /**
      * @magentoDataFixture Magento/Catalog/_files/category_product.php
      * @dataProvider productVisibilityProvider

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

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/category.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = $objectManager->get(CategoryLinkManagementInterface::class);
+$product = $productFactory->create();
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product Out Of Stock')
+    ->setSku('out-of-stock-product')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([333])
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'qty'                       => 0,
+            'is_qty_decimal'            => 0,
+            'is_in_stock'               => 0,
+        ]
+    )
+    ->setCanSaveCustomOptions(true)
+    ->setHasOptions(true);
+/** @var ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository->save($product);

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

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/category_rollback.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+try {
+    $productRepository->deleteById('out-of-stock-product');
+} catch (NoSuchEntityException $e) {
+    //already removed
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);