Skip to content

Commit 21c719e

Browse files
okolesnykokolesnyk
authored
Merge pull request #3527 from magento-pangolin/mtf-eol-pr
[pangolins] Deliver weekly MTF to MFTF conversion
2 parents c307d25 + c51f148 commit 21c719e

File tree

48 files changed

+1701
-43
lines changed

Some content is hidden

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

48 files changed

+1701
-43
lines changed

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@
1111
<actionGroup name="AdminOrderBraintreeFillActionGroup">
1212
<!--Select Braintree Payment method on Admin Order Create Page-->
1313
<click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
14-
<waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
14+
<waitForPageLoad stepKey="waitForBraintreeConfigs"/>
1515
<click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
16-
<waitForPageLoad stepKey="waitForCardTypes" time="3"/>
16+
<waitForPageLoad stepKey="waitForCardTypes"/>
1717
<click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
18-
<waitForPageLoad stepKey="waitForCardSelected" time="3"/>
18+
<waitForPageLoad stepKey="waitForCardSelected"/>
1919

2020
<!--Choose Master Card from drop-down list-->
2121
<switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
2222
<fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
23-
<waitForPageLoad stepKey="waitForFillCardNumber" time="1"/>
23+
<waitForPageLoad stepKey="waitForFillCardNumber"/>
2424
<switchToIFrame stepKey="switchBackFromCard"/>
2525

2626
<!--Fill expire date-->
2727
<switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
2828
<fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
29-
<waitForPageLoad stepKey="waitForFillMonth" time="1"/>
29+
<waitForPageLoad stepKey="waitForFillMonth"/>
3030
<switchToIFrame stepKey="switchBackFromMonth"/>
3131
<switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
3232
<fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
33-
<waitForPageLoad stepKey="waitForFillYear" time="1"/>
33+
<waitForPageLoad stepKey="waitForFillYear"/>
3434
<switchToIFrame stepKey="switchBackFromYear"/>
3535

3636
<!--Fill CVW code-->

‎app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272

7373
<!-- Create a cart price rule with 10% discount for whole cart -->
7474
<click selector="{{AdminMenuSection.marketing}}" stepKey="clickOnMarketing" />
75-
<waitForPageLoad stepKey="waitForMarketing" time="3"/>
75+
<waitForPageLoad stepKey="waitForMarketing"/>
7676
<click selector="{{CartPriceRulesSubmenuSection.cartPriceRules}}" stepKey="clickOnCartPriceRules"/>
77-
<waitForPageLoad stepKey="waitForCartPriceRules" time="3"/>
77+
<waitForPageLoad stepKey="waitForCartPriceRules"/>
7878
<click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
7979
<fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
8080
<selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
@@ -83,7 +83,7 @@
8383
<selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="Percent of product price discount" stepKey="selectActionType"/>
8484
<fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="10" stepKey="fillDiscountAmount"/>
8585
<click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
86-
<waitForPageLoad stepKey="waitForCartRuleLoad" time="3"/>
86+
<waitForPageLoad stepKey="waitForCartRuleLoad"/>
8787
<see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
8888

8989
<!--Set Taxable Goods for Shipping Tax Class-->
@@ -112,15 +112,15 @@
112112

113113
<!--Submit Order-->
114114
<click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
115-
<waitForPageLoad stepKey="waitForSubmitOrder" time="5"/>
115+
<waitForPageLoad stepKey="waitForSubmitOrder"/>
116116
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeOrderSuccessMessage" after="waitForSubmitOrder"/>
117117

118118
<!-- Create New invoice-->
119119
<actionGroup ref="adminFastCreateInvoice" stepKey="createInvoice"/>
120120

