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

Resets sent at data when duplicating a sent newsletter

Browse Source
This commit is contained in:
Vlad
2017-07-15 13:00:25 -04:00
parent 74cb8d9735
commit cdc87c23ea
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Models/Newsletter.php
View File

@ -280,6 +280,9 @@ class Newsletter extends Model {
// reset hash
$duplicate->set('hash', null);
// reset sent at date
$duplicate->set('sent_at', null);
$duplicate->save();
if($duplicate->getErrors() === false) {

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

@ -375,13 +375,6 @@ class NewsletterTest extends MailPoetTest {
->equals(Security::HASH_LENGTH);
}
function testItRegeneratesHashOnNewsletterDuplication() {
$duplicate_newsletter = $this->newsletter->duplicate();
expect($duplicate_newsletter->hash)->notEquals($this->newsletter->hash);
expect(strlen($duplicate_newsletter->hash))
->equals(Security::HASH_LENGTH);
}
function testItRegeneratesHashOnNotificationHistoryCreation() {
$notification_history = $this->newsletter->createNotificationHistory();
expect($notification_history->hash)->notEquals($this->newsletter->hash);
@ -745,6 +738,30 @@ class NewsletterTest extends MailPoetTest {
expect(NewsletterSegment::findArray())->count(0);
}
function testDuplicatesNewsletter() {
$original_newsletter = $this->newsletter;
$original_newsletter->status = Newsletter::STATUS_SENT;
$original_newsletter->sent_at = $original_newsletter->deleted_at = $original_newsletter->created_at = $original_newsletter->updated_at = date( '2000-m-d H:i:s');
$original_newsletter->save();
$data = array('subject' => 'duplicate newsletter');
$duplicate_newsletter = $this->newsletter->duplicate($data);
$duplicate_newsletter = Newsletter::findOne($duplicate_newsletter->id);
// hash is different
expect($duplicate_newsletter->hash)->notEquals($this->newsletter->hash);
expect(strlen($duplicate_newsletter->hash))->equals(Security::HASH_LENGTH);
// status is set to draft
expect($duplicate_newsletter->status)->equals(Newsletter::STATUS_DRAFT);
// sent at/delete at dates are null
expect($duplicate_newsletter->sent_at)->null();
expect($duplicate_newsletter->deleted_at)->null();
// created at/updated at dates are different
expect($duplicate_newsletter->created_at)->notEquals($original_newsletter->created_at);
expect($duplicate_newsletter->updated_at)->notEquals($original_newsletter->updated_at);
// body and subject are the same
expect($duplicate_newsletter->body)->equals($original_newsletter->body);
expect($duplicate_newsletter->subject)->equals($data['subject']);
}
function _after() {
ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table);
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);