Skip to content

Commit cad8536

Browse files
andimovandimov
committed
Merge remote-tracking branch 'origin/2.4-develop' into ims-phase1
2 parents 60ebe86 + 41631d5 commit cad8536

File tree

574 files changed

+3670
-1264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

574 files changed

+3670
-1264
lines changed

‎app/code/Magento/AsynchronousOperations/Model/MassPublisher.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function __construct(
7979
}
8080

8181
/**
82-
* {@inheritdoc}
82+
* @inheritdoc
8383
*/
8484
public function publish($topicName, $data)
8585
{
@@ -91,6 +91,7 @@ public function publish($topicName, $data)
9191
[
9292
'body' => $message,
9393
'properties' => [
94+
'topic_name' => $topicName,
9495
'delivery_mode' => 2,
9596
'message_id' => $this->messageIdGenerator->generate($topicName),
9697
]

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportBundleProductTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteImportImagesFilesDirectoryS3" after="deleteImportFilesDirectoryS3">
6060
<argument name="path">var/import/images/{{ImportProduct_Bundle.name}}</argument>
6161
</helper>
62+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache" after="deleteImportImagesFilesDirectoryS3">
63+
<argument name="tags" value=""/>
64+
</actionGroup>
6265

6366
<!-- Disable AWS S3 Remote Storage & Delete Local Data -->
6467
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logoutFromAdmin"/>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportDownloadableProductsWithFileLinksTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteImportImagesFilesDirectoryS3" after="deleteImportFilesDirectoryS3">
7676
<argument name="path">var/import/images/{{ImportProduct_Downloadable_FileLinks.name}}</argument>
7777
</helper>
78+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache" after="deleteImportImagesFilesDirectoryS3">
79+
<argument name="tags" value=""/>
80+
</actionGroup>
7881

7982
<!-- Disable AWS S3 Remote Storage & Delete Local Data -->
8083
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logoutFromAdmin"/>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportDownloadableProductsWithUrlLinksTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteImportImagesFilesDirectoryS3" after="deleteImportFilesDirectoryS3">
6060
<argument name="path">var/import/images/{{ImportProduct_Downloadable_UrlLinks.name}}</argument>
6161
</helper>
62+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache" after="deleteImportImagesFilesDirectoryS3">
63+
<argument name="tags" value=""/>
64+
</actionGroup>
6265

6366
<!-- Disable AWS S3 Remote Storage & Delete Local Data -->
6467
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logoutFromAdmin"/>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportGroupedProductTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteImportImagesFilesDirectoryS3" after="deleteImportFilesDirectoryS3">
6060
<argument name="path">var/import/images/{{ImportProduct_Grouped.name}}</argument>
6161
</helper>
62+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache" after="deleteImportImagesFilesDirectoryS3">
63+
<argument name="tags" value=""/>
64+
</actionGroup>
6265

6366
<!-- Disable AWS S3 Remote Storage & Delete Local Data -->
6467
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logoutFromAdmin"/>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportSimpleAndConfigurableProductsWithAssignedImagesTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteImportImagesFilesDirectoryS3" after="deleteImportFilesDirectoryS3">
6161
<argument name="path">var/import/images/{{ImportProduct_Configurable.name}}</argument>
6262
</helper>
63+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache" after="deleteImportImagesFilesDirectoryS3">
64+
<argument name="tags" value=""/>
65+
</actionGroup>
6366

6467
<!-- Disable AWS S3 Remote Storage & Delete Local Data -->
6568
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logoutFromAdmin"/>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3ImportSimpleProductImagesDuplicationTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
<helper class="Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method="deleteDirectory" stepKey="deleteImportImagesFilesDirectoryS3" after="deleteImportFilesDirectoryS3">
5959
<argument name="path">var/import/images/test_image_duplication</argument>
6060
</helper>
61+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache" after="deleteImportImagesFilesDirectoryS3">
62+
<argument name="tags" value=""/>
63+
</actionGroup>
6164

6265
<!-- Disable AWS S3 Remote Storage & Delete Local Data -->
6366
<magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logoutFromAdmin"/>

‎app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminCreateDownloadableProductWithLinkTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
4545
<argument name="product" value="DownloadableProduct"/>
4646
</actionGroup>
47+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
4748

4849
<!-- Log out -->
4950
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/AwsS3/composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
"require": {
88
"php": "~7.4.0||~8.1.0",
99
"magento/framework": "*",
10-
"magento/module-remote-storage": "*",
11-
"league/flysystem": "^2.0",
12-
"league/flysystem-aws-s3-v3": "^2.0"
10+
"magento/module-remote-storage": "*"
1311
},
1412
"type": "magento2-module",
1513
"license": [

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClearGridFiltersActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<description>Click the Clear filters on the grid.</description>
1414
</annotations>
1515

16-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
16+
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
1717
<waitForPageLoad stepKey="waitForPageLoaded"/>
1818
</actionGroup>
1919
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/Section/AdminConfirmationModalSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<element name="title" type="text" selector="aside.confirm .modal-title"/>
1313
<element name="message" type="text" selector="aside.confirm .modal-content"/>
1414
<element name="cancel" type="button" selector="aside.confirm .modal-footer button.action-dismiss" timeout="30"/>
15-
<element name="ok" type="button" selector="aside.confirm .modal-footer button.action-accept" timeout="60"/>
15+
<element name="ok" type="button" selector="aside.confirm .modal-footer button.action-accept" timeout="120"/>
1616
</section>
1717
</sections>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView10">
5858
<argument name="customStore" value="storeViewData7"/>
5959
</actionGroup>
60+
<magentoCron groups="index" stepKey="reindex"/>
6061

6162
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
6263
</after>
@@ -92,6 +93,7 @@
9293
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView10">
9394
<argument name="customStore" value="storeViewData7"/>
9495
</actionGroup>
96+
<magentoCron groups="index" stepKey="reindex"/>
9597

9698
<!--Navigate to Product attribute page-->
9799
<actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="navigateToNewProductAttributePage"/>

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminBackupDeleteActionGroup.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,20 @@
1616
<argument name="backup"/>
1717
</arguments>
1818

19-
<see selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="seeBackupInGrid"/>
19+
<waitForElementVisible selector="{{AdminGridTableSection.backupTypeByName(backup.name)}}" stepKey="seeBackupInGrid"/>
20+
<executeJS function="return document.evaluate(&quot;{{AdminGridTableSection.backupTypeByName(backup.name)}}&quot;, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null).snapshotLength-1" stepKey="expectedDatabaseBackupCount"/>
2021
<click selector="{{AdminGridTableSection.backupRowCheckbox(backup.name)}}" stepKey="selectBackupRow"/>
2122
<selectOption selector="{{AdminGridActionSection.actionSelect}}" userInput="Delete" stepKey="selectDeleteAction"/>
2223
<click selector="{{AdminGridActionSection.submitButton}}" stepKey="clickSubmit"/>
2324
<waitForPageLoad stepKey="waitForConfirmWindowToAppear"/>
2425
<see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to delete the selected backup(s)?" stepKey="seeConfirmationModal"/>
2526
<waitForPageLoad stepKey="waitForSubmitAction"/>
2627
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOkConfirmDelete"/>
27-
<dontSee selector="{{AdminGridTableSection.backupNameColumn}}" userInput="{{backup.name}}" stepKey="dontSeeBackupInGrid"/>
28+
<executeJS function="return document.evaluate(&quot;{{AdminGridTableSection.backupTypeByName(backup.name)}}&quot;, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null).snapshotLength" stepKey="resultingDatabaseBackupCount"/>
29+
<assertEquals stepKey="assertDatabaseBackupDeleted">
30+
<actualResult type="variable">$resultingDatabaseBackupCount</actualResult>
31+
<expectedResult type="variable">$expectedDatabaseBackupCount</expectedResult>
32+
</assertEquals>
33+
<comment userInput="BIC workaround" stepKey="dontSeeBackupInGrid"/>
2834
</actionGroup>
2935
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteBundleProductBySku">
3737
<argument name="sku" value="{{BundleProduct.sku}}"/>
3838
</actionGroup>
39+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
3940
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4041
</after>
4142

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAssociateBundleProductToWebsitesTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<argument name="StoreGroup" value="SecondStoreGroupUnique"/>
6464
<argument name="customStore" value="SecondStoreUnique"/>
6565
</actionGroup>
66+
<magentoCron groups="index" stepKey="reindex2"/>
6667
</before>
6768
<after>
6869
<!-- Disabled Store URLs -->
@@ -77,6 +78,7 @@
7778
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
7879
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
7980
</actionGroup>
81+
<magentoCron groups="index" stepKey="reindex"/>
8082

8183
<actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridFilter"/>
8284

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<actionGroup ref="DeleteAttributeSetByLabelActionGroup" stepKey="deleteAttributeSet2">
2929
<argument name="label" value="{{ProductAttributeFrontendLabelTwo.label}}"/>
3030
</actionGroup>
31+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
32+
<argument name="indices" value=""/>
33+
</actionGroup>
3134
<actionGroup ref="AdminClearGridFiltersActionGroup" stepKey="clearGridFilters"/>
3235
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3336
</after>
@@ -39,7 +42,7 @@
3942
<!--Go to product creation page-->
4043
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
4144
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
42-
45+
4346
<!--Enable/Disable Toggle-->
4447
<checkOption selector="{{AdminProductFormBundleSection.enableDisableToggle}}" stepKey="clickOnEnableDisableToggle"/>
4548

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductOptionsNegativeTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<before>
2626
<!-- Create a Website -->
2727
<createData entity="customWebsite" stepKey="createWebsite"/>
28+
<magentoCron groups="index" stepKey="reindex"/>
2829

2930
<!-- Create first simple product for a bundle option -->
3031
<createData entity="SimpleProduct2" stepKey="createFirstSimpleProduct"/>
@@ -46,6 +47,7 @@
4647
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
4748
<argument name="websiteName" value="Second Website"/>
4849
</actionGroup>
50+
<magentoCron groups="index" stepKey="reindex"/>
4951

5052
<!-- Log out -->
5153
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -119,5 +121,6 @@
119121
<actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
120122
<argument name="product" value="BundleProduct"/>
121123
</actionGroup>
124+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
122125
</test>
123126
</tests>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductSettingsTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<before>
2222
<!-- Create a Website -->
2323
<createData entity="customWebsite" stepKey="createWebsite"/>
24+
<magentoCron groups="index" stepKey="reindex"/>
2425

2526
<!-- Create a simple product for a bundle option -->
2627
<createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
@@ -36,6 +37,7 @@
3637
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
3738
<argument name="websiteName" value="Second Website"/>
3839
</actionGroup>
40+
<magentoCron groups="index" stepKey="reindex"/>
3941

4042
<!-- Log out -->
4143
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -140,6 +142,7 @@
140142
<actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
141143
<argument name="product" value="BundleProduct"/>
142144
</actionGroup>
145+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
143146
</test>
144147
</tests>
145148

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicPriceProductTest.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@
4848
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteBundleProductBySku">
4949
<argument name="sku" value="$createDynamicBundleProduct.sku$"/>
5050
</actionGroup>
51+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
5152
<!-- Verify product on Product Page -->
52-
<amOnPage url="{{StorefrontProductPage.url($createDynamicBundleProduct.custom_attributes[url_key]$)}}" stepKey="openBundleProductPage"/>
53+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openBundleProductPage">
54+
<argument name="productUrl" value="$$createDynamicBundleProduct.custom_attributes[url_key]$$"/>
55+
</actionGroup>
5356
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeWhoopsMessage">
5457
<argument name="value" value="Whoops, our bad..."/>
5558
</actionGroup>
@@ -59,7 +62,9 @@
5962
</actionGroup>
6063
<!-- Should not see bundle product -->
6164
<dontSee userInput="$createDynamicBundleProduct.sku$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
62-
<amOnPage url="{{StorefrontCategoryPage.url($createCategory.custom_attributes[url_key]$)}}" stepKey="openCategoryPage"/>
65+
<actionGroup ref="StorefrontNavigateToCategoryUrlActionGroup" stepKey="openCategoryPage">
66+
<argument name="categoryUrl" value="$$createCategory.custom_attributes[url_key]$$"/>
67+
</actionGroup>
6368
<!-- Should not see any products in category -->
6469
<dontSee userInput="$createDynamicBundleProduct.name$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
6570
<see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<argument name="product" value="$$createDynamicBundleProduct$$"/>
3838
</actionGroup>
3939
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
40+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
4041
<!-- Verify product on Product Page -->
4142
<amOnPage url="{{StorefrontProductPage.url($$createDynamicBundleProduct.custom_attributes[url_key]$$)}}" stepKey="amOnBundleProductPage"/>
4243
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeWhoops">

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<argument name="product" value="$$createFixedBundleProduct$$"/>
3434
</actionGroup>
3535
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
36+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
3637
<!-- Verify product on Product Page -->
3738
<amOnPage url="{{StorefrontProductPage.url($$createFixedBundleProduct.custom_attributes[url_key]$$)}}" stepKey="amOnBundleProductPage"/>
3839
<actionGroup ref="AssertStorefrontProductInfoMainProductNameActionGroup" stepKey="seeWhoops">

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<actionGroup stepKey="deleteBundle" ref="DeleteProductUsingProductGridActionGroup">
3131
<argument name="product" value="BundleProduct"/>
3232
</actionGroup>
33+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
3334
<!--Logging out-->
3435
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3536
<deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteBundleProduct">
3030
<argument name="sku" value="{{BundleProduct.sku}}"/>
3131
</actionGroup>
32+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
3233
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3334
<deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
3435
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@
3535
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteBundleProduct">
3636
<argument name="sku" value="{{BundleProduct.sku}}"/>
3737
</actionGroup>
38+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearFilters"/>
3839
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3940
</after>
4041
<!--Go to bundle product creation page-->
4142
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
4243
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
43-
44+
4445
<!-- Add two bundle items -->
4546
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
4647
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>

0 commit comments

Comments
 (0)