Skip to content

Commit 2c9e44e

Browse files
committed
MC-20070: Fix Skipped MFTF Tests From MC-17140: MAGETWO-95175, MAGETWO-97001, MAGETWO-98189
1 parent 8c6251b commit 2c9e44e

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

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/GenerateCategoryProductUrlRewriteData.xml renamed to app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/GenerateCategoryProductUrlRewriteConfigData.xml

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

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11-
<entity name="EnableGenerateCategoryProductUrlRewrites">
11+
<entity name="EnableGenerateCategoryProductUrlRewritesConfigData">
1212
<!-- Default value -->
1313
<data key="path">catalog/seo/generate_category_product_rewrites</data>
1414
<data key="label">Yes</data>
1515
<data key="value">1</data>
1616
</entity>
17-
<entity name="DisableGenerateCategoryProductUrlRewrites">
17+
<entity name="DisableGenerateCategoryProductUrlRewritesConfigData">
1818
<data key="path">catalog/seo/generate_category_product_rewrites</data>
1919
<data key="label">No</data>
2020
<data key="value">0</data>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenCreditMemoFromOrderPageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<annotations>
1313
<description>Admin open creditmemo from order</description>
1414
</annotations>
15-
<conditionalClick selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" dependentSelector="{{AdminCreditMemoTotalSection.viewMemo}}" visible="false" stepKey="openCreditMemosTab"/>
15+
<conditionalClick selector="{{AdminOrderDetailsOrderViewSection.creditMemos}}" dependentSelector="{{AdminOrderCreditMemosTabSection.viewGridRow('1')}}" visible="false" stepKey="openCreditMemosTab"/>
1616
<waitForElementVisible selector="{{AdminCreditMemoTotalSection.viewMemo}}" stepKey="waitForCreditMemosTabOpened"/>
1717
<click selector="{{AdminOrderCreditMemosTabSection.viewGridRow('1')}}" stepKey="viewMemo"/>
1818
<waitForPageLoad stepKey="waitForCreditMemoOpened"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<!-- Create productTaxClass -->
2424
<createData entity="productTaxClass" stepKey="createProductTaxClass"/>
2525
<!--Set configs-->
26-
<magentoCLI command="config:set {{DisableGenerateCategoryProductUrlRewrites.path}} {{DisableGenerateCategoryProductUrlRewrites.value}}" stepKey="disableGenerateUrlRewrite"/>
26+
<magentoCLI command="config:set {{DisableGenerateCategoryProductUrlRewritesConfigData.path}} {{DisableGenerateCategoryProductUrlRewritesConfigData.value}}" stepKey="disableGenerateUrlRewrite"/>
2727
<magentoCLI command="config:set {{DefaultProductTaxClass.path}} $createProductTaxClass.return$" stepKey="setDefaultProductTaxClass"/>
2828
<!--Create category and product-->
2929
<createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -42,7 +42,7 @@
4242
</before>
4343
<after>
4444
<!--Set configs-->
45-
<magentoCLI command="config:set {{EnableGenerateCategoryProductUrlRewrites.path}} {{EnableGenerateCategoryProductUrlRewrites.value}}" stepKey="enableGenerateUrlRewrite"/>
45+
<magentoCLI command="config:set {{EnableGenerateCategoryProductUrlRewritesConfigData.path}} {{EnableGenerateCategoryProductUrlRewritesConfigData.value}}" stepKey="enableGenerateUrlRewrite"/>
4646
<magentoCLI command="config:set {{DefaultProductTaxClass.path}} {{DefaultProductTaxClass.value}}" stepKey="setDefaultProductTaxClass"/>
4747
<!--Delete category and product-->
4848
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>

0 commit comments

Comments
 (0)