Skip to content

Commit 5db061e

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'origin/2.4-develop' into B2B-582
 Conflicts: composer.lock
2 parents d944b33 + b67a684 commit 5db061e

File tree

114 files changed

+3921
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3921
-100
lines changed

‎app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminCatalogPriceRuleDeleteAllActionGroup">
11+
<annotations>
12+
<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>
13+
</annotations>
14+
15+
<amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage"/>
16+
<!-- It sometimes is loading too long for default 10s -->
17+
<waitForPageLoad time="60" stepKey="waitForPageFullyLoaded"/>
18+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
19+
<helper class="\Magento\CatalogRule\Test\Mftf\Helper\CatalogPriceRuleHelper" method="deleteAllCatalogPriceRules" stepKey="deleteAllCatalogPriceRulesOneByOne">
20+
<argument name="firstNotEmptyRow">{{AdminDataGridTableSection.firstNotEmptyRow}}</argument>
21+
<argument name="modalAcceptButton">{{AdminConfirmationModalSection.ok}}</argument>
22+
<argument name="deleteButton">{{AdminMainActionsSection.delete}}</argument>
23+
<argument name="successMessageContainer">{{AdminMessagesSection.success}}</argument>
24+
<argument name="successMessage">You deleted the rule.</argument>
25+
</helper>
26+
<waitForElementVisible selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="waitDataGridEmptyMessageAppears"/>
27+
<see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
28+
</actionGroup>
29+
</actionGroups>

‎app/code/Magento/CatalogRule/Test/Mftf/Helper/CatalogPriceRuleHelper.php‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\CatalogRule\Test\Mftf\Helper;
9+
10+
use Facebook\WebDriver\Remote\RemoteWebDriver as FacebookWebDriver;
11+
use Facebook\WebDriver\WebDriverBy;
12+
use Magento\FunctionalTestingFramework\Helper\Helper;
13+
use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
14+
15+
/**
16+
* Class for MFTF helpers for CatalogRule module.
17+
*/
18+
class CatalogPriceRuleHelper extends Helper
19+
{
20+
/**
21+
* Delete all Catalog Price Rules obe by one.
22+
*
23+
* @param string $emptyRow
24+
* @param string $modalAceptButton
25+
* @param string $deleteButton
26+
* @param string $successMessageContainer
27+
* @param string $successMessage
28+
*
29+
* @return void
30+
*/
31+
public function deleteAllCatalogPriceRules(
32+
string $firstNotEmptyRow,
33+
string $modalAcceptButton,
34+
string $deleteButton,
35+
string $successMessageContainer,
36+
string $successMessage
37+
): void {
38+
try {
39+
/** @var MagentoWebDriver $webDriver */
40+
$magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
41+
/** @var FacebookWebDriver $webDriver */
42+
$webDriver = $magentoWebDriver->webDriver;
43+
$rows = $webDriver->findElements(WebDriverBy::cssSelector($firstNotEmptyRow));
44+
while (!empty($rows)) {
45+
$rows[0]->click();
46+
$magentoWebDriver->waitForPageLoad(30);
47+
$magentoWebDriver->click($deleteButton);
48+
$magentoWebDriver->waitForPageLoad(30);
49+
$magentoWebDriver->waitForElementVisible($modalAcceptButton, 10);
50+
$magentoWebDriver->waitForPageLoad(60);
51+
$magentoWebDriver->click($modalAcceptButton);
52+
$magentoWebDriver->waitForPageLoad(60);
53+
$magentoWebDriver->waitForLoadingMaskToDisappear();
54+
$magentoWebDriver->waitForElementVisible($successMessageContainer, 10);
55+
$magentoWebDriver->see($successMessage, $successMessageContainer);
56+
$rows = $webDriver->findElements(WebDriverBy::cssSelector($firstNotEmptyRow));
57+
}
58+
} catch (\Exception $e) {
59+
$this->fail($e->getMessage());
60+
}
61+
}
62+
}

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontApplyPromoCodeDuringCheckoutTest.xml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,23 @@
2929
<createData entity="SimpleSalesRuleCoupon" stepKey="createCouponForCartPriceRule">
3030
<requiredEntity createDataKey="createCartPriceRule"/>
3131
</createData>
32+
33+
<!-- Login as admin -->
34+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3235
</before>
3336
<after>
3437
<!-- Delete simple product -->
3538
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
36-
3739
<!-- Delete sales rule -->
3840
<deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
39-
41+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
4042
<!-- Admin log out -->
4143
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4244
</after>
4345

