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

fixed unit tests

Browse Source
This commit is contained in:
Jonathan Labreuille
2016-06-15 16:13:29 +02:00
parent 6199caea29
commit 9aa25446d1
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Models/Newsletter.php
View File

@ -248,12 +248,14 @@ class Newsletter extends Model {
}
static function filterBy($orm, $data = array()) {
$type = isset($data['tab']) ? $data['tab'] : null;
if(!empty($data['filter'])) {
foreach($data['filter'] as $key => $value) {
if($key === 'segment') {
$segment = Segment::findOne($value);
if($segment !== false) {
$orm = $segment->newsletters()->where('type', $data['tab']);
$orm = $segment->newsletters()->filter('filterType', $type);
}
}
}

2
lib/Router/Newsletters.php
View File

@ -155,7 +155,7 @@ class Newsletters {
));
if($duplicate !== false && $duplicate->getErrors() === false) {
$result = $newsletter->asArray();
$result = $duplicate->asArray();
}
}
return $result;

4
tests/unit/Mailer/MailerTest.php
View File

@ -1,5 +1,6 @@
<?php
use MailPoet\Mailer\Mailer;
use MailPoet\Models\Setting;
class MailerTest extends MailPoetTest {
function _before() {
@ -65,6 +66,9 @@ class MailerTest extends MailPoetTest {
}
function testItRequiresMailerMethod() {
// reset mta settings so that we have no default mailer
Setting::setValue('mta', null);
try {
$mailer = new Mailer();
$this->fail('Mailer did not throw an exception');

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

@ -165,7 +165,9 @@ class NewsletterTest extends MailPoetTest {
// filter by segment
$newsletters = Newsletter::filter('filterBy', array(
'filter' => array(
'segment' => $this->segment_1->id
)
))->findArray();
expect($newsletters)->count(1);
@ -175,28 +177,39 @@ class NewsletterTest extends MailPoetTest {
NewsletterSegment::deleteMany();
$newsletters = Newsletter::filter('filterBy', array(
'filter' => array(
'segment' => $this->segment_1->id
))->findArray();
)))->findArray();
expect($newsletters)->isEmpty();
}
function testItCanBeGrouped() {
$newsletters = Newsletter::filter('groupBy', 'all')->findArray();
$newsletters = Newsletter::filter('groupBy', array(
'group' => 'all'
))->findArray();
expect($newsletters)->count(1);
$newsletters = Newsletter::filter('groupBy', 'trash')->findArray();
$newsletters = Newsletter::filter('groupBy', array(
'group' => 'trash'
))->findArray();
expect($newsletters)->count(0);
$this->newsletter->trash();
$newsletters = Newsletter::filter('groupBy', 'trash')->findArray();
$newsletters = Newsletter::filter('groupBy', array(
'group' => 'trash'
))->findArray();
expect($newsletters)->count(1);
$newsletters = Newsletter::filter('groupBy', 'all')->findArray();
$newsletters = Newsletter::filter('groupBy', array(
'group' => 'all'
))->findArray();
expect($newsletters)->count(0);
$this->newsletter->restore();
$newsletters = Newsletter::filter('groupBy', 'all')->findArray();
$newsletters = Newsletter::filter('groupBy', array(
'group' => 'all'
))->findArray();
expect($newsletters)->count(1);
}

3
tests/unit/Models/SubscriberTest.php
View File

@ -210,7 +210,8 @@ class SubscriberTest extends MailPoetTest {
expect($subscriber->email)->equals($this->data['email']);
expect($subscriber->first_name)->equals($this->data['first_name']);
expect($subscriber->last_name)->equals($this->data['last_name']);
expect($subscriber->status)->equals('subscribed');
// signup confirmation is enabled by default
expect($subscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);
expect($subscriber->deleted_at)->equals(null);
}