Skip to content

Commit 5459ada

Browse files
magento-engcom-teammagento-engcom-team
authored
[Magento Community Engineering] Community Contributions - 2.3-develop
 - merged latest code from mainline branch
2 parents 7301b48 + d5104d5 commit 5459ada

File tree

79 files changed

+1402
-125
lines changed

Some content is hidden

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

79 files changed

+1402
-125
lines changed

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

+4
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@
7676
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
7777
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7878

79+
<!-- Perform reindex and flush cache -->
80+
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
81+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
82+
7983
<!--Go to category page-->
8084
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
8185
<waitForPageLoad stepKey="waitForHomePageToload"/>

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

+1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<element name="FolderName" type="button" selector="input[data-role='promptField']" />
159159
<element name="AcceptFolderName" type="button" selector=".action-primary.action-accept" timeout="30"/>
160160
<element name="StorageRootArrow" type="button" selector="#root > .jstree-icon" />
161+
<element name="FolderContainer" type="button" selector="div[data-role='tree']" />
161162
<element name="checkIfArrowExpand" type="button" selector="//li[@id='root' and contains(@class,'jstree-closed')]" />
162163
<element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- > .jstree-icon" />
163164
<element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]" />

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,12 @@
7070
<scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="scrollToTinyMCE4" />
7171
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon2" />
7272
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse2" />
73+
<waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
7374
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CancelBtn}}" stepKey="waitForCancelButton2"/>
7475
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CancelBtn}}" userInput="Cancel" stepKey="seeCancelBtn2" />
75-
<waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
76+
<waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.CreateFolder}}" stepKey="waitForCreateFolderBtn2"/>
7677
<see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.CreateFolder}}" userInput="Create Folder" stepKey="seeCreateFolderBtn2" />
77-
<waitForLoadingMaskToDisappear stepKey="waitForLoading14"/>
78+
<see selector="{{ProductDescriptionWYSIWYGToolbarSection.FolderContainer}}" userInput="Storage Root" stepKey="seeFolderContainer" />
7879
<click userInput="Storage Root" stepKey="clickOnRootFolder" />
7980
<waitForLoadingMaskToDisappear stepKey="waitForLoading15"/>
8081
<dontSeeElement selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertFile}}" stepKey="dontSeeAddSelectedBtn3" />

‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<argument name="productName" type="string"/>
6767
</arguments>
6868

69-
<moveMouseOver stepKey="hoverOverProduct" selector="{{StorefrontQuickSearchResultsSection.productByIndex('1')}}"/>
69+
<moveMouseOver stepKey="hoverOverProduct" selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}}"/>
7070
<click selector="{{StorefrontQuickSearchResultsSection.productByName(productName)}} {{StorefrontQuickSearchResultsSection.addToCartBtn}}" stepKey="addToCart"/>
7171
<waitForElementVisible selector="{{StorefrontQuickSearchResultsSection.messageSection}}" time="30" stepKey="waitForProductAdded"/>
7272
<see selector="{{StorefrontQuickSearchResultsSection.messageSection}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddedToCartMessage"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,8 @@
439439
<magentoCLI command="cache:flush" stepKey="flushCache"/>
440440
</before>
441441
<after>
442-
<deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
442+
<deleteData stepKey="deleteGroupedProduct" createDataKey="createProduct"/>
443+
<deleteData stepKey="deleteSimpleProduct" createDataKey="simple1"/>
443444
</after>
444445
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
445446
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">

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

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AssertPagerTextIsNotVisibleActionGroup">
11+
<arguments>
12+
<argument name="text" type="string"/>
13+
</arguments>
14+
<waitForPageLoad stepKey="waitForCheckoutPageLoad"/>
15+
<dontSee userInput="{{text}}" selector="{{StorefrontCartToolbarSection.toolbarNumber}}" stepKey="VerifyMissingPagerText"/>
16+
</actionGroup>
17+
</actionGroups>

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

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AssertToolbarTextIsVisibleInCartActionGroup">
11+
<arguments>
12+
<argument name="text" type="string"/>
13+
</arguments>
14+
<waitForPageLoad stepKey="waitForPageLoad"/>
15+
<see userInput="{{text}}" selector="{{StorefrontCartToolbarSection.toolbarNumber}}" stepKey="VerifyPageText"/>
16+
</actionGroup>
17+
</actionGroups>

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

