Skip to content

Commit b831d63

Browse files
dvoskoboinikovdvoskoboinikov
authored
merge magento/2.3-develop into magento-qwerty/MC-18685-and-MC-22139
2 parents 8060971 + d5104d5 commit b831d63

File tree

38 files changed

+894
-22
lines changed

38 files changed

+894
-22
lines changed

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

Lines changed: 4 additions & 0 deletions
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/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 17 additions & 0 deletions
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

Lines changed: 17 additions & 0 deletions
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

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+
<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

Lines changed: 13 additions & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 17 additions & 0 deletions
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>

0 commit comments

Comments
 (0)