Skip to content

Commit fca08fc

Browse files
svitjasvitja
committed
MC-20070: Fix Skipped MFTF Tests From MC-17140: MAGETWO-95175, MAGETWO-97001, MAGETWO-98189
1 parent 497438d commit fca08fc

File tree

7 files changed

+58
-20
lines changed

7 files changed

+58
-20
lines changed

‎app/code/Magento/Config/Test/Mftf/Data/DefaultProductTaxClassData.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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="DefaultProductTaxClass">
12+
<!-- Default value -->
13+
<data key="path">tax/classes/default_product_tax_class</data>
14+
<data key="label">Yes</data>
15+
<data key="value">2</data>
16+
</entity>
17+
</entities>

‎app/code/Magento/Config/Test/Mftf/Data/GenerateCategoryProductUrlRewritesData.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="EnableGenerateCategoryProductUrlRewrites">
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="DisableGenerateCategoryProductUrlRewrites">
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<annotations>
1313
<description>Admin open creditmemo from order</description>
1414
</annotations>
15-
<click selector="{{AdminCreditMemoTotalSection.creditMemoItem}}" stepKey="goToCreatedCreditMemo"/>
16-
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.viewMemo}}" stepKey="waitForCreditMemoPage"/>
17-
<click selector="{{AdminCreditMemoTotalSection.viewMemo}}" stepKey="viewMemo"/>
15+
<conditionalClick selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" dependentSelector="{{AdminCreditMemoTotalSection.viewMemo}}" visible="false" stepKey="openCreditMemosTab"/>
16+
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.viewMemo}}" stepKey="waitForCreditMemosTabOpened"/>
17+
<click selector="{{AdminOrderCreditMemosTabSection.viewGridRow('1')}}" stepKey="viewMemo"/>
1818
<waitForPageLoad stepKey="waitForCreditMemoOpened"/>
1919
</actionGroup>
2020
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertCreditMemoGrandTotalActionGroup.xml renamed to ‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminCreditMemoGrandTotalActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminAssertCreditMemoGrandTotalActionGroup">
11+
<actionGroup name="AssertAdminCreditMemoGrandTotalActionGroup">
1212
<annotations>
1313
<description>Admin assert creditmemo grant total sum</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="expectedGrandTotal" type="string" defaultValue="$123.00"/>
1717
</arguments>
1818
<grabTextFrom selector="{{AdminCreditMemoTotalSection.grandTotal}}" stepKey="getGrandTotal"/>
19-
<assertEquals expected='{{expectedGrandTotal}}' expectedType="string" actual="$getGrandTotal" stepKey="assertGrandTotalValue"/>
19+
<assertEquals expected='{{expectedGrandTotal}}' actualType="variable" expectedType="string" actual="getGrandTotal" stepKey="assertGrandTotalValue"/>
2020
</actionGroup>
2121
</actionGroups>

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminCreateTaxRuleCustomProductTaxClassActionGroup">
1212
<annotations>
13-
<description>Admin create tax rule with custom product tax class</description>
13+
<description>Admin create tax rule with custom tax rate and product tax class</description>
1414
</annotations>
1515
<arguments>
16-
<argument name="taxRateCode" type="string" defaultValue="{{US_NY_Rate_1.code}}"/>
1716
<argument name="taxRuleCode" type="string" defaultValue="{{defaultTaxRule.code}}"/>
17+
<argument name="taxRateCode" type="string" defaultValue="{{US_NY_Rate_1.code}}"/>
1818
<argument name="productTaxClassName" type="string" defaultValue="NewTaxClass"/>
1919
</arguments>
20-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
21-
<waitForPageLoad stepKey="waitForTaxRatePageLoaded"/>
22-
<click selector="{{AdminMainActionsSection.add}}" stepKey="addNewTaxRate"/>
20+
<amOnPage url="{{AdminNewTaxRulePage.url}}" stepKey="goNewTaxRulePage"/>
21+
<waitForPageLoad stepKey="waitForNewTaxRulePageLoaded"/>
2322
<fillField selector="{{AdminTaxRulesSection.ruleName}}" userInput="{{taxRuleCode}}" stepKey="fillRuleName"/>
2423
<click selector="{{AdminTaxRulesSection.selectTaxRate(taxRateCode)}}" stepKey="selectTaxRate"/>
2524
<click selector="{{AdminTaxRuleFormSection.additionalSettings}}" stepKey="clickAdditionalSettings"/>