+14
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="StorefrontOpenCartPageActionGroup">
11+
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="openCartPage" />
12+
<waitForPageLoad stepKey="waitForPageLoaded" />
13+
</actionGroup>
14+
</actionGroups>

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

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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="StorefrontRemoveCartItemActionGroup">
11+
<click selector="{{CheckoutCartProductSection.RemoveItem}}" stepKey="deleteProductFromCart"/>
12+
</actionGroup>
13+
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Page/CheckoutCartPage.xml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="CheckoutCartPage" url="/checkout/cart" module="Magento_Checkout" area="storefront">
12+
<section name="StorefrontCartToolbarSection"/>
1213
<section name="CheckoutCartProductSection"/>
1314
<section name="CheckoutCartSummarySection"/>
1415
<section name="CheckoutCartCrossSellSection"/>

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

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<element name="orderNumber" type="text" selector="div.checkout-success > p:nth-child(1) > span"/>
1515
<element name="orderNumber22" type="text" selector=".order-number>strong"/>
1616
<element name="orderLink" type="text" selector="a[href*=order_id].order-number" timeout="30"/>
17+
<element name="orderLinks" type="text" selector="a[href*=order_id]" timeout="30"/>
1718
<element name="orderNumberText" type="text" selector=".checkout-success > p:nth-child(1)"/>
1819
<element name="continueShoppingButton" type="button" selector=".action.primary.continue" timeout="30"/>
1920
<element name="createAnAccount" type="button" selector="[data-bind*=&quot;i18n: 'Create an Account'&quot;]" timeout="30"/>

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

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="StorefrontCartToolbarSection">
12+
<element name="toolbarNumber" type="text" selector="div.toolbar > .pager > .toolbar-amount > .toolbar-number" />
13+
<element name="toolbarPager" type="text" selector="div.toolbar > .pager > .pages" />
14+
<element name="toolbarNextPage" type="text" selector="div.toolbar > .pager > .pages > .pages-item-next" />
15+
<element name="toolbarPreviousPage" type="text" selector="div.toolbar > .pager > .pages > .pages-item-previous" />
16+
</section>
17+
</sections>

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

