Skip to content

Commit a49b71c

Browse files
committed
MAGETWO-56349: [GITHUB] Newsletter Queue doesn't set to local time #5943 #2937 #7560
1 parent f746b83 commit a49b71c

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Queue/Grid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
3636
*
3737
* @var string
3838
*/
39-
protected $action = '.col-actions [class*="control-select"]';
39+
private $action = '.col-actions [class*="control-select"]';
4040

4141
/**
4242
* Action for newsletter queue template.

dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueDateStart.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ public function processAssert(
3232
string $date
3333
) {
3434
$indexQueue->open();
35+
$indexQueue->getQueueTemplateGrid()->searchAndOpen(['newsletter_subject' => $newsletter->getSubject()]);
36+
$templateQueue->getEditForm()->setDateStart($date);
37+
$templateQueue->getFormPageActions()->save();
38+
$indexQueue->getMessagesBlock()->assertSuccessMessage();
39+
3540
$indexQueue->getQueueTemplateGrid()->searchAndOpen(['newsletter_subject' => $newsletter->getSubject()]);
3641
\PHPUnit_Framework_Assert::assertEquals(
3742
$date,

dev/tests/functional/tests/app/Magento/Newsletter/Test/Page/Adminhtml/TemplateQueueIndex.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
99
<page name="TemplateQueueIndex" area="Adminhtml" mca="newsletter/queue/index" module="Magento_Newsletter">
1010
<block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
11-
<block name="gridPageActions" class="Magento\Newsletter\Test\Block\Adminhtml\Template\GridPageActions" locator=".page-main-actions" strategy="css selector"/>
1211
<block name="queueTemplateGrid" class="Magento\Newsletter\Test\Block\Adminhtml\Queue\Grid" locator="[id='page:main-container']" strategy="css selector"/>
1312
</page>
1413
</config>

dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateQueueStartDateTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function __inject(
8181
* @param string $date
8282
* @return void
8383
*/
84-
public function test(Template $newsletter, $date)
84+
public function test(Template $newsletter)
8585
{
8686
// Preconditions
8787
$newsletter->persist();
@@ -90,8 +90,6 @@ public function test(Template $newsletter, $date)
9090
$this->templateIndex->open();
9191
$this->templateIndex->getNewsletterTemplateGrid()->search(['code' => $newsletter->getCode()]);
9292
$this->templateIndex->getNewsletterTemplateGrid()->performAction('Queue Newsletter');
93-
$this->templateQueue->getEditForm()->setDateStart($date);
9493
$this->templateQueue->getFormPageActions()->save();
95-
$this->indexQueue->getMessagesBlock()->assertSuccessMessage();
9694
}
9795
}

0 commit comments

Comments
 (0)