Convert variable names to camel case
[MAILPOET-1796]
This commit is contained in:
@@ -19,27 +19,27 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
$this->queue->newsletter_id = 1;
|
||||
$this->queue->save();
|
||||
|
||||
$this->rendered_body = [
|
||||
$this->renderedBody = [
|
||||
'html' => 'some html',
|
||||
'text' => 'some text',
|
||||
];
|
||||
}
|
||||
|
||||
public function testItChecksProcessedSubscribersForOldQueues() {
|
||||
$subscriber_id = 123;
|
||||
expect($this->queue->isSubscriberProcessed($subscriber_id))->false();
|
||||
$this->queue->subscribers = ['processed' => [$subscriber_id]];
|
||||
expect($this->queue->isSubscriberProcessed($subscriber_id))->true();
|
||||
$subscriberId = 123;
|
||||
expect($this->queue->isSubscriberProcessed($subscriberId))->false();
|
||||
$this->queue->subscribers = ['processed' => [$subscriberId]];
|
||||
expect($this->queue->isSubscriberProcessed($subscriberId))->true();
|
||||
}
|
||||
|
||||
public function testItChecksProcessedSubscribersForNewQueues() {
|
||||
$subscriber_id = 123;
|
||||
$subscriberId = 123;
|
||||
$queue = SendingTask::create();
|
||||
$queue->setSubscribers([$subscriber_id]);
|
||||
$queue->setSubscribers([$subscriberId]);
|
||||
$queue->save();
|
||||
expect($queue->isSubscriberProcessed($subscriber_id))->false();
|
||||
$queue->updateProcessedSubscribers([$subscriber_id]);
|
||||
expect($queue->isSubscriberProcessed($subscriber_id))->true();
|
||||
expect($queue->isSubscriberProcessed($subscriberId))->false();
|
||||
$queue->updateProcessedSubscribers([$subscriberId]);
|
||||
expect($queue->isSubscriberProcessed($subscriberId))->true();
|
||||
}
|
||||
|
||||
public function testItReadsSerializedRenderedNewsletterBody() {
|
||||
@@ -48,7 +48,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
'html' => 'html',
|
||||
'text' => 'text',
|
||||
];
|
||||
$queue->newsletter_rendered_body = serialize($data);
|
||||
$queue->newsletterRenderedBody = serialize($data);
|
||||
expect($queue->getNewsletterRenderedBody())->equals($data);
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
'html' => 'html',
|
||||
'text' => 'text',
|
||||
];
|
||||
$queue->newsletter_rendered_body = json_encode($data);
|
||||
$queue->newsletterRenderedBody = json_encode($data);
|
||||
expect($queue->getNewsletterRenderedBody())->equals($data);
|
||||
}
|
||||
|
||||
@@ -68,17 +68,17 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
'html' => 'html',
|
||||
'text' => 'text',
|
||||
];
|
||||
$queue->task_id = 0;
|
||||
$queue->newsletter_id = 1;
|
||||
$queue->newsletter_rendered_body = $data;
|
||||
$queue->taskId = 0;
|
||||
$queue->newsletterId = 1;
|
||||
$queue->newsletterRenderedBody = $data;
|
||||
$queue->save();
|
||||
|
||||
$queue = SendingQueue::findOne($queue->id);
|
||||
|
||||
/** @var string queue_newsletter_rendered_body */
|
||||
$queue_newsletter_rendered_body = $queue->newsletter_rendered_body;
|
||||
expect(Helpers::isJson($queue_newsletter_rendered_body))->true();
|
||||
expect(json_decode($queue_newsletter_rendered_body, true))->equals($data);
|
||||
$queueNewsletterRenderedBody = $queue->newsletterRenderedBody;
|
||||
expect(Helpers::isJson($queueNewsletterRenderedBody))->true();
|
||||
expect(json_decode($queueNewsletterRenderedBody, true))->equals($data);
|
||||
}
|
||||
|
||||
public function testItJsonEncodesMetaWhenSaving() {
|
||||
@@ -86,8 +86,8 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
$meta = [
|
||||
'some' => 'value',
|
||||
];
|
||||
$queue->task_id = 0;
|
||||
$queue->newsletter_id = 1;
|
||||
$queue->taskId = 0;
|
||||
$queue->newsletterId = 1;
|
||||
$queue->meta = $meta;
|
||||
$queue->save();
|
||||
|
||||
@@ -100,8 +100,8 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
public function testItDoesNotJsonEncodesMetaEqualToNull() {
|
||||
$queue = SendingQueue::create();
|
||||
$meta = null;
|
||||
$queue->task_id = 0;
|
||||
$queue->newsletter_id = 1;
|
||||
$queue->taskId = 0;
|
||||
$queue->newsletterId = 1;
|
||||
$queue->meta = $meta;
|
||||
$queue->save();
|
||||
|
||||
@@ -113,23 +113,23 @@ class SendingQueueTest extends \MailPoetTest {
|
||||
|
||||
public function testItReencodesSerializedObjectToJsonEncoded() {
|
||||
$queue = $this->queue;
|
||||
$newsletter_rendered_body = $this->rendered_body;
|
||||
$newsletterRenderedBody = $this->renderedBody;
|
||||
|
||||
// update queue with a serialized rendered newsletter body
|
||||
ORM::rawExecute(
|
||||
'UPDATE `' . SendingQueue::$_table . '` SET `newsletter_rendered_body` = ? WHERE `id` = ?',
|
||||
[
|
||||
serialize($newsletter_rendered_body),
|
||||
serialize($newsletterRenderedBody),
|
||||
$queue->id,
|
||||
]
|
||||
);
|
||||
$sending_queue = SendingQueue::findOne($queue->id);
|
||||
expect($sending_queue->newsletter_rendered_body)->equals(serialize($newsletter_rendered_body));
|
||||
$sendingQueue = SendingQueue::findOne($queue->id);
|
||||
expect($sendingQueue->newsletterRenderedBody)->equals(serialize($newsletterRenderedBody));
|
||||
|
||||
// re-saving the queue will re-rencode the body using json_encode()
|
||||
$sending_queue->save();
|
||||
$sending_queue = SendingQueue::findOne($queue->id);
|
||||
expect($sending_queue->newsletter_rendered_body)->equals(json_encode($newsletter_rendered_body));
|
||||
$sendingQueue->save();
|
||||
$sendingQueue = SendingQueue::findOne($queue->id);
|
||||
expect($sendingQueue->newsletterRenderedBody)->equals(json_encode($newsletterRenderedBody));
|
||||
}
|
||||
|
||||
public function _after() {
|
||||
|
Reference in New Issue
Block a user