Merge branch '2.4-develop' into bengals-mainline-deployment

Author: manjusha729

app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php

@@ -21,11 +21,9 @@ class DataProvider implements DataProviderInterface
     /**
      * Autocomplete limit
      */
-    const CONFIG_AUTOCOMPLETE_LIMIT = 'catalog/search/autocomplete_limit';
+    public const CONFIG_AUTOCOMPLETE_LIMIT = 'catalog/search/autocomplete_limit';
 
     /**
-     * Query factory
-     *
      * @var QueryFactory
      */
     protected $queryFactory;
@@ -38,8 +36,6 @@ class DataProvider implements DataProviderInterface
     protected $itemFactory;
 
     /**
-     * Limit
-     *
      * @var int
      */
     protected $limit;
@@ -68,8 +64,12 @@ public function __construct(
      */
     public function getItems()
     {
-        $collection = $this->getSuggestCollection();
         $query = $this->queryFactory->get()->getQueryText();
+        if (!$query) {
+            return [];
+        }
+
+        $collection = $this->getSuggestCollection();
         $result = [];
         foreach ($collection as $item) {
             $resultItem = $this->itemFactory->create([

app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php

@@ -147,4 +147,17 @@ private function buildCollection(array $data)
             ->method('getIterator')
             ->willReturn(new \ArrayIterator($collectionData));
     }
+
+    public function testGetItemsWithEmptyQueryText()
+    {
+        $this->query->expects($this->once())
+            ->method('getQueryText')
+            ->willReturn('');
+        $this->query->expects($this->never())
+            ->method('getSuggestCollection');
+        $this->itemFactory->expects($this->never())
+            ->method('create');
+        $result = $this->model->getItems();
+        $this->assertEmpty($result);
+    }
 }

setup/src/Magento/Setup/Fixtures/CouponCodesFixture.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Setup\Fixtures;
 
+use Magento\SalesRule\Model\ResourceModel\Coupon\CollectionFactory as CouponCollectionFactory;
+
 /**
  * Fixture for generating coupon codes
  *
@@ -37,23 +39,32 @@ class CouponCodesFixture extends Fixture
      */
     private $couponCodeFactory;
 
+    /**
+     * @var CouponCollectionFactory
+     */
+    private $couponCollectionFactory;
+
     /**
      * Constructor
      *
      * @param FixtureModel $fixtureModel
      * @param \Magento\SalesRule\Model\RuleFactory|null $ruleFactory
      * @param \Magento\SalesRule\Model\CouponFactory|null $couponCodeFactory
+     * @param CouponCollectionFactory|null $couponCollectionFactory
      */
     public function __construct(
         FixtureModel $fixtureModel,
         \Magento\SalesRule\Model\RuleFactory $ruleFactory = null,
-        \Magento\SalesRule\Model\CouponFactory $couponCodeFactory = null
+        \Magento\SalesRule\Model\CouponFactory $couponCodeFactory = null,
+        CouponCollectionFactory $couponCollectionFactory = null
     ) {
         parent::__construct($fixtureModel);
         $this->ruleFactory = $ruleFactory ?: $this->fixtureModel->getObjectManager()
             ->get(\Magento\SalesRule\Model\RuleFactory::class);
         $this->couponCodeFactory = $couponCodeFactory ?: $this->fixtureModel->getObjectManager()
             ->get(\Magento\SalesRule\Model\CouponFactory::class);
+        $this->couponCollectionFactory = $couponCollectionFactory ?: $this->fixtureModel->getObjectManager()
+            ->get(CouponCollectionFactory::class);
     }
 
     /**
@@ -64,7 +75,9 @@ public function __construct(
     public function execute()
     {
         $this->fixtureModel->resetObjectManager();
-        $this->couponCodesCount = $this->fixtureModel->getValue('coupon_codes', 0);
+        $requestedCouponsCount = (int) $this->fixtureModel->getValue('coupon_codes', 0);
+        $existedCouponsCount = $this->couponCollectionFactory->create()->getSize();
+        $this->couponCodesCount = max(0, $requestedCouponsCount - $existedCouponsCount);
         if (!$this->couponCodesCount) {
             return;
         }

setup/src/Magento/Setup/Test/Unit/Fixtures/CouponCodesFixtureTest.php

@@ -9,6 +9,8 @@
 
 use Magento\Framework\ObjectManager\ObjectManager;
 use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\ResourceModel\Coupon\Collection as CouponCollection;
+use Magento\SalesRule\Model\ResourceModel\Coupon\CollectionFactory as CouponCollectionFactory;
 use Magento\SalesRule\Model\Rule;
 use Magento\Setup\Fixtures\CartPriceRulesFixture;
 use Magento\Setup\Fixtures\CouponCodesFixture;
@@ -43,6 +45,11 @@ class CouponCodesFixtureTest extends TestCase
      */
     private $couponCodeFactoryMock;
 
+    /**
+     * @var CouponCollectionFactory|MockObject
+     */
+    private $couponCollectionFactoryMock;
+
     /**
      * setUp
      */
@@ -54,10 +61,12 @@ protected function setUp(): void
             \Magento\SalesRule\Model\CouponFactory::class,
             ['create']
         );
+        $this->couponCollectionFactoryMock = $this->createMock(CouponCollectionFactory::class);
         $this->model = new CouponCodesFixture(
             $this->fixtureModelMock,
             $this->ruleFactoryMock,
-            $this->couponCodeFactoryMock
+            $this->couponCodeFactoryMock,
+            $this->couponCollectionFactoryMock
         );
     }
 
@@ -66,6 +75,14 @@ protected function setUp(): void
      */
     public function testExecute()
     {
+        $couponCollectionMock = $this->createMock(CouponCollection::class);
+        $this->couponCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($couponCollectionMock);
+        $couponCollectionMock->expects($this->once())
+            ->method('getSize')
+            ->willReturn(0);
+
         $websiteMock = $this->createMock(Website::class);
         $websiteMock->expects($this->once())
             ->method('getId')
@@ -127,6 +144,14 @@ public function testExecute()
      */
     public function testNoFixtureConfigValue()
     {
+        $couponCollectionMock = $this->createMock(CouponCollection::class);
+        $this->couponCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($couponCollectionMock);
+        $couponCollectionMock->expects($this->once())
+            ->method('getSize')
+            ->willReturn(0);
+
         $ruleMock = $this->createMock(Rule::class);
         $ruleMock->expects($this->never())->method('save');
 
@@ -148,6 +173,28 @@ public function testNoFixtureConfigValue()
         $this->model->execute();
     }
 
+    public function testFixtureAlreadyCreated()
+    {
+        $couponCollectionMock = $this->createMock(CouponCollection::class);
+        $this->couponCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($couponCollectionMock);
+        $couponCollectionMock->expects($this->once())
+            ->method('getSize')
+            ->willReturn(1);
+
+        $this->fixtureModelMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->willReturn(1);
+
+        $this->fixtureModelMock->expects($this->never())->method('getObjectManager');
+        $this->ruleFactoryMock->expects($this->never())->method('create');
+        $this->couponCodeFactoryMock->expects($this->never())->method('create');
+
+        $this->model->execute();
+    }
+
     /**
      * testGetActionTitle
      */