Skip to content

Commit 62d4661

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-33665' into 2.4-develop-pr30
2 parents e7b5c27 + fbbc039 commit 62d4661

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="AdminProductGridSection">
1111
<element name="productRowBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
12+
<element name="productRowByName" type="block" selector="//td[count(../../..//th[./*[.='Name']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
1213
<element name="productRowCheckboxBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]/../td//input[@data-action='select-row']" parameterized="true" />
1314
<element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
1415
<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"/>
@@ -35,5 +36,6 @@
3536
<element name="productGridContentsOnRow" type="checkbox" selector="//*[@id='container']//tr[{{row}}]/td" parameterized="true"/>
3637
<element name="selectRowBasedOnName" type="input" selector="//td/div[text()='{{var1}}']" parameterized="true"/>
3738
<element name="changeStatus" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-menu-item')]//ul/li/span[text() = '{{status}}']" parameterized="true"/>
39+
<element name="productRowByTypeAndName" type="block" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]//td[count(../../..//th[./*[.='Type']]/preceding-sibling::th) + 1][./*[.='{{type}}']]/../td[contains(.,'{{name}}')]" parameterized="true" />
3840
</section>
3941
</sections>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminConfigurableProductTypeSwitchingToVirtualProductTest.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<stories value="Product type switching"/>
1414
<title value="Configurable product type switching on editing to virtual product"/>
1515
<description value="Configurable product type switching on editing to virtual product"/>
16-
<testCaseId value="MC-17952"/>
16+
<testCaseId value="MC-28742"/>
1717
<useCaseId value="MAGETWO-44170"/>
1818
<severity value="MAJOR"/>
1919
<group value="catalog"/>
2020
</annotations>
2121
<!--Delete product configurations-->
2222
<comment userInput="Delete product configuration" stepKey="commentDeleteConfigs"/>
2323
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="gotToConfigProductPage">
24-
<argument name="productId" value="$$createProduct.id$$"/>
24+
<argument name="productId" value="$createProduct.id$"/>
2525
</actionGroup>
2626
<waitForPageLoad stepKey="waitForConfigurableProductPageLoad"/>
2727
<conditionalClick selector="{{ AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="openConfigurationSection"/>
@@ -38,13 +38,12 @@
3838
<comment userInput="Assert virtual product on Admin product page grid" stepKey="commentAssertVirtualProductOnAdmin"/>
3939
<amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogProductPageForVirtual"/>
4040
<actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySkuForVirtual">
41-
<argument name="sku" value="$$createProduct.sku$$"/>
41+
<argument name="sku" value="$createProduct.sku$"/>
4242
</actionGroup>
43-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeVirtualProductNameInGrid"/>
44-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Virtual Product" stepKey="seeVirtualProductTypeInGrid"/>
43+
<seeElement selector="{{AdminProductGridSection.productRowByTypeAndName('Virtual Product',$createProduct.name$)}}" stepKey="seeVirtualProductInGrid"/>
4544
<!--Assert virtual product on storefront-->
4645
<comment userInput="Assert virtual product on storefront" stepKey="commentAssertVirtualProductOnStorefront"/>
47-
<amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="openVirtualProductPage"/>
46+
<amOnPage url="{{StorefrontProductPage.url($createProduct.name$)}}" stepKey="openVirtualProductPage"/>
4847
<waitForPageLoad stepKey="waitForStorefrontVirtualProductPageLoad"/>
4948
<see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertVirtualProductInStock"/>
5049
</test>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToConfigurableProductTest.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,16 @@
3232
<createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
3333
<requiredEntity createDataKey="createConfigProductAttribute"/>
3434
</createData>
35+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
36+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
3537
</before>
3638
<after>
3739
<!--Delete product-->
3840
<comment userInput="Delete product" stepKey="commentDeleteProduct"/>
3941
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
4042
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
4143
<actionGroup ref="DeleteAllDuplicateProductUsingProductGridActionGroup" stepKey="deleteAllDuplicateProducts">
42-
<argument name="product" value="$$createProduct$$"/>
44+
<argument name="product" value="$createProduct$"/>
4345
</actionGroup>
4446
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
4547
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -50,27 +52,25 @@
5052
<!--Add configurations to product-->
5153
<comment userInput="Add configurations to product" stepKey="commentAddConfigs"/>
5254
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="gotToSimpleProductPage">
53-
<argument name="productId" value="$$createProduct.id$$"/>
55+
<argument name="productId" value="$createProduct.id$"/>
5456
</actionGroup>
5557
<waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
5658
<actionGroup ref="GenerateConfigurationsByAttributeCodeActionGroup" stepKey="setupConfigurations">
57-
<argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
59+
<argument name="attributeCode" value="$createConfigProductAttribute.attribute_code$"/>
5860
</actionGroup>
5961
<actionGroup ref="SaveConfiguredProductActionGroup" stepKey="saveConfigProductForm"/>
6062
<!--Assert configurable product on Admin product page grid-->
6163
<comment userInput="Assert configurable product in Admin product page grid" stepKey="commentAssertConfigProductOnAdmin"/>
6264
<amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogProductPage"/>
6365
<actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySku">
64-
<argument name="sku" value="$$createProduct.sku$$"/>
66+
<argument name="sku" value="$createProduct.sku$"/>
6567
</actionGroup>
66-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeProductNameInGrid"/>
67-
<see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Configurable Product" stepKey="seeProductTypeInGrid"/>
68-
<see selector="{{AdminProductGridSection.productGridCell('2', 'Name')}}" userInput="$$createProduct.name$$-option1" stepKey="seeProductNameInGrid1"/>
69-
<see selector="{{AdminProductGridSection.productGridCell('3', 'Name')}}" userInput="$$createProduct.name$$-option2" stepKey="seeProductNameInGrid2"/>
70-
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
68+
<seeElement selector="{{AdminProductGridSection.productRowByTypeAndName('Configurable Product',$createProduct.name$)}}" stepKey="seeConfigurableProductInGrid"/>
69+
<seeElement selector="{{AdminProductGridSection.productRowByTypeAndName('Simple Product',$createProduct.name$-option1)}}" stepKey="seeSimpleProduct1NameInGrid"/>
70+
<seeElement selector="{{AdminProductGridSection.productRowByTypeAndName('Simple Product',$createProduct.name$-option2)}}" stepKey="seeSimpleProduct2NameInGrid"/>
7171
<!--Assert configurable product on storefront-->
7272
<comment userInput="Assert configurable product on storefront" stepKey="commentAssertConfigProductOnStorefront"/>
73-
<amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="openProductPage"/>
73+
<amOnPage url="{{StorefrontProductPage.url($createProduct.name$)}}" stepKey="openProductPage"/>
7474
<waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
7575
<see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertInStock"/>
7676
<click selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="clickAttributeDropDown"/>

0 commit comments

Comments
 (0)