Skip to content

Commit 5f25581

Browse files
Merge branch '2.4-develop' into L3-PR-2023-09-13
2 parents db1207f + 8ec20cb commit 5f25581

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,19 @@
2222
<before>
2323
<magentoCLI command="config:set wishlist/email/number_limit 1" stepKey="changeEmailsQtyLimit"/>
2424
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
25-
<argument name="tags" value="config"/>
25+
<argument name="tags" value="config full_page"/>
2626
</actionGroup>
2727
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
2828
<createData entity="SimpleProduct" stepKey="createProduct">
2929
<requiredEntity createDataKey="createCategory"/>
3030
</createData>
31-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronIndexer">
32-
<argument name="indices" value=""/>
33-
</actionGroup>
31+
<comment userInput="BIC workaround" stepKey="runCronIndexer"/>
3432
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
3533
</before>
3634
<after>
3735
<magentoCLI command="config:set wishlist/email/number_limit 10" stepKey="returnDefaultValue"/>
3836
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheClean">
39-
<argument name="tags" value="config"/>
37+
<argument name="tags" value="config full_page"/>
4038
</actionGroup>
4139
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
4240
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
use Magento\Framework\App\Config\ScopeConfigInterface;
1616
use Magento\Framework\App\Http;
1717
use Magento\Framework\App\Request\Http as HttpRequest;
18+
use Magento\Framework\Exception\AlreadyExistsException;
19+
use Magento\Framework\Exception\AuthenticationException;
1820
use Magento\Framework\Exception\NoSuchEntityException;
1921
use Magento\Framework\Intl\DateTimeFactory;
2022
use Magento\Framework\Math\Random;
@@ -528,7 +530,6 @@ private function clearCookieMessagesList(): void
528530
/**
529531
* Test to enable password change frequency limit for customer
530532
*
531-
* @magentoDbIsolation disabled
532533
* @magentoConfigFixture current_store customer/password/min_time_between_password_reset_requests 0
533534
* @magentoConfigFixture current_store customer/captcha/enable 0
534535
* @magentoDataFixture Magento/Customer/_files/customer.php
@@ -556,7 +557,7 @@ public function testEnablePasswordChangeFrequencyLimitForCustomer(): void
556557
// Updating the limit to greater than 0
557558
$this->resourceConfig->saveConfig(
558559
'customer/password/min_time_between_password_reset_requests',
559-
2,
560+
1,
560561
ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
561562
0
562563
);
@@ -577,8 +578,8 @@ public function testEnablePasswordChangeFrequencyLimitForCustomer(): void
577578
MessageInterface::TYPE_ERROR
578579
);
579580

580-
// Wait for 2 minutes before resetting password
581-
sleep(120);
581+
// Wait for 1 minute before resetting password
582+
sleep(60);
582583

583584
// Clicking on the forgot password link
584585
$this->getRequest()->setPostValue('email', $email);

0 commit comments

Comments
 (0)