+143
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
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="StorefrontCheckPagerShoppingCartWithMoreThan20ProductsTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Check if the cart pager is visible with more than 20 cart items and the pager disappears if an item is removed from cart"/>
15+
<title value="Test if the cart pager is visible with more than 20 cart items and the pager disappears if an item is removed from cart."/>
16+
<description value="Test if the cart pager is visible with more than 20 cart items and the pager disappears if an item is removed from cart."/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-14700"/>
19+
<group value="shoppingCart"/>
20+
<group value="mtf_migrated"/>
21+
</annotations>
22+
<before>
23+
<!--Set the default number of items on cart which is 20-->
24+
<magentoCLI stepKey="allowSpecificValue" command="config:set checkout/cart/number_items_to_display_pager 20" />
25+
26+
<createData entity="SimpleTwo" stepKey="simpleProduct1"/>
27+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem1">
28+
<argument name="product" value="$$simpleProduct1$$"/>
29+
</actionGroup>
30+
<createData entity="SimpleTwo" stepKey="simpleProduct2"/>
31+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem2">
32+
<argument name="product" value="$simpleProduct2$$"/>
33+
</actionGroup>
34+
<createData entity="SimpleTwo" stepKey="simpleProduct3"/>
35+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem3">
36+
<argument name="product" value="$simpleProduct3$$"/>
37+
</actionGroup>
38+
<createData entity="SimpleTwo" stepKey="simpleProduct4"/>
39+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem4">
40+
<argument name="product" value="$simpleProduct4$$"/>
41+
</actionGroup>
42+
<createData entity="SimpleTwo" stepKey="simpleProduct5"/>
43+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem5">
44+
<argument name="product" value="$simpleProduct5$$"/>
45+
</actionGroup>
46+
<createData entity="SimpleTwo" stepKey="simpleProduct6"/>
47+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem6">
48+
<argument name="product" value="$simpleProduct6$$"/>
49+
</actionGroup>
50+
<createData entity="SimpleTwo" stepKey="simpleProduct7"/>
51+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem7">
52+
<argument name="product" value="$simpleProduct7$$"/>
53+
</actionGroup>
54+
<createData entity="SimpleTwo" stepKey="simpleProduct8"/>
55+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem8">
56+
<argument name="product" value="$simpleProduct8$$"/>
57+
</actionGroup>
58+
<createData entity="SimpleTwo" stepKey="simpleProduct9"/>
59+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem9">
60+
<argument name="product" value="$simpleProduct9$$"/>
61+
</actionGroup>
62+
<createData entity="SimpleTwo" stepKey="simpleProduct10"/>
63+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem10">
64+
<argument name="product" value="$$simpleProduct10$$"/>
65+
</actionGroup>
66+
<createData entity="SimpleTwo" stepKey="simpleProduct11"/>
67+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem11">
68+
<argument name="product" value="$$simpleProduct11$$"/>
69+
</actionGroup>
70+
<createData entity="SimpleTwo" stepKey="simpleProduct12"/>
71+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem12">
72+
<argument name="product" value="$$simpleProduct12$$"/>
73+
</actionGroup>
74+
<createData entity="SimpleTwo" stepKey="simpleProduct13"/>
75+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem13">
76+
<argument name="product" value="$$simpleProduct13$$"/>
77+
</actionGroup>
78+
<createData entity="SimpleTwo" stepKey="simpleProduct14"/>
79+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem14">
80+
<argument name="product" value="$$simpleProduct14$$"/>
81+
</actionGroup>
82+
<createData entity="SimpleTwo" stepKey="simpleProduct15"/>
83+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem15">
84+
<argument name="product" value="$$simpleProduct15$$"/>
85+
</actionGroup>
86+
<createData entity="SimpleTwo" stepKey="simpleProduct16"/>
87+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem16">
88+
<argument name="product" value="$$simpleProduct16$$"/>
89+
</actionGroup>
90+
<createData entity="SimpleTwo" stepKey="simpleProduct17"/>
91+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem17">
92+
<argument name="product" value="$$simpleProduct17$$"/>
93+
</actionGroup>
94+
<createData entity="SimpleTwo" stepKey="simpleProduct18"/>
95+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem18">
96+
<argument name="product" value="$$simpleProduct18$$"/>
97+
</actionGroup>
98+
<createData entity="SimpleTwo" stepKey="simpleProduct19"/>
99+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem19">
100+
<argument name="product" value="$$simpleProduct19$$"/>
101+
</actionGroup>
102+
<createData entity="SimpleTwo" stepKey="simpleProduct20"/>
103+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem20">
104+
<argument name="product" value="$$simpleProduct20$$"/>
105+
</actionGroup>
106+
<createData entity="SimpleTwo" stepKey="simpleProduct21"/>
107+
<actionGroup ref="AddSimpleProductToCart" stepKey="CartItem21">
108+
<argument name="product" value="$$simpleProduct21$$"/>
109+
</actionGroup>
110+
</before>
111+
<after>
112+
<deleteData createDataKey="simpleProduct1" stepKey="deleteCartItem1"/>
113+
<deleteData createDataKey="simpleProduct2" stepKey="deleteCartItem2"/>
114+
<deleteData createDataKey="simpleProduct3" stepKey="deleteCartItem3"/>
115+
<deleteData createDataKey="simpleProduct4" stepKey="deleteCartItem4"/>
116+
<deleteData createDataKey="simpleProduct5" stepKey="deleteCartItem5"/>
117+
<deleteData createDataKey="simpleProduct6" stepKey="deleteCartItem6"/>
118+
<deleteData createDataKey="simpleProduct7" stepKey="deleteCartItem7"/>
119+
<deleteData createDataKey="simpleProduct8" stepKey="deleteCartItem8"/>
120+
<deleteData createDataKey="simpleProduct9" stepKey="deleteCartItem9"/>
121+
<deleteData createDataKey="simpleProduct10" stepKey="deleteCartItem10"/>
122+
<deleteData createDataKey="simpleProduct11" stepKey="deleteCartItem11"/>
123+
<deleteData createDataKey="simpleProduct12" stepKey="deleteCartItem12"/>
124+
<deleteData createDataKey="simpleProduct13" stepKey="deleteCartItem13"/>
125+
<deleteData createDataKey="simpleProduct14" stepKey="deleteCartItem14"/>
126+
<deleteData createDataKey="simpleProduct15" stepKey="deleteCartItem15"/>
127+
<deleteData createDataKey="simpleProduct16" stepKey="deleteCartItem16"/>
128+
<deleteData createDataKey="simpleProduct17" stepKey="deleteCartItem17"/>
129+
<deleteData createDataKey="simpleProduct18" stepKey="deleteCartItem18"/>
130+
<deleteData createDataKey="simpleProduct19" stepKey="deleteCartItem19"/>
131+
<deleteData createDataKey="simpleProduct20" stepKey="deleteCartItem20"/>
132+
<deleteData createDataKey="simpleProduct21" stepKey="deleteCartItem21"/>
133+
</after>
134+
<actionGroup ref="StorefrontOpenCartPageActionGroup" stepKey="goToCartPage" />
135+
<actionGroup ref="AssertToolbarTextIsVisibleInCartActionGroup" stepKey="VerifyPagerText">
136+
<argument name="text" value="Items 1 to 20 of 21 total"/>
137+
</actionGroup>
138+
<actionGroup ref="StorefrontRemoveCartItemActionGroup" stepKey="removeCartItem" />
139+
<actionGroup ref="AssertPagerTextIsNotVisibleActionGroup" stepKey="VerifyMissingPagerText2" >
140+
<argument name="text" value="Items 1 to 20"/>
141+
</actionGroup>
142+
</test>
143+
</tests>

0 commit comments

Comments
 (0)