forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.4-develop' into fix-27489
- Loading branch information
Showing
199 changed files
with
6,540 additions
and
741 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
...e/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
| <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> | ||
| <actionGroup name="AdminCatalogPriceRuleDeleteAllActionGroup"> | ||
| <annotations> | ||
| <description>Open Catalog Price Rule grid and delete all rules one by one. Need to avoid interference with other tests that test catalog price rules.</description> | ||
| </annotations> | ||
|
|
||
| <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage"/> | ||
| <!-- It sometimes is loading too long for default 10s --> | ||
| <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded"/> | ||
| <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/> | ||
| <helper class="\Magento\CatalogRule\Test\Mftf\Helper\CatalogPriceRuleHelper" method="deleteAllCatalogPriceRules" stepKey="deleteAllCatalogPriceRulesOneByOne"> | ||
| <argument name="firstNotEmptyRow">{{AdminDataGridTableSection.firstNotEmptyRow}}</argument> | ||
| <argument name="modalAcceptButton">{{AdminConfirmationModalSection.ok}}</argument> | ||
| <argument name="deleteButton">{{AdminMainActionsSection.delete}}</argument> | ||
| <argument name="successMessageContainer">{{AdminMessagesSection.success}}</argument> | ||
| <argument name="successMessage">You deleted the rule.</argument> | ||
| </helper> | ||
| <waitForElementVisible selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="waitDataGridEmptyMessageAppears"/> | ||
| <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/> | ||
| </actionGroup> | ||
| </actionGroups> |
62 changes: 62 additions & 0 deletions
62
app/code/Magento/CatalogRule/Test/Mftf/Helper/CatalogPriceRuleHelper.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\CatalogRule\Test\Mftf\Helper; | ||
|
|
||
| use Facebook\WebDriver\Remote\RemoteWebDriver as FacebookWebDriver; | ||
| use Facebook\WebDriver\WebDriverBy; | ||
| use Magento\FunctionalTestingFramework\Helper\Helper; | ||
| use Magento\FunctionalTestingFramework\Module\MagentoWebDriver; | ||
|
|
||
| /** | ||
| * Class for MFTF helpers for CatalogRule module. | ||
| */ | ||
| class CatalogPriceRuleHelper extends Helper | ||
| { | ||
| /** | ||
| * Delete all Catalog Price Rules obe by one. | ||
| * | ||
| * @param string $emptyRow | ||
| * @param string $modalAceptButton | ||
| * @param string $deleteButton | ||
| * @param string $successMessageContainer | ||
| * @param string $successMessage | ||
| * | ||
| * @return void | ||
| */ | ||
| public function deleteAllCatalogPriceRules( | ||
| string $firstNotEmptyRow, | ||
| string $modalAcceptButton, | ||
| string $deleteButton, | ||
| string $successMessageContainer, | ||
| string $successMessage | ||
| ): void { | ||
| try { | ||
| /** @var MagentoWebDriver $webDriver */ | ||
| $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver'); | ||
| /** @var FacebookWebDriver $webDriver */ | ||
| $webDriver = $magentoWebDriver->webDriver; | ||
| $rows = $webDriver->findElements(WebDriverBy::cssSelector($firstNotEmptyRow)); | ||
| while (!empty($rows)) { | ||
| $rows[0]->click(); | ||
| $magentoWebDriver->waitForPageLoad(30); | ||
| $magentoWebDriver->click($deleteButton); | ||
| $magentoWebDriver->waitForPageLoad(30); | ||
| $magentoWebDriver->waitForElementVisible($modalAcceptButton, 10); | ||
| $magentoWebDriver->waitForPageLoad(60); | ||
| $magentoWebDriver->click($modalAcceptButton); | ||
| $magentoWebDriver->waitForPageLoad(60); | ||
| $magentoWebDriver->waitForLoadingMaskToDisappear(); | ||
| $magentoWebDriver->waitForElementVisible($successMessageContainer, 10); | ||
| $magentoWebDriver->see($successMessage, $successMessageContainer); | ||
| $rows = $webDriver->findElements(WebDriverBy::cssSelector($firstNotEmptyRow)); | ||
| } | ||
| } catch (\Exception $e) { | ||
| $this->fail($e->getMessage()); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
app/code/Magento/LoginAsCustomer/Cron/DeleteExpiredAuthenticationData.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\LoginAsCustomer\Cron; | ||
|
|
||
| use Magento\LoginAsCustomerApi\Api\ConfigInterface; | ||
| use Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface; | ||
|
|
||
| /** | ||
| * Delete expired authentication data cron task | ||
| */ | ||
| class DeleteExpiredAuthenticationData | ||
| { | ||
| /** | ||
| * @var DeleteExpiredAuthenticationDataInterface | ||
| */ | ||
| private $deleteOldSecretsProcessor; | ||
|
|
||
| /** | ||
| * @var ConfigInterface | ||
| */ | ||
| private $config; | ||
|
|
||
| /** | ||
| * @param DeleteExpiredAuthenticationDataInterface $deleteOldSecretsProcessor | ||
| * @param ConfigInterface $config | ||
| */ | ||
| public function __construct( | ||
| DeleteExpiredAuthenticationDataInterface $deleteOldSecretsProcessor, | ||
| ConfigInterface $config | ||
| ) { | ||
| $this->deleteOldSecretsProcessor = $deleteOldSecretsProcessor; | ||
| $this->config = $config; | ||
| } | ||
|
|
||
| /** | ||
| * Delete expired authentication data | ||
| */ | ||
| public function execute(): void | ||
| { | ||
| if ($this->config->isEnabled()) { | ||
| $this->deleteOldSecretsProcessor->execute(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.