ACP2E-685: Product set to 'Not Visible Individually' still appear in Catalog Advanced Search Results

Author: dhorytskyi

dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php

@@ -65,6 +65,7 @@ public function testExecute(array $searchParams): void
         $this->dispatch('catalogsearch/advanced/result');
         $responseBody = $this->getResponse()->getBody();
         $this->assertStringContainsString('Simple product name', $responseBody);
+        $this->assertStringNotContainsString('Not visible simple product', $responseBody);
     }
 
     /**

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/AdvancedTest.php

@@ -27,6 +27,7 @@
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 /** @var ProductFactory $productFactory */
 $productFactory = $objectManager->get(ProductFactory::class);
+
 $product = $productFactory->create();
 $product->isObjectNew(true);
 $product->setTypeId(Type::TYPE_SIMPLE)
@@ -54,3 +55,31 @@
         ]
     );
 $productRepository->save($product);
+
+$product = $productFactory->create();
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Not visible simple product')
+    ->setSku('not_visible_simple')
+    ->setPrice(100)
+    ->setWeight(1)
+    ->setShortDescription('Product short description')
+    ->setTaxClassId(0)
+    ->setDescription('Product description')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setTestSearchableAttribute($attribute->getSource()->getOptionId('Option 1'))
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_qty_decimal' => 0,
+            'is_in_stock' => 1,
+        ]
+    );
+$productRepository->save($product);

dev/tests/integration/testsuite/Magento/CatalogSearch/_files/not_visible_searchable_product.php

@@ -7,14 +7,18 @@
 declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
-use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 /** @var ObjectManager $objectManager */
 $objectManager = Bootstrap::getObjectManager();
+/** @var EavSetupFactory $eavSetupFactory */
+$eavSetupFactory = $objectManager->create(EavSetupFactory::class);
 /** @var Registry $registry */
 $registry = $objectManager->get(Registry::class);
 /** @var ProductRepositoryInterface $productRepository */
@@ -27,8 +31,9 @@
 } catch (NoSuchEntityException $e) {
     //Product already deleted.
 }
+/** @var EavSetup $eavSetup */
+$eavSetup = $eavSetupFactory->create();
+$eavSetup->removeAttribute(Product::ENTITY, 'test_searchable_attribute');
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
-
-Resolver::getInstance()->requireDataFixture('Magento/CatalogSearch/_files/searchable_attribute_rollback.php');