4446
<!-- Go to Storefront as Guest and add simple product to cart -->
4547
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
46-
<argument name="product" value="$$createProduct$$"/>
48+
<argument name="product" value="$createProduct$"/>
4749
</actionGroup>
4850

4951
<!-- Go to Checkout -->
@@ -56,16 +58,18 @@
5658

5759
<!-- Click Apply Discount Code: section is expanded. Input promo code, apply and see success message -->
5860
<actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyCoupon">
59-
<argument name="discountCode" value="$$createCouponForCartPriceRule.code$$"/>
61+
<argument name="discountCode" value="$createCouponForCartPriceRule.code$"/>
6062
</actionGroup>
6163

6264
<!-- Apply button is disappeared -->
6365
<dontSeeElement selector="{{DiscountSection.ApplyCodeBtn}}" stepKey="dontSeeApplyButton"/>
6466

6567
<!-- Cancel coupon button is appeared -->
68+
<waitForElementVisible selector="{{DiscountSection.CancelCouponBtn}}" stepKey="waitCancelButtonAppears"/>
6669
<seeElement selector="{{DiscountSection.CancelCouponBtn}}" stepKey="seeCancelCouponButton"/>
6770

6871
<!-- Order summary contains information about applied code -->
72+
<waitForElementVisible selector="{{CheckoutPaymentSection.discount}}" stepKey="waitForDiscountCouponInSummaryBlock"/>
6973
<seeElement selector="{{CheckoutPaymentSection.discount}}" stepKey="seeDiscountCouponInSummaryBlock"/>
7074
<see selector="{{CheckoutPaymentSection.discountPrice}}" userInput="-$5.00" stepKey="seeDiscountPrice"/>
7175

@@ -76,16 +80,13 @@
7680
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
7781
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
7882

79-
<!-- Login as admin -->
80-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
81-
8283
<!-- Verify total on order page -->
8384
<actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderById">
84-
<argument name="orderId" value="$grabOrderNumber"/>
85+
<argument name="orderId" value="{$grabOrderNumber}"/>
8586
</actionGroup>
8687

8788
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
8889
<scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>
89-
<see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$$createProduct.price$$" stepKey="checkTotal"/>
90+
<see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$createProduct.price$" stepKey="checkTotal"/>
9091
</test>
9192
</tests>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<fillField stepKey="fillEmail" userInput="{{Customer.email}}" selector="{{StorefrontCustomerCreateFormSection.emailField}}"/>
2525
<fillField stepKey="fillPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerCreateFormSection.passwordField}}"/>
2626
<fillField stepKey="fillConfirmPassword" userInput="{{Customer.password}}" selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}"/>
27+
<waitForPageLoad stepKey="waitForCreateAccountButtonIsActive"/>
2728
<click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
2829
<see stepKey="seeThankYouMessage" userInput="Thank you for registering with Main Website Store."/>
2930
<see stepKey="seeFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}"/>

‎app/code/Magento/LoginAsCustomer/Cron/DeleteExpiredAuthenticationData.php‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\LoginAsCustomer\Cron;
9+
10+
use Magento\LoginAsCustomerApi\Api\ConfigInterface;
11+
use Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface;
12+
13+
/**
14+
* Delete expired authentication data cron task
15+
*/
16+
class DeleteExpiredAuthenticationData
17+
{
18+
/**
19+
* @var DeleteExpiredAuthenticationDataInterface
20+
*/
21+
private $deleteOldSecretsProcessor;
22+
23+
/**
24+
* @var ConfigInterface
25+
*/
26+
private $config;
27+
28+
/**
29+
* @param DeleteExpiredAuthenticationDataInterface $deleteOldSecretsProcessor
30+
* @param ConfigInterface $config
31+
*/
32+
public function __construct(
33+
DeleteExpiredAuthenticationDataInterface $deleteOldSecretsProcessor,
34+
ConfigInterface $config
35+
) {
36+
$this->deleteOldSecretsProcessor = $deleteOldSecretsProcessor;
37+
$this->config = $config;
38+
}
39+
40+
/**
41+
* Delete expired authentication data
42+
*/
43+
public function execute(): void
44+
{
45+
if ($this->config->isEnabled()) {
46+
$this->deleteOldSecretsProcessor->execute();
47+
}
48+
}
49+
}

0 commit comments

Comments
 (0)