clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' 2019.12 into develop

Browse Source
This commit is contained in:
Tobias Diekershoff
2019-12-23 20:03:47 +01:00
parent 564952cf1a b9ec52d267
commit 00756737b5
66 changed files with 70843 additions and 67948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/include/ApiTest.php
View File

@@ -15,6 +15,7 @@ use Friendica\Core\Session;
use Friendica\Core\Session\ISession;
use Friendica\Core\System;
use Friendica\Database\Database;
use Friendica\Model\Contact;
use Friendica\Network\HTTPException;
use Friendica\Test\Util\Database\StaticDatabase;
use Monolog\Handler\TestHandler;
@@ -2929,8 +2930,8 @@ class ApiTest extends DatabaseTest
*/
public function testApiFfIds()
{
$result = api_ff_ids('json');
$this->assertNull($result);
$result = api_ff_ids('json', Contact::FOLLOWER);
$this->assertEquals(['id' => []], $result);
}
/**
@@ -2952,7 +2953,7 @@ class ApiTest extends DatabaseTest
public function testApiFfIdsWithoutAuthenticatedUser()
{
$_SESSION['authenticated'] = false;
api_ff_ids('json');
api_ff_ids('json', Contact::FOLLOWER);
}
/**
@@ -2963,7 +2964,7 @@ class ApiTest extends DatabaseTest
public function testApiFriendsIds()
{
$result = api_friends_ids('json');
$this->assertNull($result);
$this->assertEquals(['id' => []], $result);
}
/**
@@ -2974,7 +2975,7 @@ class ApiTest extends DatabaseTest
public function testApiFollowersIds()
{
$result = api_followers_ids('json');
$this->assertNull($result);
$this->assertEquals(['id' => []], $result);
}
/**
@@ -3723,28 +3724,6 @@ class ApiTest extends DatabaseTest
$this->markTestIncomplete();
}
/**
* Test the api_get_nick() function.
*
* @return void
*/
public function testApiGetNick()
{
$result = api_get_nick($this->otherUser['nurl']);
$this->assertEquals('othercontact', $result);
}
/**
* Test the api_get_nick() function with a wrong URL.
*
* @return void
*/
public function testApiGetNickWithWrongUrl()
{
$result = api_get_nick('wrong_url');
$this->assertFalse($result);
}
/**
* Test the api_in_reply_to() function.
*