Skip to content

Commit 1eb0f3b

Browse files
SeruyVSeruyV
committed
Merge remote-tracking branch 'origin/MC-24168' into 2.4-develop-pr6
2 parents 62f4626 + 1a61122 commit 1eb0f3b

File tree

49 files changed

+2677
-345
lines changed

Some content is hidden

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

49 files changed

+2677
-345
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@
1616
<entity name="prodNameWithSpecChars">
1717
<data key="trademark">"Pursuit Lumaflex™ Tone Band"</data>
1818
<data key="skumark">"x™"</data>
19+
<data key="trademark_without_quotes">Pursuit Lumaflex™ Tone Band</data>
20+
<data key="skumark_without_quotes">x™</data>
1921
</entity>
2022
</entities>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
<element name="sectionHeader" type="button" selector="div[data-index='assign_products']" timeout="30"/>
1313
<element name="addProducts" type="button" selector="#catalog_category_add_product_tabs" timeout="30"/>
1414
<element name="addProductsDisabled" type="button" selector="#catalog_category_add_product_tabs[disabled]" timeout="30"/>
15+
<element name="productsInCategorySectionTitle" type="text" selector="div[data-index='assign_products'] .fieldset-wrapper-title" timeout="10"/>
16+
<element name="productsInCategorySectionBody" type="text" selector="div[data-index='assign_products'] .admin__fieldset-wrapper-content"/>
1517
</section>
16-
</sections>
18+
</sections>

‎app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/GenerateCategoryProductUrlRewriteConfigData.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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="EnableGenerateCategoryProductUrlRewritesConfigData">
12+
<!-- Default value -->
13+
<data key="path">catalog/seo/generate_category_product_rewrites</data>
14+
<data key="label">Yes</data>
15+
<data key="value">1</data>
16+
</entity>
17+
<entity name="DisableGenerateCategoryProductUrlRewritesConfigData">
18+
<data key="path">catalog/seo/generate_category_product_rewrites</data>
19+
<data key="label">No</data>
20+
<data key="value">0</data>
21+
</entity>
22+
</entities>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenCreditMemoFromOrderPageActionGroup.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="AdminOpenCreditMemoFromOrderPageActionGroup">
12+
<annotations>
13+
<description>Admin open creditmemo from order</description>
14+
</annotations>
15+
<conditionalClick selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" dependentSelector="{{AdminOrderCreditMemosTabSection.viewGridRow('1')}}" visible="false" stepKey="openCreditMemosTab"/>
16+
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.viewMemo}}" stepKey="waitForCreditMemosTabOpened"/>
17+
<click selector="{{AdminOrderCreditMemosTabSection.viewGridRow('1')}}" stepKey="viewMemo"/>
18+
<waitForPageLoad stepKey="waitForCreditMemoOpened"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenInvoiceFromOrderPageActionGroup.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="AdminOpenInvoiceFromOrderPageActionGroup">
12+
<annotations>
13+
<description>Admin open invoice from order</description>
14+
</annotations>
15+
<conditionalClick selector="{{AdminOrderDetailsOrderViewSection.invoices}}" dependentSelector="{{AdminOrderInvoicesTabSection.viewInvoice}}" visible="false" stepKey="openInvoicesTab"/>
16+
<waitForElementVisible selector="{{AdminOrderInvoicesTabSection.viewInvoice}}" stepKey="waitForInvocesTabOpened"/>
17+
<click selector="{{AdminOrderInvoicesTabSection.viewGridRow('1')}}" stepKey="viewInvoice"/>
18+
<waitForPageLoad stepKey="waitForInvoiceOpened"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenShipmentFromOrderPageActionGroup.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="AdminOpenShipmentFromOrderPageActionGroup">
12+
<annotations>
13+
<description>Admin open shipment from order</description>
14+
</annotations>
15+
<conditionalClick selector="{{AdminOrderDetailsOrderViewSection.shipments}}" dependentSelector="{{AdminOrderShipmentsTabSection.viewShipment}}" visible="false" stepKey="openShipmentsTab"/>
16+
<waitForElementVisible selector="{{AdminOrderShipmentsTabSection.viewShipment}}" stepKey="waitForShipmentTabOpened"/>
17+
<click selector="{{AdminOrderShipmentsTabSection.viewGridRow('1')}}" stepKey="viewShipment"/>
18+
<waitForPageLoad stepKey="waitForShipmentOpened"/>
19+
</actionGroup>
20+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartToCreateCreditMemoFromOrderPageActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminStartToCreateCreditMemoFromOrderPageActionGroup">
12+
<annotations>
13+
<description>Admin start to create credit memo from order</description>
14+
</annotations>
15+
<click selector="{{AdminOrderDetailsMainActionsSection.creditMemo}}" stepKey="clickCreditMemo"/>
16+
<waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForPageTitle"/>
17+
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Memo" stepKey="seeNewMemoPageTitle"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminCreditMemoGrandTotalActionGroup.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="AssertAdminCreditMemoGrandTotalActionGroup">
12+
<annotations>
13+
<description>Admin assert creditmemo grant total sum</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="expectedGrandTotal" type="string" defaultValue="$123.00"/>
17+
</arguments>
18+
<grabTextFrom selector="{{AdminCreditMemoTotalSection.grandTotal}}" stepKey="getGrandTotal"/>
19+
<assertEquals expected='{{expectedGrandTotal}}' actualType="variable" expectedType="string" actual="getGrandTotal" stepKey="assertGrandTotalValue"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderShipmentsTabSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@
1818
<element name="shipmentId" type="input" selector="//div[@id='sales_order_view_tabs_order_shipments_content']//input[@name='increment_id']" timeout="30"/>
1919
<element name="totalQtyFrom" type="input" selector="[name='total_qty[from]']" timeout="30"/>
2020
<element name="totalQtyTo" type="input" selector="[name='total_qty[to]']" timeout="30"/>
21+
<element name="viewShipment" type="button" selector="#sales_order_view_tabs_order_shipments_content div.admin__data-grid-wrap a.action-menu-item" timeout="30"/>
2122
</section>
22-
</sections>
23+
</sections>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCreateTaxRuleCustomProductTaxClassActionGroup.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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="AdminCreateTaxRuleCustomProductTaxClassActionGroup">
12+
<annotations>
13+
<description>Admin create tax rule with custom tax rate and product tax class</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="taxRuleCode" type="string" defaultValue="{{defaultTaxRule.code}}"/>
17+
<argument name="taxRateCode" type="string" defaultValue="{{US_NY_Rate_1.code}}"/>
18+
<argument name="productTaxClassName" type="string" defaultValue="NewTaxClass"/>
19+
</arguments>
20+
<amOnPage url="{{AdminNewTaxRulePage.url}}" stepKey="goNewTaxRulePage"/>
21+
<waitForPageLoad stepKey="waitForNewTaxRulePageLoaded"/>
22+
<fillField selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{taxRuleCode}}" stepKey="fillRuleName"/>
23+
<click selector="{{AdminTaxRulesSection.selectTaxRate(taxRateCode)}}" stepKey="selectTaxRate"/>
24+
<click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>
25+
<click selector="{{AdminTaxRulesSection.selectProductTaxClass(taxableGoodsTaxClass.class_name)}}" stepKey="unSelectTaxClass"/>
26+
<click selector="{{AdminTaxRulesSection.selectProductTaxClass(productTaxClassName)}}" stepKey="selectProductTaxClass"/>
27+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
28+
<waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
29+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the tax rule." stepKey="verifyRuleSaved"/>
30+
</actionGroup>
31+
</actionGroups>

0 commit comments

Comments
 (0)