Unit tests for listing specific methods

- small fixes/optimization in Subscriber model
- added test for search and group in Subscriber
- added test for search in Newsletter
This commit is contained in:
Jonathan Labreuille
2015-09-03 13:47:39 +02:00
parent cf322ec3c2
commit d89f43dbe5
3 changed files with 59 additions and 4 deletions

View File

@ -16,6 +16,10 @@ class Subscriber extends Model {
}
static function search($orm, $search = '') {
if(strlen(trim($search) === 0)) {
return $orm;
}
return $orm->where_raw(
'(`email` LIKE ? OR `first_name` LIKE ? OR `last_name` LIKE ?)',
array('%'.$search.'%', '%'.$search.'%', '%'.$search.'%')
@ -48,8 +52,13 @@ class Subscriber extends Model {
}
static function group($orm, $group = null) {
if(in_array($group, array('subscribed', 'unconfirmed', 'unsubscribed'))) {
return $orm->where('status', $group);
if($group === null or !in_array(
$group,
array('subscribed', 'unconfirmed', 'unsubscribed')
)) {
return $orm;
}
return $orm->where('status', $group);
}
}