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

Improve a deletion test to handle multiple queues, fix comments [MAILPOET-830]

Browse Source
This commit is contained in:
Alexey Stoletniy
2017-05-02 09:07:38 +03:00
parent a0289775cb
commit 956fdd5cff
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Models/Newsletter.php
View File

@@ -114,7 +114,7 @@ class Newsletter extends Model {
function delete() { function delete() {
// delete segment associations // delete segment associations
$this->segmentRelations()->deleteMany(); $this->segmentRelations()->deleteMany();
// delete queue association // delete queue associations
$this->queue()->deleteMany(); $this->queue()->deleteMany();
return parent::delete(); return parent::delete();
@@ -137,7 +137,7 @@ class Newsletter extends Model {
} }
function restore() { function restore() {
// trash queue associations // restore trashed queue associations
SendingQueue::rawExecute( SendingQueue::rawExecute(
'UPDATE `' . SendingQueue::$_table . '` ' . 'UPDATE `' . SendingQueue::$_table . '` ' .
'SET `deleted_at` = null ' . 'SET `deleted_at` = null ' .

16
tests/unit/Models/NewsletterTest.php
View File

@@ -424,17 +424,23 @@ class NewsletterTest extends MailPoetTest {
} }
function testItDeletesSegmentAndQueueAssociationsWhenNewsletterIsDeleted() { function testItDeletesSegmentAndQueueAssociationsWhenNewsletterIsDeleted() {
// make sure relations exist
$newsletter = $this->newsletter; $newsletter = $this->newsletter;
$sending_queue = SendingQueue::where('newsletter_id', $newsletter->id)->findOne();
expect($sending_queue)->notEmpty(); // create multiple sending queues
for($i = 1; $i <= 5; $i++) {
$sending_queue = SendingQueue::create();
$sending_queue->newsletter_id = $newsletter->id;
$sending_queue->save();
}
// make sure relations exist
expect(SendingQueue::where('newsletter_id', $newsletter->id)->findArray())->count(6);
$newsletter_segments = NewsletterSegment::where('newsletter_id', $newsletter->id)->findArray(); $newsletter_segments = NewsletterSegment::where('newsletter_id', $newsletter->id)->findArray();
expect($newsletter_segments)->count(2); expect($newsletter_segments)->count(2);
// delete newsletter and check that relations no longer exist // delete newsletter and check that relations no longer exist
$newsletter->delete(); $newsletter->delete();
$sending_queue = SendingQueue::where('newsletter_id', $newsletter->id)->findOne(); expect(SendingQueue::where('newsletter_id', $newsletter->id)->findArray())->isEmpty();
expect($sending_queue)->isEmpty();
$newsletter_segments = NewsletterSegment::where('newsletter_id', $newsletter->id)->findArray(); $newsletter_segments = NewsletterSegment::where('newsletter_id', $newsletter->id)->findArray();
expect($newsletter_segments)->isEmpty(); expect($newsletter_segments)->isEmpty();
} }