Skip to content

Commit d16c51e

Browse files
glo71317glo71317
committed
Merge branch 'develop' into release_sync
2 parents 33579a8 + cb03d4c commit d16c51e

File tree

17 files changed

+43
-8
lines changed

17 files changed

+43
-8
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
3434
<waitForPageLoad stepKey="waitForPageLoad"/>
3535
<click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAtttributeBtn"/>
36-
<waitForLoadingMaskToDisappear stepKey="waitForLoading1"/>
36+
<waitForPageLoad stepKey="waitForLoading1"/>
3737
<click selector="{{AdminProductFormSection.createNewAttributeBtn}}" stepKey="clickCreateNewAtttributeBtn"/>
38-
<waitForLoadingMaskToDisappear stepKey="waitForLoading2"/>
38+
<waitForPageLoad stepKey="waitForLoading2"/>
3939
<fillField selector="{{AdminProductFormSection.attributeLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
4040
<click selector="{{AdminProductFormSection.frontendInput}}" stepKey="openInputTypeDropdown"/>
4141
<see userInput="Page Builder" stepKey="seePageBuilderInputType"/>
4242
<selectOption selector="{{AdminProductFormSection.frontendInput}}" userInput="Page Builder" stepKey="selectOption1"/>
4343
<click selector="{{AdminProductFormSection.saveNewAttribute}}" stepKey="saveAttribute"/>
4444
<waitForElementNotVisible selector="{{AdminProductFormSection.saveNewAttribute}}" stepKey="waitForSlideOutCloses"/>
45-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
45+
<waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
4646
<click selector="{{AdminProductFormSection.attributeTab}}" stepKey="expandAttributeTab"/>
4747
<waitForElementVisible selector="{{PageBuilderProductAttribute.PageBuilderBtn(ProductAttributeFrontendLabel.label)}}" stepKey="waitForAttributeVisbile"/>
4848
<click selector="{{PageBuilderProductAttribute.PageBuilderBtn(ProductAttributeFrontendLabel.label)}}" stepKey="enablePageBuilder"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
3434
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
3535
<deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
36+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
37+
<argument name="indices" value=""/>
38+
</actionGroup>
3639
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3740
</after>
3841
<actionGroup ref="NavigateToCreatedProductAttributeActionGroup" stepKey="navigateToCreatedProductAttribute">

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
</before>
3030
<after>
3131
<deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
32+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
33+
<argument name="indices" value=""/>
34+
</actionGroup>
3235
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3336
</after>
3437
<actionGroup ref="NavigateToCreatedProductAttributeActionGroup" stepKey="navigateToCreatedProductAttribute">

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
</before>
3030
<after>
3131
<deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
32+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
33+
<argument name="indices" value=""/>
34+
</actionGroup>
3235
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3336
</after>
3437
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid1"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
</before>
3030
<after>
3131
<deleteData createDataKey="myProductAttributeCreation" stepKey="deleteProductAttribute"/>
32+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
33+
<argument name="indices" value=""/>
34+
</actionGroup>
3235
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3336
</after>
3437
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid1"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
</before>
3232
<after>
3333
<deleteData createDataKey="createWysiwygAttribute" stepKey="deletePreReqProductAttribute"/>
34+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
35+
<argument name="indices" value=""/>
36+
</actionGroup>
3437
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3538
</after>
3639
<!-- Update created attribute to enable Page Builder -->

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
</before>
3131
<after>
3232
<deleteData createDataKey="createTextAttribute" stepKey="deletePreReqProductAttribute"/>
33+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
34+
<argument name="indices" value=""/>
35+
</actionGroup>
3336
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3437
</after>
3538
<!-- Create a new product -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
3434
<argument name="sku" value="{{_defaultProduct.sku}}"/>
3535
</actionGroup>
36-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
36+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilter"/>
3737
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3838
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
3939
<closeTab stepKey="closeTab"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
3434
<argument name="sku" value="{{_defaultProduct.sku}}"/>
3535
</actionGroup>
36-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
36+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilter"/>
3737
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3838
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
3939
</after>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
<after>
3636
<deleteData createDataKey="createPageBuilderAttribute1" stepKey="deleteAttribute1"/>
3737
<deleteData createDataKey="createPageBuilderAttribute2" stepKey="deleteAttribute2"/>
38+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
39+
<argument name="indices" value=""/>
40+
</actionGroup>
3841
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3942
<closeTab stepKey="closeTab"/>
4043
</after>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,15 @@
4242
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
4343
<argument name="sku" value="{{_defaultProduct.sku}}"/>
4444
</actionGroup>
45-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
45+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilter"/>
4646
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4747
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
4848
<deleteData createDataKey="createPageBuilderAttribute" stepKey="deleteAttribute1"/>
4949
<deleteData createDataKey="createTextAttribute" stepKey="deleteAttribute2"/>
5050
<deleteData createDataKey="relatedSimpleProduct" stepKey="deleteRelatedProduct"/>
51+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
52+
<argument name="indices" value=""/>
53+
</actionGroup>
5154
</after>
5255
<!-- Update created attribute to enable Page Builder -->
5356
<comment userInput="Update created attribute to enable Page Builder" stepKey="commentUpdateAttribute"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@
9595
<selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Editor" stepKey="selectTextEditor"/>
9696
<actionGroup ref="ConfirmChangeInputTypeModalActionGroup" stepKey="confirmChangeInputTypeModal"/>
9797
<actionGroup ref="SaveProductAttributeActionGroup" stepKey="saveAttribute"/>
98+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
99+
<argument name="indices" value=""/>
100+
</actionGroup>
98101
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
99102
<argument name="tags" value="full_page"/>
100103
</actionGroup>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
<deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
5656
<deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
5757
<deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
58+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
59+
<argument name="indices" value=""/>
60+
</actionGroup>
5861
<actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
5962
<actionGroup ref="NavigateToCreatedProductAttributeActionGroup" stepKey="navigateToShortDescriptionProductAttribute">
6063
<argument name="ProductAttribute" value="ProductShortDescription"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/ProductFromDifferentWebsiteInsideBlockShowsOnStageTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<argument name="StoreGroup" value="customStoreGroup"/>
3838
<argument name="customStore" value="customStore"/>
3939
</actionGroup>
40+
<magentoCron groups="index" stepKey="reindex"/>
4041
<createData entity="SimpleProduct" stepKey="createProduct">
4142
<requiredEntity createDataKey="createCategory"/>
4243
</createData>
@@ -46,6 +47,7 @@
4647
<actionGroup ref="DeleteCustomWebsiteActionGroup" stepKey="deleteWebsite">
4748
<argument name="websiteName" value="$createCustomWebsite.website[name]$"/>
4849
</actionGroup>
50+
<magentoCron groups="index" stepKey="reindex"/>
4951
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
5052
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
5153
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductFromDifferentWebsiteShowsOnStageTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,21 @@
3333
<argument name="StoreGroup" value="customStoreGroup"/>
3434
<argument name="customStore" value="customStore"/>
3535
</actionGroup>
36+
<magentoCron groups="index" stepKey="reindex"/>
3637
</before>
3738
<after>
3839
<magentoCLI command="config:set web/url/use_store 0" stepKey="turnOffStoreUrlUsage"/>
3940
<actionGroup ref="DeleteCustomWebsiteActionGroup" stepKey="deleteWebsite">
4041
<argument name="websiteName" value="$createCustomWebsite.website[name]$"/>
4142
</actionGroup>
43+
<magentoCron groups="index" stepKey="reindex"/>
4244
<actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteCategory">
4345
<argument name="categoryEntity" value="SimpleSubCategory"/>
4446
</actionGroup>
4547
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
4648
<argument name="sku" value="{{SimpleProduct.sku}}"/>
4749
</actionGroup>
48-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
50+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilter"/>
4951
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
5052
</after>
5153
<!-- Create product and assign to store view -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct1">
4747
<argument name="sku" value="Updated-SKU"/>
4848
</actionGroup>
49-
<actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid"/>
49+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetProductGrid"/>
5050
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5151
</after>
5252
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderVerifySwatchDisplayedInPreviewGridTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
3030
<argument name="sku" value="{{BaseConfigurableProduct.sku}}"/>
3131
</actionGroup>
32+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
3233
<actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteAttribute">
3334
<argument name="productAttributeLabel" value="{{visualSwatchAttribute.default_label}}"/>
3435
</actionGroup>

0 commit comments

Comments
 (0)