diff --git a/assets/js/src/newsletters/listings/standard.jsx b/assets/js/src/newsletters/listings/standard.jsx index 6fc2d02df0..021d0ba92e 100644 --- a/assets/js/src/newsletters/listings/standard.jsx +++ b/assets/js/src/newsletters/listings/standard.jsx @@ -119,7 +119,7 @@ let newsletter_actions = [ ) { window.location.href = `?page=mailpoet-newsletter-editor&id=${ newsletter.id }`; } - } + }, }, { name: 'duplicate', diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx index 916d5ec1ea..5094aab958 100644 --- a/assets/js/src/newsletters/send.jsx +++ b/assets/js/src/newsletters/send.jsx @@ -162,8 +162,8 @@ define( endpoint: 'sendingQueue', action: 'resume', data: { - newsletter_id: this.state.item.id - } + newsletter_id: this.state.item.id, + }, }).done(() => { this.context.router.push(`/${ this.state.item.type || '' }`); MailPoet.Notice.success( diff --git a/tests/unit/API/JSON/v1/NewslettersTest.php b/tests/unit/API/JSON/v1/NewslettersTest.php index 818499414e..7997da2d69 100644 --- a/tests/unit/API/JSON/v1/NewslettersTest.php +++ b/tests/unit/API/JSON/v1/NewslettersTest.php @@ -166,7 +166,7 @@ class NewslettersTest extends \MailPoetTest { function testItCanClearRenderedQueueUponSave() { $sending_queue = SendingQueue::create(); - $sending_queue->newsletter_id = 1; + $sending_queue->newsletter_id = $this->newsletter->id; $sending_queue->status = SendingQueue::STATUS_SCHEDULED; $sending_queue->newsletter_rendered_body = 'Rendered body ...'; $sending_queue->newsletter_rendered_subject = 'Rendered subject ...'; @@ -179,11 +179,14 @@ class NewslettersTest extends \MailPoetTest { ); $response = $router->save($newsletter_data); - $updated_newsletter = Newsletter::findOne($this->newsletter->id); - $updated_queue = $updated_newsletter->getQueue(); + $updated_newsletter = Newsletter::findOne($this->newsletter->id) + ->withSendingQueue() + ->asArray(); + $updated_queue = $updated_newsletter['queue']; + expect($response->status)->equals(APIResponse::STATUS_OK); - expect(unserialize($updated_queue->newsletter_rendered_body))->equals(null); - expect(unserialize($updated_queue->newsletter_rendered_subject))->equals(null); + expect(unserialize($updated_queue['newsletter_rendered_body']))->equals(null); + expect(unserialize($updated_queue['newsletter_rendered_subject']))->equals(null); } function testItCanUpdatePostNotificationScheduleUponSave() {