Skip to content

Commit 4a87249

Browse files
sidolovsidolov
authored
Merge branch '2.4-develop' into 2.4-develop-prs
2 parents adde46b + 2e03629 commit 4a87249

File tree

62 files changed

+1081
-242
lines changed

Some content is hidden

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

62 files changed

+1081
-242
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminPageTitleActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertAdminPageTitleActionGroup">
12+
<annotations>
13+
<description>Check Admin Page Title is present and correct.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="value" type="string"/>
17+
</arguments>
18+
19+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="{{value}}" stepKey="seePageTitle"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/Page/AdminOrderViewPage.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
9+
<page name="AdminOrderViewPage" url="sales/order/view/order_id/{{entity_id}}" area="admin" module="Backend"/>
10+
</pages>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@
8787

8888
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
8989
<actionGroup ref="AdminClickInvoiceButtonOrderViewActionGroup" stepKey="clickInvoiceButton"/>
90-
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
90+
<actionGroup ref="AssertAdminPageTitleActionGroup" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton">
91+
<argument name="value" value="New Invoice"/>
92+
</actionGroup>
9193
<see selector="{{AdminInvoiceTotalSection.total('Subtotal')}}" userInput="$150.00" stepKey="seeCorrectGrandTotal"/>
9294
<actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
9395
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessInvoiceMessage"/>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3333
</after>
3434
<waitForPageLoad stepKey="waitForPageLoadOnDashboard"/>
35-
<see userInput="Dashboard" selector="{{AdminHeaderSection.pageTitle}}" stepKey="seeDashboardTitle"/>
35+
<actionGroup ref="AssertAdminPageTitleActionGroup" stepKey="seeDashboardTitle">
36+
<argument name="value" value="Dashboard"/>
37+
</actionGroup>
3638
<actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="loggedInSuccessfully"/>
3739
<actionGroup ref="AssertAdminPageIsNot404ActionGroup" stepKey="dontSee404Page"/>
3840
</test>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminStartupPageTest.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminStartupPageTest">
12+
<annotations>
13+
<features value="Backend"/>
14+
<stories value="Admin should see selected Startup Page after login."/>
15+
<title value="Admin should see selected Startup Page after login."/>
16+
<description value="Admin should see selected Startup Page after login."/>
17+
<severity value="MINOR"/>
18+
</annotations>
19+
<before>
20+
<magentoCLI command="config:set admin/startup/menu_item_id Magento_Sales::sales_order" stepKey="selectSalesOrderStartupPage"/>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
22+
</before>
23+
<after>
24+
<magentoCLI command="config:set admin/startup/menu_item_id Magento_Backend::dashboard" stepKey="selectDashboardStartupPage"/>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
26+
</after>
27+
28+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
29+
<argument name="tags" value="config full_page"/>
30+
</actionGroup>
31+
32+
<actionGroup ref="AssertAdminPageTitleActionGroup" stepKey="checkPageTitle">
33+
<argument name="value" value="Orders"/>
34+
</actionGroup>
35+
</test>
36+
</tests>

