Skip to content

Commit dccbfe7

Browse files
magento-mts-svcmagento-mts-svc
authored
merge magento/2.4-develop into magento-mpi/MC-34091
2 parents 51827b3 + 7fbae46 commit dccbfe7

File tree

39 files changed

+553
-221
lines changed

39 files changed

+553
-221
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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="AdminNavigateToEmailToFriendSettingsActionGroup">
12+
<amOnPage url="{{AdminConfigurationEmailToFriendPage.url}}" stepKey="navigateToPersistencePage"/>
13+
<conditionalClick selector="{{AdminEmailToFriendSection.DefaultLayoutsTab}}" dependentSelector="{{AdminEmailToFriendSection.CheckIfTabExpand}}" visible="true" stepKey="clickTab"/>
14+
</actionGroup>
15+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminEmailToFriendOptionsAvailableActionGroup.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="AssertAdminEmailToFriendOptionsAvailableActionGroup">
12+
<seeElement stepKey="seeEmailTemplateInput" selector="{{AdminEmailToFriendSection.emailTemplate}}"/>
13+
<seeElement stepKey="seeAllowForGuestsInput" selector="{{AdminEmailToFriendSection.allowForGuests}}"/>
14+
<seeElement stepKey="seeMaxRecipientsInput" selector="{{AdminEmailToFriendSection.maxRecipients}}"/>
15+
<seeElement stepKey="seeMaxPerHourInput" selector="{{AdminEmailToFriendSection.maxPerHour}}"/>
16+
<seeElement stepKey="seeLimitSendingBy" selector="{{AdminEmailToFriendSection.limitSendingBy}}"/>
17+
</actionGroup>
18+
</actionGroups>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<page name="AdminConfigurationEmailToFriendPage" url="admin/system_config/edit/section/sendfriend/" module="Catalog" area="admin">
12+
<section name="AdminEmailToFriendSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.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="AdminCatalogEmailToFriendSettingsTest">
12+
<annotations>
13+
<features value="Backend"/>
14+
<stories value="Enable Email To A Friend Functionality"/>
15+
<title value="Admin should be able to manage settings of Email To A Friend Functionality"/>
16+
<description value="Admin should be able to enable Email To A Friend functionality in Magento Admin backend and see additional options"/>
17+
<group value="backend"/>
18+
<severity value="MINOR"></severity>
19+
<testCaseId value="MC-35895"/>
20+
</annotations>
21+
22+
<before>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
<magentoCLI stepKey="enableSendFriend" command="config:set sendfriend/email/enabled 1"/>
25+
<magentoCLI stepKey="cacheClean" command="cache:clean config"/>
26+
</before>
27+
<after>
28+
<magentoCLI stepKey="disableSendFriend" command="config:set sendfriend/email/enabled 0"/>
29+
<magentoCLI stepKey="cacheClean" command="cache:clean config"/>
30+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
31+
</after>
32+
33+
<actionGroup ref="AdminNavigateToEmailToFriendSettingsActionGroup" stepKey="navigateToSendFriendSettings"/>
34+
<actionGroup ref="AssertAdminEmailToFriendOptionsAvailableActionGroup" stepKey="assertOptions"/>
35+
</test>
36+
</tests>

‎app/code/Magento/Captcha/CustomerData/Captcha.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function __construct(
5858
/**
5959
* @inheritdoc
6060
*/
61-
public function getSectionData() :array
61+
public function getSectionData(): array
6262
{
6363
$data = [];
6464

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@
3838
<element name="storeViewDropdown" type="text" selector="//select[@name='store_id']/option[contains(.,'{{storeView}}')]" parameterized="true"/>
3939
<element name="inputByCodeRangeFrom" type="input" selector="input.admin__control-text[name='{{code}}[from]']" parameterized="true"/>
4040
<element name="inputByCodeRangeTo" type="input" selector="input.admin__control-text[name='{{code}}[to]']" parameterized="true"/>
41+
<element name="storeViewOptions" type="text" selector=".admin__data-grid-outer-wrap select[name='store_id'] > option[value='{{value}}']" parameterized="true"/>
4142
</section>
4243
</sections>

‎app/code/Magento/Config/Test/Mftf/Section/AdminEmailToFriendSection.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminEmailToFriendSection">
12+
<element name="DefaultLayoutsTab" type="button" selector=".entry-edit-head-link"/>
13+
<element name="CheckIfTabExpand" type="button" selector=".entry-edit-head-link:not(.open)"/>
14+
<element name="emailTemplate" type="input" selector="#sendfriend_email_template"/>
15+
<element name="allowForGuests" type="input" selector="#sendfriend_email_allow_guest"/>
16+
<element name="maxRecipients" type="input" selector="#sendfriend_email_max_recipients"/>
17+
<element name="maxPerHour" type="input" selector="#sendfriend_email_max_per_hour"/>
18+
<element name="limitSendingBy" type="input" selector="#sendfriend_email_check_by"/>
19+
</section>
20+
</sections>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminClickFirstRowEditLinkOnCustomerGridActionGroup">
12+
<annotations>
13+
<description>Click edit link for first row on the grid.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditLink"/>
17+
<waitForPageLoad stepKey="waitForPageLoading"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
<see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
5151

5252
<!--Assert Customer Form -->
53-
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
54-
<waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
53+
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton1"/>
5554
<click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
5655
<waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
5756
<see selector="{{AdminCustomerAccountInformationSection.groupIdValue}}" userInput="Retailer" stepKey="seeCustomerGroup1"/>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
3232
<argument name="email" value="$$createCustomer.email$$"/>
3333
</actionGroup>
34-
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton"/>
35-
<waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
34+
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton"/>
3635

3736
<!-- Add the Address -->
3837
<click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
@@ -67,8 +66,7 @@
6766
<see userInput="{{PolandAddress.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
6867

6968
<!--Assert Customer Form -->
70-
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
71-
<waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
69+
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton1"/>
7270
<click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
7371
<waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
7472
<seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="$$createCustomer.firstname$$" stepKey="seeCustomerFirstName"/>

0 commit comments

Comments
 (0)