Skip to content

Commit 6cb3da9

Browse files
magento-engcom-teammagento-engcom-team
authored
[EngCom] Public Pull Requests - 2.3-develop
 - merged latest code from mainline branch
2 parents fa607c2 + 20627b0 commit 6cb3da9

File tree

82 files changed

+2245
-29
lines changed

Some content is hidden

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

82 files changed

+2245
-29
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,18 @@
263263
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
264264
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
265265
</actionGroup>
266-
266+
<actionGroup name="OpenCategoryFromCategoryTree">
267+
<arguments>
268+
<argument name="category" type="string"/>
269+
</arguments>
270+
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
271+
<waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
272+
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
273+
<waitForPageLoad stepKey="waitForCategoryToLoad"/>
274+
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(category)}}" stepKey="selectCategory"/>
275+
<waitForPageLoad stepKey="waitForPageToLoad"/>
276+
<waitForElementVisible selector="{{AdminCategoryContentSection.categoryPageTitle}}" stepKey="waitForCategoryTitle"/>
277+
</actionGroup>
267278
<actionGroup name="AdminAssignProductToCategory">
268279
<arguments>
269280
<argument name="productId" type="string"/>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,4 +272,20 @@
272272
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
273273
<waitForPageLoad stepKey="waitForGridLoad"/>
274274
</actionGroup>
275+
<!--Filter and select the the product -->
276+
<actionGroup name="filterAndSelectProduct">
277+
<arguments>
278+
<argument name="productSku" type="string"/>
279+
</arguments>
280+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
281+
<waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
282+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
283+
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
284+
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{productSku}}" stepKey="fillProductSkuFilter"/>
285+
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
286+
<waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
287+
<click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku(productSku)}}"/>
288+
<waitForPageLoad stepKey="waitForProductToLoad"/>
289+
<waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForProductTitle"/>
290+
</actionGroup>
275291
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,4 +852,21 @@
852852
<data key="attributeGroupId">13</data>
853853
<data key="sortOrder">0</data>
854854
</entity>
855+
<entity name="simpleProductDefault" type="product">
856+
<data key="sku" unique="suffix">sku_simple_product_</data>
857+
<data key="type_id">simple</data>
858+
<data key="attribute_set_id">4</data>
859+
<data key="visibility">4</data>
860+
<data key="name" unique="suffix">Simple Product </data>
861+
<data key="price">560</data>
862+
<data key="urlKey" unique="suffix">simple-product-</data>
863+
<data key="status">1</data>
864+
<data key="quantity">25</data>
865+
<data key="weight">1</data>
866+
<data key="product_has_weight">1</data>
867+
<data key="is_in_stock">1</data>
868+
<data key="tax_class_id">2</data>
869+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
870+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
871+
</entity>
855872
</entities>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClearShippingAddressActionGroup.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.z
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="ClearShippingAddressActionGroup">
12+
<clearField selector="{{CheckoutShippingSection.firstName}}" stepKey="clearFieldFirstName"/>
13+
<clearField selector="{{CheckoutShippingSection.company}}" stepKey="clearFieldCompany"/>
14+
<clearField selector="{{CheckoutShippingSection.street}}" stepKey="clearFieldStreetAddress"/>
15+
<clearField selector="{{CheckoutShippingSection.city}}" stepKey="clearFieldCityName"/>
16+
<selectOption selector="{{CheckoutShippingSection.region}}" userInput="" stepKey="clearFieldRegion"/>
17+
<clearField selector="{{CheckoutShippingSection.postcode}}" stepKey="clearFieldZip"/>
18+
<selectOption selector="{{CheckoutShippingSection.country}}" userInput="" stepKey="clearFieldCounty"/>
19+
<clearField selector="{{CheckoutShippingSection.telephone}}" stepKey="clearFieldPhoneNumber"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingAddressOneStreetActionGroup.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="FillShippingAddressOneStreetActionGroup">
12+
<arguments>
13+
<argument name="address" type="entity"/>
14+
</arguments>
15+
<fillField stepKey="fillFirstName" selector="{{CheckoutShippingSection.firstName}}" userInput="{{address.firstname}}"/>
16+
<fillField stepKey="fillLastName" selector="{{CheckoutShippingSection.lastName}}" userInput="{{address.lastname}}"/>
17+
<fillField stepKey="fillCompany" selector="{{CheckoutShippingSection.company}}" userInput="{{address.company}}"/>
18+
<fillField stepKey="fillPhoneNumber" selector="{{CheckoutShippingSection.telephone}}" userInput="{{address.telephone}}"/>
19+
<fillField stepKey="fillStreetAddress" selector="{{CheckoutShippingSection.street}}" userInput="{{address.street[0]}}"/>
20+
<fillField stepKey="fillCityName" selector="{{CheckoutShippingSection.city}}" userInput="{{address.city}}"/>
21+
<selectOption stepKey="selectCounty" selector="{{CheckoutShippingSection.country}}" userInput="{{address.country_id}}"/>
22+
<fillField stepKey="fillZip" selector="{{CheckoutShippingSection.postcode}}" userInput="{{address.postcode}}"/>
23+
</actionGroup>
24+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddSimpleProductToCartActionGroup.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+
<!-- Add Product to Cart from the category page and check message -->
12+
<actionGroup name="StorefrontAddSimpleProductToCartActionGroup">
13+
<arguments>
14+
<argument name="product" type="entity"/>
15+
</arguments>
16+
<moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
17+
<click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="clickAddToCart" />
18+
<waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" stepKey="waitForSuccessMessage" />
19+
<see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="assertSuccessMessage"/>
20+
</actionGroup>
21+
</actionGroups>
22+

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<element name="country" type="select" selector="select[name=country_id]"/>
2828
<element name="telephone" type="input" selector="input[name=telephone]"/>
2929
<element name="saveAddress" type="button" selector=".action-save-address"/>
30+
<element name="cancelChangeAddress" type="button" selector=".action-hide-popup"/>
3031
<element name="updateAddress" type="button" selector=".action-update"/>
3132
<element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
3233
<element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
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="EditShippingAddressOnePageCheckoutTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Edit Shipping Address"/>
15+
<title value="Edit Shipping Address on Checkout Page."/>
16+
<description value="Edit Shipping Address on Checkout Page."/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-14680"/>
19+
<group value="shoppingCart"/>
20+
<group value="mtf_migrated"/>
21+
</annotations>
22+
<before>
23+
<createData entity="_defaultCategory" stepKey="createCategory"/>
24+
<createData entity="simpleProductDefault" stepKey="createProduct">
25+
<requiredEntity createDataKey="createCategory"/>
26+
</createData>
27+
<createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
28+
</before>
29+
<after>
30+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
31+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
32+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
33+
</after>
34+
35+
<!-- Go to Frontend as Customer -->
36+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
37+
<argument name="Customer" value="$$createCustomer$$" />
38+
</actionGroup>
39+
40+
<!-- Add product to cart -->
41+
<amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
42+
<actionGroup ref="StorefrontAddSimpleProductToCartActionGroup" stepKey="addProductToCart">
43+
<argument name="product" value="$$createProduct$$"/>
44+
</actionGroup>
45+
46+
<!-- Go to checkout page -->
47+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="customerGoToCheckoutFromMinicart" />
48+
49+
<!-- *New Address* button on 1st checkout step -->
50+
<click selector="{{CheckoutShippingSection.newAddressButton}}" stepKey="addNewAddress"/>
51+
52+
<!--Fill in required fields and click *Save address* button-->
53+
<actionGroup ref="FillShippingAddressOneStreetActionGroup" stepKey="changeAddress">
54+
<argument name="address" value="UK_Not_Default_Address"/>
55+
</actionGroup>
56+
<click selector="{{CheckoutShippingSection.saveAddress}}" stepKey="saveNewAddress"/>
57+
58+
<!--Select Shipping Rate-->
59+
<scrollTo selector="{{CheckoutShippingMethodsSection.next}}" stepKey="scrollToShippingRate"/>
60+
<click selector="{{CheckoutShippingMethodsSection.shippingMethodFlatRate}}" stepKey="selectShippingMethod"/>
61+
62+
<!-- Click *Edit* button for the new address -->
63+
<click selector="{{CheckoutShippingSection.editActiveAddress}}" stepKey="editNewAddress"/>
64+
65+
<!--Remove values from required fields and click *Cancel* button -->
66+
<actionGroup ref="ClearShippingAddressActionGroup" stepKey="clearRequiredFields"/>
67+
<click selector="{{CheckoutShippingSection.cancelChangeAddress}}" stepKey="cancelEditAddress"/>
68+
69+
<!-- Go to *Next* -->
70+
<scrollTo selector="{{CheckoutShippingMethodsSection.next}}" stepKey="scrollToButtonNext"/>
71+
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="goNext"/>
72+
73+
<!-- Select payment solution -->
74+
<checkOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution" />
75+
76+
<!--Refresh Page and Place Order-->
77+
<reloadPage stepKey="reloadPage"/>
78+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrder"/>
79+
</test>
80+
</tests>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSPageContentActionGroup.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,14 @@
2323
<executeJS function="(el = document.querySelector('[name=\'identifier\']')) &amp;&amp; el['se' + 'tAt' + 'tribute']('data-value', el.value.split('-')[0]);" stepKey="setAttribute" />
2424
<seeElement selector="{{CmsNewPagePageBasicFieldsSection.duplicatedURLKey(_duplicatedCMSPage.title)}}" stepKey="see"/>
2525
</actionGroup>
26+
<actionGroup name="AssertStoreFrontCMSPage">
27+
<arguments>
28+
<argument name="cmsTitle" type="string"/>
29+
<argument name="cmsContent" type="string"/>
30+
<argument name="cmsContentHeading" type="string"/>
31+
</arguments>
32+
<see selector="{{StorefrontCMSPageSection.title}}" userInput="{{cmsTitle}}" stepKey="seeTitle"/>
33+
<see selector="{{StorefrontCMSPageSection.mainTitle}}" userInput="{{cmsContentHeading}}" stepKey="seeContentHeading"/>
34+
<see selector="{{StorefrontCMSPageSection.mainContent}}" userInput="{{cmsContent}}" stepKey="seeContent"/>
35+
</actionGroup>
2636
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
<element name="mainTitle" type="text" selector="#maincontent .page-title"/>
1515
<element name="mainContent" type="text" selector="#maincontent"/>
1616
<element name="footerTop" type="text" selector="footer.page-footer"/>
17+
<element name="title" type="text" selector="//div[@class='breadcrumbs']//ul/li[@class='item cms_page']"/>
1718
</section>
1819
</sections>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontProductAttributeActionGroup.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
<!-- Check configurable product attribute options on the category page -->
12+
<actionGroup name="SelectStorefrontSideBarAttributeOption">
13+
<arguments>
14+
<argument name="categoryName" type="string"/>
15+
<argument name="attributeDefaultLabel" type="string"/>
16+
</arguments>
17+
<amOnPage url="{{categoryName}}" stepKey="openCategoryStoreFrontPage"/>
18+
<waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
19+
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="seeCategoryInFrontPage"/>
20+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}" stepKey="clickOnCategory"/>
21+
<waitForPageLoad stepKey="waitForCategoryPageToLoad1"/>
22+
<seeElement selector="{{StorefrontCategorySidebarSection.filterOptionsTitle(attributeDefaultLabel)}}" stepKey="seeAttributeOptionsTitle"/>
23+
<click selector="{{StorefrontCategorySidebarSection.filterOptionsTitle(attributeDefaultLabel)}}" stepKey="clickAttributeOptions"/>
24+
<waitForPageLoad stepKey="waitForPageToLoad"/>
25+
</actionGroup>
26+
</actionGroups>

0 commit comments

Comments
 (0)