Skip to content

Commit c5e5d24

Browse files
RomaKisRomaKis
committed
Merge remote-tracking branch 'origin/MAGETWO-56349' into 2.2-develop-pr11
2 parents d636119 + 204ac34 commit c5e5d24

File tree

12 files changed

+485
-3
lines changed

12 files changed

+485
-3
lines changed

‎app/code/Magento/Newsletter/Model/Queue.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Newsletter\Model;
77

88
use Magento\Framework\App\TemplateTypesInterface;
9+
use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
910

1011
/**
1112
* Newsletter queue model.
@@ -109,6 +110,13 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
109110
*/
110111
protected $_transportBuilder;
111112

113+
/**
114+
* Timezone library.
115+
*
116+
* @var TimezoneInterface
117+
*/
118+
private $timezone;
119+
112120
/**
113121
* @param \Magento\Framework\Model\Context $context
114122
* @param \Magento\Framework\Registry $registry
@@ -121,6 +129,7 @@ class Queue extends \Magento\Framework\Model\AbstractModel implements TemplateTy
121129
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
122130
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
123131
* @param array $data
132+
* @param TimezoneInterface $timezone
124133
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
125134
*/
126135
public function __construct(
@@ -134,7 +143,8 @@ public function __construct(
134143
\Magento\Newsletter\Model\Queue\TransportBuilder $transportBuilder,
135144
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
136145
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
137-
array $data = []
146+
array $data = [],
147+
TimezoneInterface $timezone = null
138148
) {
139149
parent::__construct(
140150
$context,
@@ -149,6 +159,9 @@ public function __construct(
149159
$this->_problemFactory = $problemFactory;
150160
$this->_subscribersCollection = $subscriberCollectionFactory->create();
151161
$this->_transportBuilder = $transportBuilder;
162+
$this->timezone = $timezone ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
163+
TimezoneInterface::class
164+
);
152165
}
153166

154167
/**
@@ -183,8 +196,7 @@ public function setQueueStartAtByString($startAt)
183196
if ($startAt === null || $startAt == '') {
184197
$this->setQueueStartAt(null);
185198
} else {
186-
$time = (new \DateTime($startAt))->getTimestamp();
187-
$this->setQueueStartAt($this->_date->gmtDate(null, $time));
199+
$this->setQueueStartAt($this->timezone->convertConfigTimeToUtc($startAt));
188200
}
189201
return $this;
190202
}

‎dev/tests/functional/tests/app/Magento/Newsletter/Test/Block/Adminhtml/Queue/Edit/QueueForm.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<mapping strict="0">
9+
<fields>
10+
<queue_start_at>
11+
<selector>input[name='start_at']</selector>
12+
</queue_start_at>
13+
<stores>
14+
<selector>select[name="stores[]"]</selector>
15+
<input>multiselectgrouplist</input>
16+
</stores>
17+
<newsletter_subject>
18+
<selector>input[name='subject']</selector>
19+
</newsletter_subject>
20+
<newsletter_sender_name>
21+
<selector>input[name='sender_name']</selector>
22+
</newsletter_sender_name>
23+
<newsletter_sender_email>
24+
<selector>input[name='sender_email']</selector>
25+
</newsletter_sender_email>
26+
<newsletter_text>
27+
<selector>textarea[name='text']</selector>
28+
</newsletter_text>
29+
<newsletter_styles>
30+
<selector>textarea[name='styles']</selector>
31+
</newsletter_styles>
32+
</fields>
33+
</mapping>

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Newsletter\Test\Block\Adminhtml\Queue;
8+
9+
use Magento\Mtf\Client\Locator;
10+
11+
/**
12+
* Newsletter queue templates grid block.
13+
*/
14+
class Grid extends \Magento\Backend\Test\Block\Widget\Grid
15+
{
16+
/**
17+
* Filters array mapping.
18+
*
19+
* @var array
20+
*/
21+
protected $filters = [
22+
'newsletter_subject' => [
23+
'selector' => 'input[name="newsletter_subject"]',
24+
],
25+
'start_at_from' => [
26+
'selector' => 'input[name="start_at[from]"]',
27+
],
28+
'start_at_to' => [
29+
'selector' => 'input[name="start_at[to]"]',
30+
],
31+
];
32+
33+
/**
34+
* Locator value for link in action column.
35+
*
36+
* @var string
37+
*/
38+
protected $editLink = 'td.col-subject';
39+
40+
/**
41+
* Locator for "Action".
42+
*
43+
* @var string
44+
*/
45+
private $action = '.col-actions [class*="control-select"]';
46+
47+
/**
48+
* Action for newsletter queue template.
49+
*
50+
* @param string $action
51+
* @return void
52+
*/
53+
public function performAction($action)
54+
{
55+
$this->_rootElement->find($this->action, Locator::SELECTOR_CSS, 'select')->setValue($action);
56+
}
57+
}

‎dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueForm.php

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Newsletter\Test\Constraint;
8+
9+
use Magento\Mtf\Constraint\AbstractAssertForm;
10+
use Magento\Newsletter\Test\Fixture\Queue;
11+
use Magento\Newsletter\Test\Page\Adminhtml\TemplateQueue;
12+
use Magento\Newsletter\Test\Page\Adminhtml\TemplateQueueIndex;
13+
14+
/**
15+
* Assert that Newsletter Queue form data equal the fixture data.
16+
*/
17+
class AssertNewsletterQueueForm extends AbstractAssertForm
18+
{
19+
/**
20+
* Assert that Newsletter Queue form data equal the fixture data.
21+
*
22+
* @param TemplateQueueIndex $indexQueue
23+
* @param TemplateQueue $templateQueue
24+
* @param Queue $queue
25+
* @return void
26+
*/
27+
public function processAssert(
28+
TemplateQueueIndex $indexQueue,
29+
TemplateQueue $templateQueue,
30+
Queue $queue
31+
) {
32+
$indexQueue->open();
33+
$indexQueue->getQueueTemplateGrid()->searchAndOpen(['newsletter_subject' => $queue->getNewsletterSubject()]);
34+
35+
$dataDiff = $this->verifyData($queue->getData(), $templateQueue->getEditForm()->getData($queue));
36+
\PHPUnit_Framework_Assert::assertEmpty($dataDiff, $dataDiff);
37+
}
38+
39+
/**
40+
* {@inheritdoc}
41+
*/
42+
public function toString()
43+
{
44+
return 'Newsletter Queue form data equal the fixture data.';
45+
}
46+
}

‎dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueInGrid.php

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Newsletter\Test\Constraint;
8+
9+
use Magento\Mtf\Constraint\AbstractAssertForm;
10+
use Magento\Newsletter\Test\Fixture\Queue;
11+
use Magento\Newsletter\Test\Page\Adminhtml\TemplateQueueIndex;
12+
13+
/**
14+
* Assert that Newsletter Queue is present in grid.
15+
*/
16+
class AssertNewsletterQueueInGrid extends AbstractAssertForm
17+
{
18+
/**
19+
* Assert that Newsletter Queue is present in grid.
20+
*
21+
* @param TemplateQueueIndex $indexQueue
22+
* @param Queue $queue
23+
* @return void
24+
*/
25+
public function processAssert(
26+
TemplateQueueIndex $indexQueue,
27+
Queue $queue
28+
) {
29+
$startAt = strftime("%b %e, %Y", strtotime($queue->getQueueStartAt()));
30+
$filter = [
31+
'newsletter_subject' => $queue->getNewsletterSubject(),
32+
'start_at_from' => $startAt,
33+
'start_at_to' => $startAt,
34+
];
35+
36+
$indexQueue->open();
37+
$indexQueue->getQueueTemplateGrid()->search(['newsletter_subject' => $queue->getNewsletterSubject()]);
38+
39+
\PHPUnit_Framework_Assert::assertTrue(
40+
$indexQueue->getQueueTemplateGrid()->isRowVisible($filter, false, false),
41+
'Newsletter Queue \'' . $queue->getNewsletterSubject() . '\' is absent in grid.'
42+
);
43+
}
44+
45+
/**
46+
* {@inheritdoc}
47+
*/
48+
public function toString()
49+
{
50+
return 'Newsletter Queue is present in grid.';
51+
}
52+
}

‎dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueueSaveMessage.php

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Newsletter\Test\Constraint;
8+
9+
use Magento\Mtf\Constraint\AbstractAssertForm;
10+
use Magento\Newsletter\Test\Page\Adminhtml\TemplateQueueIndex;
11+
12+
/**
13+
* Assert that Newsletter Queue success save message is present.
14+
*/
15+
class AssertNewsletterQueueSaveMessage extends AbstractAssertForm
16+
{
17+
/**
18+
* Text value to be checked.
19+
*/
20+
const SUCCESS_MESSAGE = 'You saved the newsletter queue.';
21+
22+
/**
23+
* Assert that Newsletter Queue success save message is present.
24+
*
25+
* @param TemplateQueueIndex $indexQueue
26+
* @return void
27+
*/
28+
public function processAssert(
29+
TemplateQueueIndex $indexQueue
30+
) {
31+
$actualMessages = $indexQueue->getMessagesBlock()->getSuccessMessages();
32+
\PHPUnit_Framework_Assert::assertContains(
33+
self::SUCCESS_MESSAGE,
34+
$actualMessages,
35+
'Wrong success message is displayed.'
36+
. "\nExpected: " . self::SUCCESS_MESSAGE
37+
. "\nActual:\n" . implode("\n - ", $actualMessages)
38+
);
39+
}
40+
41+
/**
42+
* {@inheritdoc}
43+
*/
44+
public function toString()
45+
{
46+
return 'Newsletter Queue success save message is present.';
47+
}
48+
}

‎dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Queue.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
9+
<fixture name="queue"
10+
module="Magento_Newsletter"
11+
type="flat"
12+
entity_type="newsletter_queue"
13+
collection="Magento\Newsletter\Model\ResourceModel\Queue\Collection"
14+
identifier="queue_id"
15+
repository_class="Magento\Newsletter\Test\Repository\Queue"
16+
handler_interface="Magento\Newsletter\Test\Handler\Template\QueueInterface"
17+
class="Magento\Newsletter\Test\Fixture\Queue">
18+
<field name="queue_id" is_required="1" />
19+
<field name="template_id" is_required="1" />
20+
<field name="newsletter_type" is_required="" />
21+
<field name="newsletter_text" is_required="" />
22+
<field name="newsletter_styles" is_required="" />
23+
<field name="newsletter_subject" is_required="" />
24+
<field name="newsletter_sender_name" is_required="" />
25+
<field name="newsletter_sender_email" is_required="" />
26+
<field name="queue_status" is_required="1" />
27+
<field name="queue_start_at" is_required="" source="Magento\Backend\Test\Fixture\Source\Date" />
28+
<field name="queue_finish_at" is_required="" source="Magento\Backend\Test\Fixture\Source\Date" />
29+
<field name="stores" is_required="1" source="Magento\Newsletter\Test\Fixture\Queue\Stores"/>
30+
</fixture>
31+
</config>

‎dev/tests/functional/tests/app/Magento/Newsletter/Test/Fixture/Queue/Stores.php

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Newsletter\Test\Fixture\Queue;
8+
9+
use Magento\Mtf\Fixture\DataSource;
10+
use Magento\Mtf\Fixture\FixtureFactory;
11+
12+
/**
13+
* Data source for 'stores' field.
14+
*
15+
* Data keys:
16+
* - dataset
17+
*/
18+
class Stores extends DataSource
19+
{
20+
/**
21+
* Array with store fixtures.
22+
*
23+
* @var array
24+
*/
25+
private $stores;
26+
27+
/**
28+
* @constructor
29+
* @param FixtureFactory $fixtureFactory
30+
* @param array $params
31+
* @param array $data [optional]
32+
*/
33+
public function __construct(FixtureFactory $fixtureFactory, array $params, array $data = [])
34+
{
35+
$this->params = $params;
36+
if (isset($data['dataset'])) {
37+
$datasets = is_array($data['dataset']) ? $data['dataset'] : [$data['dataset']];
38+
foreach ($datasets as $dataset) {
39+
/** @var \Magento\Store\Test\Fixture\Store $store */
40+
$store = $fixtureFactory->createByCode('store', ['dataset' => $dataset]);
41+
if (!$store->hasData('store_id')) {
42+
$store->persist();
43+
}
44+
$this->stores[] = $store;
45+
$this->data[] = $store->getGroupId() . '/' . $store->getName();
46+
}
47+
}
48+
}
49+
50+
/**
51+
* Return stores.
52+
*
53+
* @return array
54+
*/
55+
public function getStores()
56+
{
57+
return $this->stores;
58+
}
59+
}

0 commit comments

Comments
 (0)