Merge pull request #4693 from magento-obsessive-owls/MC-19633-2.3.3

[Owls] MC-19633

Author: cspruiell

app/code/Magento/Catalog/Model/ProductLink/Search.php

@@ -60,7 +60,6 @@ public function prepareCollection(
     ): \Magento\Catalog\Model\ResourceModel\Product\Collection {
         $productCollection = $this->productCollectionFactory->create();
         $productCollection->addAttributeToSelect(ProductInterface::NAME);
-        $productCollection->setVisibility($this->catalogVisibility->getVisibleInCatalogIds());
         $productCollection->setPage($pageNum, $limit);
         $this->filter->addFilter($productCollection, 'fulltext', ['fulltext' => $searchKey]);
         $productCollection->setPage($pageNum, $limit);

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/SearchTest.php

@@ -38,7 +38,8 @@ public function testExecuteNonExistingSearchKey() : void
             ->setPostValue('limit', 50);
         $this->dispatch('backend/catalog/product/search');
         $responseBody = $this->getResponse()->getBody();
-        $this->assertContains('{"options":[],"total":0}', $responseBody);
+        $jsonResponse = json_decode($responseBody, true);
+        $this->assertEmpty($jsonResponse['options']);
     }
 
     /**
@@ -57,6 +58,24 @@ public function testExecuteNotVisibleIndividuallyProducts() : void
             ->setPostValue('limit', 50);
         $this->dispatch('backend/catalog/product/search');
         $responseBody = $this->getResponse()->getBody();
-        $this->assertContains('{"options":[],"total":0}', $responseBody);
+        $jsonResponse = json_decode($responseBody, true);
+        $this->assertEquals(1, $jsonResponse['total']);
+        $this->assertCount(1, $jsonResponse['options']);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/multiple_mixed_products.php
+     */
+    public function testExecuteEnabledAndDisabledProducts() : void
+    {
+        $this->getRequest()
+            ->setPostValue('searchKey', 'simple')
+            ->setPostValue('page', 1)
+            ->setPostValue('limit', 50);
+        $this->dispatch('backend/catalog/product/search');
+        $responseBody = $this->getResponse()->getBody();
+        $jsonResponse = json_decode($responseBody, true);
+        $this->assertEquals(6, $jsonResponse['total']);
+        $this->assertCount(6, $jsonResponse['options']);
     }
 }