MC-29270: Storefront: Visible/Not-Visible child products of configurable product on storefront

Author: IvanPletnyov

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/FindByUrlRewriteTest.php

@@ -14,7 +14,6 @@
 use Magento\TestFramework\ObjectManager;
 use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
 use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollectionFactory;
-use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Model\UrlRewrite as UrlRewriteItem;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use PHPUnit\Framework\TestCase;
@@ -29,11 +28,6 @@ class FindByUrlRewriteTest extends TestCase
      */
     private $objectManger;
 
-    /**
-     * @var UrlFinderInterface
-     */
-    private $urlFinder;
-
     /**
      * @var ProductResource
      */
@@ -55,7 +49,6 @@ class FindByUrlRewriteTest extends TestCase
     protected function setUp()
     {
         $this->objectManger = Bootstrap::getObjectManager();
-        $this->urlFinder = $this->objectManger->get(UrlFinderInterface::class);
         $this->productResource = $this->objectManger->get(ProductResource::class);
         $this->productRepository = $this->objectManger->get(ProductRepositoryInterface::class);
         $this->urlRewriteCollectionFactory = $this->objectManger->get(UrlRewriteCollectionFactory::class);
@@ -251,13 +244,8 @@ private function getUrlRewritesCollectionByProductIds(
     private function checkConfigurableUrlRewriteWasCreated(): void
     {
         $configurableProduct = $this->productRepository->get('Configurable product');
-        $configurableUrlRewrite = $this->urlFinder->findOneByData(
-            [
-                UrlRewrite::ENTITY_TYPE => 'product',
-                UrlRewrite::ENTITY_ID => $configurableProduct->getId(),
-            ]
-        );
-        $this->assertNotNull($configurableUrlRewrite);
+        $configurableUrlRewrite = $this->getUrlRewritesCollectionByProductIds([$configurableProduct->getId()])
+            ->getFirstItem();
         $this->assertEquals(
             $configurableUrlRewrite->getTargetPath(),
             "catalog/product/view/id/{$configurableProduct->getId()}"

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/QuickSearchTest.php

@@ -129,7 +129,7 @@ public function testSearchByOptionValue(): void
      *
      * @return void
      */
-    protected function checkThatOnlyConfigurableProductIsAvailableBySearch(string $searchQuery): void
+    private function checkThatOnlyConfigurableProductIsAvailableBySearch(string $searchQuery): void
     {
         $searchResult = $this->quickSearchByQuery->execute($searchQuery);
         $this->assertCount(1, $searchResult->getItems());
@@ -144,7 +144,7 @@ protected function checkThatOnlyConfigurableProductIsAvailableBySearch(string $s
      * @param int $visibility
      * @return void
      */
-    protected function updateProductVisibility(int $visibility): void
+    private function updateProductVisibility(int $visibility): void
     {
         $childProduct = $this->productRepository->get('Simple option 1');
         $childProduct->setVisibility($visibility);
@@ -157,7 +157,7 @@ protected function updateProductVisibility(int $visibility): void
      * @param bool $firstChildIsVisible
      * @return void
      */
-    protected function checkProductAvailabilityInSearch(bool $firstChildIsVisible): void
+    private function checkProductAvailabilityInSearch(bool $firstChildIsVisible): void
     {
         $searchResult = $this->quickSearchByQuery->execute('Black');
         $this->assertNotNull($searchResult->getItemByColumnValue(Product::SKU, 'Configurable product'));