Skip to content

Commit d9d5fac

Browse files
mrprabhu92mrprabhu92
authored
Merge pull request #467 from magento-cia/cia-pre-release-develop-sync-09112025
Cia pre release develop sync 09112025
2 parents 1b67244 + d7f9cac commit d9d5fac

9 files changed

+26
-10
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeOnProductFormTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2929
</before>
3030
<after>
31+
<!-- Delete all products via API using ProductApiHelper -->
32+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3133
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
3234
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
3335
<argument name="tags" value="config"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreateProductWithPageBuilderProductAttributeTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3333
</before>
3434
<after>
35+
<!-- Delete all products via API using ProductApiHelper -->
36+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3537
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
3638
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
3739
<argument name="tags" value="config"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextAreaTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2929
</before>
3030
<after>
31+
<!-- Delete all products via API using ProductApiHelper -->
32+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3133
<deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
3234
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
3335
<argument name="indices" value=""/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextEditorTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2929
</before>
3030
<after>
31+
<!-- Delete all products via API using ProductApiHelper -->
32+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3133
<deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
3234
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
3335
<argument name="indices" value=""/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanUpgradeTextEditorProductAttributeToPageBuilderTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2929
</before>
3030
<after>
31+
<!-- Delete all products via API using ProductApiHelper -->
32+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3133
<deleteData createDataKey="myProductAttributeCreation" stepKey="deleteProductAttribute"/>
3234
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
3335
<argument name="indices" value=""/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithFullWidthPageBuilderAttributeTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3131
</before>
3232
<after>
33+
<!-- Delete product created via UI -->
34+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3335
<deleteData createDataKey="createWysiwygAttribute" stepKey="deletePreReqProductAttribute"/>
3436
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
3537
<argument name="indices" value=""/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithNormalAttributeValidateInTableFullWidthTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3030
</before>
3131
<after>
32+
<!-- Delete product created via UI -->
33+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3234
<deleteData createDataKey="createTextAttribute" stepKey="deletePreReqProductAttribute"/>
3335
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
3436
<argument name="indices" value=""/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductProductFullWidthValidateAttributeOrderTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3434
</before>
3535
<after>
36+
<!-- Delete product created via UI -->
37+
<helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
3638
<deleteData createDataKey="createPageBuilderAttribute1" stepKey="deleteAttribute1"/>
3739
<deleteData createDataKey="createPageBuilderAttribute2" stepKey="deleteAttribute2"/>
3840
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderCategoryButtonLinkTest.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,23 @@
2323
</annotations>
2424
<before>
2525
<createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
26+
<createData entity="SimpleSubCategory" stepKey="createCategoryB"/>
27+
<createData entity="NewSubCategoryWithParent" stepKey="createSubCategoryY">
28+
<requiredEntity createDataKey="createCategoryB"/>
29+
</createData>
30+
<createData entity="_defaultCategory" stepKey="createCategoryA"/>
31+
<createData entity="NewSubCategoryWithParent" stepKey="createSubCategoryX">
32+
<requiredEntity createDataKey="createCategoryA"/>
33+
</createData>
2634
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2735
</before>
2836
<after>
2937
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
38+
<deleteData createDataKey="createCategoryA" stepKey="deletePreReqCatalogA"/>
39+
<deleteData createDataKey="createCategoryB" stepKey="deletePreReqCatalogB"/>
3040
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3141
<waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
3242
</after>
33-
<createData entity="SimpleSubCategory" stepKey="createCategoryB"/>
34-
<createData entity="NewSubCategoryWithParent" stepKey="createSubCategoryY">
35-
<requiredEntity createDataKey="createCategoryB"/>
36-
</createData>
37-
<createData entity="_defaultCategory" stepKey="createCategoryA"/>
38-
<createData entity="NewSubCategoryWithParent" stepKey="createSubCategoryX">
39-
<requiredEntity createDataKey="createCategoryA"/>
40-
</createData>
41-
4243
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
4344
<argument name="CMSPage" value="$$createCMSPage$$"/>
4445
</actionGroup>
@@ -123,6 +124,5 @@
123124
<expectedResult type="string">/Category with ID: [0-9]+ doesn't exist$/</expectedResult>
124125
<actualResult type="variable">textFromDropDown3</actualResult>
125126
</assertRegExp>
126-
<deleteData createDataKey="createCategoryA" stepKey="deletePreReqCatalogA"/>
127127
</test>
128128
</tests>

0 commit comments

Comments
 (0)