friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Just some more tests

This commit is contained in:
Michael 2021-02-05 05:53:44 +00:00
parent 0cd8c78e2d
commit 239bf686af
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/api.php
View File

@ -1819,7 +1819,8 @@ function api_statuses_networkpublic_timeline($type)
} }
$params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Post::selectForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); // $statuses = Post::selectForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
$statuses = Post::select(Item::DISPLAY_FIELDLIST, $condition, $params);
$ret = api_format_items(Post::toArray($statuses), $user_info, false, $type); $ret = api_format_items(Post::toArray($statuses), $user_info, false, $type);

45
tests/datasets/api.fixture.php
View File

@ -19,6 +19,9 @@
* *
*/ */
use Friendica\Core\Protocol;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Notification; use Friendica\Model\Notification;
return [ return [
@ -70,8 +73,8 @@ return [
'about' => 'User used in tests', 'about' => 'User used in tests',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 1, 'rel' => Contact::FOLLOWER,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
// Having the same name and nick allows us to test // Having the same name and nick allows us to test
@ -86,8 +89,8 @@ return [
'url' => 'http://localhost/profile/othercontact', 'url' => 'http://localhost/profile/othercontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 0, 'rel' => Contact::NOTHING,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
[ [
@ -100,8 +103,8 @@ return [
'url' => 'http://localhost/profile/friendcontact', 'url' => 'http://localhost/profile/friendcontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 2, 'rel' => Contact::SHARING,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
[ [
@ -114,8 +117,8 @@ return [
'url' => 'http://localhost/profile/friendcontact', 'url' => 'http://localhost/profile/friendcontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 2, 'rel' => Contact::SHARING,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
[ [
@ -128,8 +131,8 @@ return [
'url' => 'http://localhost/profile/mutualcontact', 'url' => 'http://localhost/profile/mutualcontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 3, 'rel' => Contact::FRIEND,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
[ [
@ -142,8 +145,8 @@ return [
'url' => 'http://localhost/profile/mutualcontact', 'url' => 'http://localhost/profile/mutualcontact',
'pending' => 0, 'pending' => 0,
'blocked' => 0, 'blocked' => 0,
'rel' => 2, 'rel' => Contact::SHARING,
'network' => 'dfrn', 'network' => Protocol::DFRN,
'location' => 'DFRN', 'location' => 'DFRN',
], ],
], ],
@ -217,21 +220,21 @@ return [
'author-id' => 42, 'author-id' => 42,
'owner-id' => 42, 'owner-id' => 42,
'causer-id' => 42, 'causer-id' => 42,
'network' => 'dfrn', 'network' => Protocol::DFRN,
], ],
[ [
'uri-id' => 3, 'uri-id' => 3,
'author-id' => 43, 'author-id' => 43,
'owner-id' => 43, 'owner-id' => 43,
'causer-id' => 43, 'causer-id' => 43,
'network' => 'dfrn', 'network' => Protocol::DFRN,
], ],
[ [
'uri-id' => 6, 'uri-id' => 6,
'author-id' => 44, 'author-id' => 44,
'owner-id' => 44, 'owner-id' => 44,
'causer-id' => 44, 'causer-id' => 44,
'network' => 'dfrn', 'network' => Protocol::DFRN,
], ],
], ],
'post-thread-user' => [ 'post-thread-user' => [
@ -320,7 +323,7 @@ return [
'parent-uri' => '1', 'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1', 'thr-parent' => '1',
'private' => 0, 'private' => Item::PUBLIC,
'gravity' => GRAVITY_PARENT, 'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/selfcontact', 'author-link' => 'http://localhost/profile/selfcontact',
'wall' => 1, 'wall' => 1,
@ -349,7 +352,7 @@ return [
'parent-uri' => '1', 'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1', 'thr-parent' => '1',
'private' => 0, 'private' => Item::PUBLIC,
'gravity' => GRAVITY_COMMENT, 'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/selfcontact', 'author-link' => 'http://localhost/profile/selfcontact',
'wall' => 1, 'wall' => 1,
@ -374,7 +377,7 @@ return [
'parent-uri' => '3', 'parent-uri' => '3',
'thr-parent-id' => 3, 'thr-parent-id' => 3,
'thr-parent' => '3', 'thr-parent' => '3',
'private' => 0, 'private' => Item::PUBLIC,
'gravity' => GRAVITY_PARENT, 'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -400,7 +403,7 @@ return [
'parent-uri' => '1', 'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1', 'thr-parent' => '1',
'private' => 0, 'private' => Item::PUBLIC,
'gravity' => GRAVITY_COMMENT, 'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -426,7 +429,7 @@ return [
'parent-uri' => '1', 'parent-uri' => '1',
'thr-parent-id' => 1, 'thr-parent-id' => 1,
'thr-parent' => '1', 'thr-parent' => '1',
'private' => 0, 'private' => Item::PUBLIC,
'gravity' => GRAVITY_COMMENT, 'gravity' => GRAVITY_COMMENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,
@ -455,7 +458,7 @@ return [
'parent-uri' => '6', 'parent-uri' => '6',
'thr-parent-id' => 6, 'thr-parent-id' => 6,
'thr-parent' => '6', 'thr-parent' => '6',
'private' => 0, 'private' => Item::PUBLIC,
'gravity' => GRAVITY_PARENT, 'gravity' => GRAVITY_PARENT,
'author-link' => 'http://localhost/profile/othercontact', 'author-link' => 'http://localhost/profile/othercontact',
'wall' => 1, 'wall' => 1,