Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-2152

Author: pradeep1819

app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedEmailsQtyTest.xml

@@ -22,21 +22,19 @@
         <before>
             <magentoCLI command="config:set wishlist/email/number_limit 1" stepKey="changeEmailsQtyLimit"/>
             <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
-                <argument name="tags" value="config"/>
+                <argument name="tags" value="config full_page"/>
             </actionGroup>
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronIndexer">
-                <argument name="indices" value=""/>
-            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="runCronIndexer"/>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
         </before>
         <after>
             <magentoCLI command="config:set wishlist/email/number_limit 10" stepKey="returnDefaultValue"/>
             <actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheClean">
-                <argument name="tags" value="config"/>
+                <argument name="tags" value="config full_page"/>
             </actionGroup>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>

dev/tests/integration/testsuite/Magento/Customer/Controller/ForgotPasswordPostTest.php

@@ -15,6 +15,8 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Http;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Framework\Math\Random;
@@ -528,7 +530,6 @@ private function clearCookieMessagesList(): void
     /**
      * Test to enable password change frequency limit for customer
      *
-     * @magentoDbIsolation disabled
      * @magentoConfigFixture current_store customer/password/min_time_between_password_reset_requests 0
      * @magentoConfigFixture current_store customer/captcha/enable 0
      * @magentoDataFixture Magento/Customer/_files/customer.php
@@ -556,7 +557,7 @@ public function testEnablePasswordChangeFrequencyLimitForCustomer(): void
         // Updating the limit to greater than 0
         $this->resourceConfig->saveConfig(
             'customer/password/min_time_between_password_reset_requests',
-            2,
+            1,
             ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
             0
         );
@@ -577,8 +578,8 @@ public function testEnablePasswordChangeFrequencyLimitForCustomer(): void
             MessageInterface::TYPE_ERROR
         );
 
-        // Wait for 2 minutes before resetting password
-        sleep(120);
+        // Wait for 1 minute before resetting password
+        sleep(60);
 
         // Clicking on the forgot password link
         $this->getRequest()->setPostValue('email', $email);