diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-11-28 17:35:05 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-11-28 17:35:05 +0100 |
| commit | f0e6876f2ec8ec4576ca0ce8bbfee5bd8082dc1f (patch) | |
| tree | d96dc63141f984b18930ee580f534a7cb5989bdc /tests | |
| parent | 2c157da1c2fece318cab652b56d36c46d50f5e3a (diff) | |
| parent | bf2c9be06640c1ce1fff6da893ddb55297069af9 (diff) | |
| download | nextcloud-server-f0e6876f2ec8ec4576ca0ce8bbfee5bd8082dc1f.tar.gz nextcloud-server-f0e6876f2ec8ec4576ca0ce8bbfee5bd8082dc1f.zip | |
Merge pull request #12488 from owncloud/activity_group_multiple_conditions
activitymanager: concatenate queries with 'or'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/activitymanager.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/lib/activitymanager.php b/tests/lib/activitymanager.php index 85f8320de09..0683eb68193 100644 --- a/tests/lib/activitymanager.php +++ b/tests/lib/activitymanager.php @@ -87,11 +87,14 @@ class Test_ActivityManager extends \Test\TestCase { } public function testQueryForFilter() { + $this->activityManager->registerExtension(function() { + return new SimpleExtension(); + }); $result = $this->activityManager->getQueryForFilter('filter1'); $this->assertEquals( array( - '`app` = ? and `message` like ?', - array('mail', 'ownCloud%') + ' and ((`app` = ? and `message` like ?) or (`app` = ? and `message` like ?))', + array('mail', 'ownCloud%', 'mail', 'ownCloud%') ), $result ); |