Skip to content

Commit 389ec23

Browse files
mrtuvnmrtuvn
committed
Merge remote-tracking branch 'upstream/2.4-develop' into 2.4-develop
2 parents e45dd6e + 555a134 commit 389ec23

13 files changed

+369
-2
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSortBundleProductsByPriceTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@
109109
<deleteData createDataKey="createFirstProductForBundle" stepKey="deleteFirstProductForBundle"/>
110110
<deleteData createDataKey="createSecondProductForBundle" stepKey="deleteSecondProductForBundle"/>
111111
<deleteData createDataKey="createThirdBundleProduct" stepKey="deleteThirdBundleProduct"/>
112+
113+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
114+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
112115
</after>
113116

114117
<!-- Open created category on Storefront -->

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetUseInSearchValueForProductAttributeActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminSetUseInSearchValueForProductAttributeActionGroup">
11+
<annotations>
12+
<description>Set 'Use In Search' value for product attribute</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="useInSearchValue" type="string" defaultValue="Yes"/>
16+
</arguments>
17+
18+
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
19+
<click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
20+
<waitForElementVisible selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" stepKey="waitForUseInSearchElementVisible"/>
21+
<selectOption selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" userInput="{{useInSearchValue}}" stepKey="setUseInSearchValue"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductOnCategoryPageActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AssertProductOnCategoryPageActionGroup" extends="StorefrontCheckCategorySimpleProductActionGroup">
1212
<annotations>
13-
<description>EXTENDS:StorefrontCheckCategorySimpleProduct. Removes 'AssertProductPrice', 'moveMouseOverProduct', 'AssertAddToCart'</description>
13+
<description>DEPRECATED. Use AssertStorefrontProductIsPresentOnCategoryPageActionGroup.
14+
EXTENDS:StorefrontCheckCategorySimpleProduct. Removes 'AssertProductPrice', 'moveMouseOverProduct', 'AssertAddToCart'</description>
1415
</annotations>
1516
<remove keyForRemoval="AssertProductPrice"/>
1617
<remove keyForRemoval="moveMouseOverProduct"/>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductIsPresentOnCategoryPageActionGroup.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="AssertStorefrontProductIsPresentOnCategoryPageActionGroup">
12+
<annotations>
13+
<description>Validate that the provided Product is present and has correct name on a Category page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="productName" type="string" defaultValue="{{ApiSimpleOne.name}}"/>
17+
</arguments>
18+
19+
<waitForElementVisible selector="{{StorefrontCategoryProductSection.ProductTitleByName(productName)}}" stepKey="assertProductName"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Test/ProductAttributeWithoutValueInCompareListTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
<deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
4545
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
4646
<actionGroup ref="logout" stepKey="logout"/>
47+
48+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
49+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
4750
</after>
4851
<!--Open product page-->
4952
<amOnPage url="{{StorefrontProductPage.url($$createProductDefault.name$$)}}" stepKey="goToProductDefaultPage"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontFillFormAdvancedSearchWithCustomDropDownAttributeActionGroup.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="StorefrontFillFormAdvancedSearchWithCustomDropDownAttributeActionGroup" extends="StorefrontFillFormAdvancedSearchActionGroup">
12+
<annotations>
13+
<description>Fills in the advanced search form and select the attribute.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="attributeCode" type="string" defaultValue="{{productDropDownAttribute.attribute_code}}"/>
17+
<argument name="optionName" type="string" defaultValue="{{productAttributeOption1.label}}"/>
18+
</arguments>
19+
<selectOption userInput="{{optionName}}" selector="{{StorefrontCatalogSearchAdvancedFormSection.AttributeByCode(attributeCode)}}" before="clickSubmit" stepKey="selectOption"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCustomerAddressesOnPaymentStepInCheckoutActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontOpenCustomerAddressesOnPaymentStepInCheckoutActionGroup">
12+
<annotations>
13+
<description>Click 'Change Address' link on the Storefront Checkout page on the 'Payment' step.</description>
14+
</annotations>
15+
16+
<click selector="{{CheckoutBillingAddressSection.changeAddressButton}}" stepKey="clickChangeAddresslink"/>
17+
<waitForElementVisible selector="{{CheckoutShippingAddressSearchSection.popupSelectShippingAddress}}" stepKey="seePopup"/>
18+
<seeElement selector="{{CheckoutShippingAddressSearchSection.selectShippingAddressGrid}}" stepKey="seeAddressGrid"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontSearchAddressInSelectBillingAddressPopupOnPaymentStepOnCheckoutActionGroup.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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="StorefrontSearchAddressInSelectBillingAddressPopupOnPaymentStepOnCheckoutActionGroup">
12+
<annotations>
13+
<description>Search customer address in 'Select Billing Address' popup on the Storefront Checkout on the 'Payment' step.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="addressSearchTerm" type="string" defaultValue="10001"/>
17+
</arguments>
18+
19+
<fillField selector="{{CheckoutBillingAddressSearchSection.searchAddressField}}" userInput="{{addressSearchTerm}}" stepKey="fillAddressInSearchField"/>
20+
<click selector="{{CheckoutBillingAddressSearchSection.searchAddressButton}}" stepKey="clickSearchAddressButton"/>
21+
<see selector="{{CheckoutBillingAddressSearchSection.addressesFound}}" userInput="1 addresses" stepKey="assertOneAddressesWasFound"/>
22+
<see selector="{{CheckoutBillingAddressSearchSection.firstBillingAddressItem}}" userInput="{{addressSearchTerm}}" stepKey="verifyAddresses"/>
23+
</actionGroup>
24+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsBlockWithMarginalSpaceTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
<group value="WYSIWYGDisabled"/>
2020
</annotations>
2121
<before>
22-
<actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
22+
<actionGroup ref="LoginAsAdmin" stepKey="loginGetFromGeneralFile"/>
2323
</before>
24+
2425
<amOnPage url="{{CmsNewBlock.url}}" stepKey="amOnBlocksCreationForm"/>
2526
<waitForPageLoad stepKey="waitForPageLoad1"/>
2627
<!--Verify Save&Duplicate button and Save&Close button-->

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateApiConfigurableProductWithProductAttributeAdvanceSearchActionGroup.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="CreateApiConfigurableProductWithDescriptionActionGroup" extends="AdminCreateApiConfigurableProductActionGroup">
12+
<annotations>
13+
<description>Creates a Configurable Product with Description and 2 Product Options via API.</description>
14+
</annotations>
15+
16+
<!-- Replacement action. Create the configurable product via API. -->
17+
<createData entity="ApiConfigurableProductWithDescription" stepKey="createConfigProduct">
18+
<field key="name">{{productName}}</field>
19+
</createData>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,4 +354,18 @@
354354
<data key="website_id">0</data>
355355
<requiredEntity type="address">US_Address_AE</requiredEntity>
356356
</entity>
357+
<entity name="Simple_US_Customer_CA_NY_Addresses" type="customer">
358+
<data key="group_id">1</data>
359+
<data key="default_billing">true</data>
360+
<data key="default_shipping">true</data>
361+
<data key="email" unique="prefix">[email protected]</data>
362+
<data key="firstname">John</data>
363+
<data key="lastname">Doe</data>
364+
<data key="fullname">John Doe</data>
365+
<data key="password">pwdTest123!</data>
366+
<data key="store_id">0</data>
367+
<data key="website_id">0</data>
368+
<requiredEntity type="address">US_Address_CA</requiredEntity>
369+
<requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
370+
</entity>
357371
</entities>

0 commit comments

Comments
 (0)