121121
<!--Get access to Credit Memo page from Invoice page-->
122122
<click selector="{{AdminInvoiceMainActionsSection.openNewCreditMemoFromInvoice}}" stepKey="clickCreateNewCreditMemo"/>
123-
<waitForPageLoad stepKey="waitForLoadNewCreditMemoPage" time="5"/>
123+
<waitForPageLoad stepKey="waitForLoadNewCreditMemoPage"/>
124124
<see selector="{{AdminCreditMemoOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeNewCreditMemo"/>
125125
</test>
126126
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<arguments>
1212
<argument name="product" defaultValue="product"/>
1313
</arguments>
14-
<click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductRow"/>
14+
<click selector="{{AdminProductGridSection.productRowBySku(product.sku)}}" stepKey="clickOnProductRow"/>
1515
<waitForPageLoad time="30" stepKey="waitForProductPageLoad"/>
1616
<seeInField userInput="{{product.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="seeProductSkuOnEditProductPage"/>
1717
</actionGroup>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,24 @@
4242
<data key="is_active">true</data>
4343
<var key="parent_id" entityType="category" entityKey="id" />
4444
</entity>
45+
<entity name="FirstLevelSubCat" type="category">
46+
<data key="name" unique="suffix">FirstLevelSubCategory</data>
47+
<data key="name_lwr" unique="suffix">subcategory</data>
48+
</entity>
49+
<entity name="SecondLevelSubCat" type="category">
50+
<data key="name" unique="suffix">SecondLevelSubCategory</data>
51+
<data key="name_lwr" unique="suffix">subcategory</data>
52+
</entity>
53+
<entity name="ThirdLevelSubCat" type="category">
54+
<data key="name" unique="suffix">ThirdLevelSubCategory</data>
55+
<data key="name_lwr" unique="suffix">subcategory</data>
56+
</entity>
57+
<entity name="FourthLevelSubCat" type="category">
58+
<data key="name" unique="suffix">FourthLevelSubCategory</data>
59+
<data key="name_lwr" unique="suffix">subcategory</data>
60+
</entity>
61+
<entity name="FifthLevelCat" type="category">
62+
<data key="name" unique="suffix">FifthLevelCategory</data>
63+
<data key="name_lwr" unique="suffix">category</data>
64+
</entity>
4565
</entities>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,19 @@
480480
<requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
481481
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
482482
</entity>
483+
<entity name="defaultSimpleProduct" type="product">
484+
<data key="name" unique="suffix">Test </data>
485+
<data key="sku" unique="suffix">testsku</data>
486+
<data key="type_id">simple</data>
487+
<data key="attribute_set_id">4</data>
488+
<data key="visibility">4</data>
489+
<data key="price">560.00</data>
490+
<data key="urlKey" unique="suffix">testurl-</data>
491+
<data key="status">1</data>
492+
<data key="quantity">25</data>
493+
<data key="weight">1</data>
494+
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
495+
</entity>
483496
<entity name="ProductWithLongNameSku" extends="ApiSimpleProduct">
484497
<data key="name" unique="suffix">Product With Long Name And Sku - But not too long</data>
485498
<data key="sku" unique="suffix">Product With Long Name And Sku - But not too long</data>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<element name="ContentTab" type="input" selector="input[name='name']"/>
2323
<element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>
2424
<element name="panelFieldControl" type="input" selector='//aside//div[@data-index="{{arg1}}"]/descendant::*[@name="{{arg2}}"]' parameterized="true"/>
25+
<element name="productsInCategory" type="input" selector="div[data-index='assign_products']"/>
2526
</section>
2627
<section name="CategoryContentSection">
2728
<element name="SelectFromGalleryBtn" type="button" selector="//label[text()='Select from Gallery']"/>
@@ -38,6 +39,13 @@
3839
<element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>
3940
<element name="filterPriceRangeUseConfig" type="checkbox" selector="input[name='use_config[filter_price_range]']"/>
4041
<element name="RequiredFieldIndicator" type="text" selector=" return window.getComputedStyle(document.querySelector('._required[data-index={{arg1}}]&gt;.admin__field-label span'), ':after').getPropertyValue('content');" parameterized="true"/>
42+
<element name="displayMode" type="button" selector="select[name='display_mode']"/>
43+
<element name="anchor" type="checkbox" selector="input[name='is_anchor']"/>
44+
<element name="productListCheckBox" type="checkbox" selector="input[name='use_config[available_sort_by]']" />
45+
<element name="productList" type="text" selector="select[name='available_sort_by']"/>
46+
<element name="defaultProductLisCheckBox" type="checkbox" selector="input[name='use_config[default_sort_by]']"/>
47+
<element name="defaultProductList" type="text" selector="select[name='default_sort_by']"/>
48+
<element name="layeredNavigationPriceCheckBox" type="checkbox" selector="input[name='use_config[filter_price_range]']"/>
4149
</section>
4250
<section name="CatalogWYSIWYGSection">
4351
<element name="ShowHideBtn" type="button" selector="#togglecategory_form_description"/>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,13 @@
1616
<element name="imageFileName" type="text" selector=".file-uploader-filename"/>
1717
<element name="removeImageButton" type="button" selector=".file-uploader-summary .action-remove"/>
1818
<element name="AddCMSBlock" type="select" selector="//*[@name='landing_page']"/>
19+
<element name="description" type="input" selector="//*[@name='description']"/>
20+
<element name="content" type="button" selector="div[data-index='content'"/>
21+
<element name="categoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'no-active-category')]" parameterized="true" />
22+
<element name="categoryPageTitle" type="text" selector="h1.page-title" />
23+
<element name="activeCategoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'active-category')]" parameterized="true" />
24+
<element name="productTableColumnName" type="input" selector="#catalog_category_products_filter_name"/>
25+
<element name="productTableRow" type="button" selector="#catalog_category_products_table tbody tr"/>
26+
<element name="productSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
1927
</section>
2028
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
<element name="rowPrice" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-price" parameterized="true"/>
1616
<element name="rowPosition" type="input" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-position .position input" timeout="30" parameterized="true"/>
1717
<element name="productGridNameProduct" type="text" selector="//table[@id='catalog_category_products_table']//td[contains(., '{{productName}}')]" parameterized="true"/>
18+
<element name="productVisibility" type="select" selector="//*[@name='product[visibility]']"/>
1819
</section>
1920
</sections>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="AdminProductGridSection">
11+
<element name="productRowBySku" type="block" selector="//div[@id='container']//tr//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
1112
<element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
1213
<element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
1314
<element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
1415
<element name="productGridElement1" type="input" selector="#addselector" />
1516
<element name="productGridElement2" type="text" selector="#addselector" />
1617
<element name="productGridRows" type="text" selector="table.data-grid tr.data-row"/>
1718
<element name="firstProductRow" type="text" selector="table.data-grid tr.data-row:first-of-type"/>
19+
<element name="firstProductRowEditButton" type="button" selector="table.data-grid tr.data-row td .action-menu-item:first-of-type"/>
1820
<element name="productThumbnail" type="text" selector="table.data-grid tr:nth-child({{row}}) td.data-grid-thumbnail-cell > img" parameterized="true"/>
1921
<element name="productThumbnailBySrc" type="text" selector="img.admin__control-thumbnail[src*='{{pattern}}']" parameterized="true"/>
2022
<element name="productGridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontProductPageSection">
12-
<element name="qtyInput" type="button" selector="input.input-text.qty"/>
12+
<element name="qtyInput" type="button" selector="input.input-text.qty" timeout="30"/>
1313
<element name="addToCartBtn" type="button" selector="button.action.tocart.primary" timeout="30"/>
14-
<element name="successMsg" type="button" selector="div.message-success"/>
15-
<element name="errorMsg" type="button" selector="div.message-error"/>
14+
<element name="successMsg" type="button" selector="div.message-success" timeout="30"/>
15+
<element name="errorMsg" type="button" selector="div.message-error" timeout="30"/>
1616
<element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
17-
<element name="messagesBlock" type="text" selector=".page.messages"/>
17+
<element name="messagesBlock" type="text" selector=".page.messages" timeout="30"/>
1818
<element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/>
1919
<element name="customTextOptionInput" type="input" selector=".input-text.product-custom-option"/>
2020
<element name="charCounter" type="text" selector=".character-counter"/>
21+
<element name="tax" type="input" selector=".totals-tax .amount .price"/>
22+
<element name="subTotal" type="input" selector="span[data-th='Subtotal']"/>
23+
<element name="shipping" type="input" selector="span[data-th='Shipping']"/>
24+
<element name="orderTotal" type="input" selector=".grand.totals .amount .price"/>
2125
</section>
2226
</sections>

0 commit comments

Comments
 (0)