Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add test and remove redundant call

Browse Source 
[MAILPOET-1560]
This commit is contained in:
Pavel Dohnal
2018-11-12 08:32:54 +01:00
parent 75295e55c2
commit 5e16bc4184
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/API/JSON/v1/Newsletters.php
View File

@ -507,10 +507,6 @@ class Newsletters extends APIEndpoint {
Scheduler::processPostNotificationSchedule($newsletter);
}
if($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
Scheduler::createPostNotificationSendingTask($newsletter);
}
return $this->successResponse(
Newsletter::findOne($newsletter->id)->asArray()
);

27
tests/integration/API/JSON/v1/NewslettersTest.php
View File

@ -420,7 +420,7 @@ class NewslettersTest extends \MailPoetTest {
$sending_queue_3->save();
$router = new Newsletters();
$response = $router->setStatus(
$router->setStatus(
array(
'id' => $this->post_notification->id,
'status' => Newsletter::STATUS_ACTIVE
@ -435,6 +435,31 @@ class NewslettersTest extends \MailPoetTest {
expect($tasks[2]->scheduled_at)->equals(Scheduler::getPreviousRunDate($schedule));
}
function testItSchedulesPostNotificationsWhenStatusIsSetBackToActive() {
$newsletter_option_field = NewsletterOptionField::create();
$newsletter_option_field->name = 'schedule';
$newsletter_option_field->newsletter_type = Newsletter::TYPE_NOTIFICATION;
$newsletter_option_field->save();
$schedule = '* * * * *';
NewsletterOption::createOrUpdate(
array(
'newsletter_id' => $this->post_notification->id,
'option_field_id' => $newsletter_option_field->id,
'value' => $schedule
)
);
$router = new Newsletters();
$router->setStatus(
array(
'id' => $this->post_notification->id,
'status' => Newsletter::STATUS_ACTIVE
)
);
$tasks = ScheduledTask::findMany();
expect($tasks)->notEmpty();
}
function testItCanRestoreANewsletter() {
$this->newsletter->trash();