Skip to content

Commit 5c3867e

Browse files
rganinrganin
authored
Merge pull request #7516 from magento-arcticfoxes/foxes-pr
Foxes pr
2 parents 2a774fc + 39cc656 commit 5c3867e

File tree

505 files changed

+1405
-545
lines changed

Some content is hidden

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

505 files changed

+1405
-545
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/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>

0 commit comments

Comments
 (0)