‎app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnSecondCheckoutStepActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertCaptchaVisibleOnSecondCheckoutStepActionGroup">
12+
13+
<waitForElementVisible selector="{{StorefrontCheckoutCaptchaSection.captchaField}}" stepKey="waitToSeeCaptchaField"/>
14+
<waitForElementVisible selector="{{StorefrontCheckoutCaptchaSection.captchaImg}}" stepKey="waitToSeeCaptchaImage"/>
15+
<waitForElementVisible selector="{{StorefrontCheckoutCaptchaSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButton"/>
16+
<reloadPage stepKey="refreshPage"/>
17+
<waitForPageLoad stepKey="waitForPageReloaded"/>
18+
<waitForElementVisible selector="{{StorefrontCheckoutCaptchaSection.captchaField}}" stepKey="waitToSeeCaptchaFieldAfterPageReload"/>
19+
<waitForElementVisible selector="{{StorefrontCheckoutCaptchaSection.captchaImg}}" stepKey="waitToSeeCaptchaImageAfterPageReload"/>
20+
<waitForElementVisible selector="{{StorefrontCheckoutCaptchaSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButtonAfterPageReload"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Captcha/Test/Mftf/ActionGroup/AssertCaptchaVisibleOnSignInModalOnCheckoutActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertCaptchaVisibleOnSignInModalOnCheckoutActionGroup">
12+
13+
<waitForElementVisible selector="{{StorefrontCheckoutSignInModalSection.captchaField}}" stepKey="waitToSeeCaptchaField"/>
14+
<waitForElementVisible selector="{{StorefrontCheckoutSignInModalSection.captchaImg}}" stepKey="waitToSeeCaptchaImage"/>
15+
<waitForElementVisible selector="{{StorefrontCheckoutSignInModalSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButton"/>
16+
<reloadPage stepKey="refreshPage"/>
17+
<waitForPageLoad stepKey="waitForPageReloaded"/>
18+
<click selector="{{StorefrontCustomerSignInLinkSection.signInLink}}" stepKey="clickOnSignInLink"/>
19+
<waitForElementVisible selector="{{StorefrontCheckoutSignInModalSection.captchaField}}" stepKey="waitToSeeCaptchaFieldAfterPageReload"/>
20+
<waitForElementVisible selector="{{StorefrontCheckoutSignInModalSection.captchaImg}}" stepKey="waitToSeeCaptchaImageAfterPageReload"/>
21+
<waitForElementVisible selector="{{StorefrontCheckoutSignInModalSection.captchaReload}}" stepKey="waitToSeeCaptchaReloadButtonAfterPageReload"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontCheckoutFillCaptchaFieldOnSignInPopupActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontCheckoutFillCaptchaFieldOnSignInPopupActionGroup" extends="StorefrontCheckoutFillCustomerCredentialsOnSignInPopupActionGroup">
12+
<annotations>
13+
<description>EXTENDS: LoginAsCustomerUsingSignInLinkActionGroup. Fills in the Captcha field on the Sign In modal on checkout page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="captcha" type="string"/>
17+
</arguments>
18+
19+
<fillField selector="{{StorefrontCheckoutSignInModalSection.captchaField}}" userInput="{{captcha}}" stepKey="fillCaptchaField" after="fillPassword"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Captcha/Test/Mftf/ActionGroup/StorefrontFillCaptchaFieldOnCheckoutActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontFillCaptchaFieldOnCheckoutActionGroup">
12+
<arguments>
13+
<argument name="captcha" type="string"/>
14+
</arguments>
15+
16+
<fillField selector="{{StorefrontCheckoutCaptchaSection.captchaField}}" userInput="{{captcha}}" stepKey="fillCaptchaField"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Captcha/Test/Mftf/Data/CaptchaConfigData.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
<data key="label">Contact Us</data>
3434
<data key="value">contact_us</data>
3535
</entity>
36+
<entity name="StorefrontCaptchaOnCheckoutConfigData">
37+
<data key="path">customer/captcha/forms</data>
38+
<data key="scope_id">0</data>
39+
<data key="label">Checkout/Placing Order</data>
40+
<data key="value">payment_processing_request</data>
41+
</entity>
3642
<entity name="StorefrontCaptchaOnCustomerLoginConfigData">
3743
<!-- Magento default value -->
3844
<data key="path">customer/captcha/forms</data>
@@ -157,6 +163,12 @@
157163
<data key="label">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
158164
<data key="value">ABCDEFGHJKMnpqrstuvwxyz23456789</data>
159165
</entity>
166+
<entity name="StorefrontCaptchaOnCheckoutConfigData">
167+
<data key="path">customer/captcha/forms</data>
168+
<data key="scope_id">0</data>
169+
<data key="label">Checkout/Placing Order</data>
170+
<data key="value">payment_processing_request</data>
171+
</entity>
160172
<entity name="StorefrontCaptchaOnApplyingCouponCodeFormsConfigData">
161173
<data key="path">customer/captcha/forms</data>
162174
<data key="scope_id">0</data>

0 commit comments

Comments
 (0)