Skip to content

Commit f457cf0

Browse files
Merge remote-tracking branch 'remotes/github/MAGETWO-98703' into EPAM-PR-85
2 parents ea73279 + ac52c3e commit f457cf0

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

app/code/Magento/CatalogImportExport/Test/Mftf/ActionGroup/AdminExportActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<wait stepKey="waitForScroll" time="5"/>
4242
<click selector="{{AdminExportAttributeSection.continueBtn}}" stepKey="clickContinueButton"/>
4343
<wait stepKey="waitForClick" time="5"/>
44-
<see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon" stepKey="seeSuccessMessage"/>
44+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="Message is added to queue, wait to get your file soon. Make sure your cron job is running to export the file" stepKey="seeSuccessMessage"/>
4545
</actionGroup>
4646

4747
<!-- Download first file in the grid -->

app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\ImportExport\Controller\Adminhtml\Export;
79

810
use Magento\Backend\App\Action\Context;
@@ -90,7 +92,10 @@ public function execute()
9092

9193
$this->messagePublisher->publish('import_export.export', $dataObject);
9294
$this->messageManager->addSuccessMessage(
93-
__('Message is added to queue, wait to get your file soon')
95+
__(
96+
'Message is added to queue, wait to get your file soon.'
97+
. ' Make sure your cron job is running to export the file'
98+
)
9499
);
95100
} catch (\Exception $e) {
96101
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);

app/code/Magento/ImportExport/i18n/en_US.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,6 @@ Summary,Summary
123123
"New product data is added to existing product data entries in the database. All fields except SKU can be updated.","New product data is added to existing product data entries in the database. All fields except SKU can be updated."
124124
"All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>","All existing product data is replaced with the imported new data. <b>Exercise caution when replacing data. All existing product data will be completely cleared and all references in the system will be lost.</b>"
125125
"Any entities in the import data that match existing entities in the database are deleted from the database.","Any entities in the import data that match existing entities in the database are deleted from the database."
126+
"Message is added to queue, wait to get your file soon. Make sure your cron job is running to export the file","Message is added to queue, wait to get your file soon. Make sure your cron job is running to export the file"
126127
"Invalid data","Invalid data"
127-
"Invalid response","Invalid response"
128+
"Invalid response","Invalid response"

dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertExportSubmittedMessage.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ class AssertExportSubmittedMessage extends AbstractConstraint
1616
/**
1717
* Text value to be checked.
1818
*/
19-
const MESSAGE = 'Message is added to queue, wait to get your file soon';
19+
const MESSAGE = 'Message is added to queue, wait to get your file soon.'
20+
. ' Make sure your cron job is running to export the file';
2021

2122
/**
2223
* Assert that export submitted message is visible after exporting.

0 commit comments

Comments
 (0)