‎app/code/Magento/Tax/Test/Mftf/Section/AdminTaxRulesSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
<element name="defaultTaxClass" type="button" selector="//*[@id='tax_product_class']/following-sibling::section//div[@class='mselect-items-wrapper']/div[1]"/>
3232
<element name="deleteTaxClassName" type="button" selector="//span[contains(text(),'{{var1}}')]" parameterized="true"/>
3333
<element name="deleteTaxClass" type="button" selector="//span[contains(text(),'{{var1}}')]/../..//*[@class='mselect-delete']" parameterized="true"/>
34-
<element name="popUpDialogOK" type="button" selector=".modal-footer .action-accept"/>
34+
<element name="popUpDialogOK" type="button" selector="//*[@class='modal-footer']//*[contains(text(),'OK')]"/>
3535
<element name="taxRateMultiSelectItems" type="block" selector=".mselect-list-item"/>
3636
<element name="taxRateNumber" type="button" selector="//div[@data-ui-id='tax-rate-form-fieldset-element-form-field-tax-rate']//div[@class='mselect-items-wrapper']//label[{{var}}]" parameterized="true"/>
3737
<element name="selectTaxRate" type="input" selector="//span[text()='{{taxCode}}']" parameterized="true"/>
38-
<element name="selectTaxClass" type="input" selector="//span[text()='{{taxClass}}']" parameterized="true"/>
38+
<element name="selectTaxClass" type="input" selector="//div[contains(@class, 'field-tax_product_class')]//*[contains(@class, 'mselect-list-item') and contains(.,'{{taxClass}}')]" parameterized="true"/>
3939
</section>
4040
</sections>

‎app/code/Magento/Tax/Test/Mftf/Test/AdminCheckCreditMemoTotalsTest.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<description value="Checking Credit memo Totals"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-6159"/>
19-
<group value="creditMemo"/>
2019
<group value="tax"/>
20+
<group value="sales"/>
2121
</annotations>
2222
<before>
2323
<!-- Create productTaxClass -->
2424
<createData entity="productTaxClass" stepKey="createProductTaxClass"/>
2525
<!--Set configs-->
26-
<magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 0" stepKey="disableGenerateUrlRewrite"/>
27-
<magentoCLI command="config:set tax/classes/default_product_tax_class $createProductTaxClass.return$" stepKey="setDefaultProductTaxClass"/>
26+
<magentoCLI command="config:set {{DisableGenerateCategoryProductUrlRewrites.path}} {{DisableGenerateCategoryProductUrlRewrites.value}}" stepKey="disableGenerateUrlRewrite"/>
27+
<magentoCLI command="config:set {{DefaultProductTaxClass.path}} $createProductTaxClass.return$" stepKey="setDefaultProductTaxClass"/>
2828
<!--Create category and product-->
2929
<createData entity="_defaultCategory" stepKey="createCategory"/>
3030
<createData entity="_defaultProduct" stepKey="createSimpleProduct">
@@ -42,8 +42,8 @@
4242
</before>
4343
<after>
4444
<!--Set configs-->
45-
<magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
46-
<magentoCLI command="config:set tax/classes/default_product_tax_class 2" stepKey="setDefaultProductTaxClass"/>
45+
<magentoCLI command="config:set {{EnableGenerateCategoryProductUrlRewrites.path}} {{EnableGenerateCategoryProductUrlRewrites.value}}" stepKey="enableGenerateUrlRewrite"/>
46+
<magentoCLI command="config:set {{DefaultProductTaxClass.path}} {{DefaultProductTaxClass.value}}" stepKey="setDefaultProductTaxClass"/>
4747
<!--Delete category and product-->
4848
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
4949
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
@@ -61,7 +61,7 @@
6161
<!-- Delete Tax Class -->
6262
<deleteData createDataKey="createProductTaxClass" stepKey="deleteProductTaxClass"/>
6363
<!--Logout-->
64-
<actionGroup ref="logout" stepKey="logout"/>
64+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
6565
</after>
6666
<!--Create new order-->
6767
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="createNewOrder">
@@ -79,12 +79,12 @@
7979
<actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
8080
<actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
8181
<!--Create Credit Memo-->
82-
<actionGroup ref="AdminStartToCreateCreditMemoFromOrderPageActionGroup" stepKey="createCreditMemo"/>
82+
<actionGroup ref="AdminStartToCreateCreditMemoFromOrderPageActionGroup" stepKey="startCreatingCreditMemo"/>
8383
<fillField selector="{{AdminCreditMemoTotalSection.refundShipping}}" userInput="0" stepKey="setRefundShipping"/>
8484
<actionGroup ref="UpdateCreditMemoTotalsActionGroup" stepKey="updateTotals"/>
8585
<actionGroup ref="SubmitCreditMemoActionGroup" stepKey="submitCreditMemo"/>
8686
<actionGroup ref="AdminOpenCreditMemoFromOrderPageActionGroup" stepKey="openCreditMemoFromOrderPageActionGroup"/>
87-
<actionGroup ref="AdminAssertCreditMemoGrandTotalActionGroup" stepKey="assertGrandTotal">
87+
<actionGroup ref="AssertAdminCreditMemoGrandTotalActionGroup" stepKey="assertGrandTotal">
8888
<argument name="expectedGrandTotal" value="$133.30"/>
8989
</actionGroup>
9090
</test>

0 commit comments

Comments
 (0)