Merge pull request #8163 from MrPetovan/task/7817-custom-fields-part-3

New custom profile fields feature part 3: Updating the API
This commit is contained in:
Philipp 2020-01-31 22:39:11 +01:00 committed by GitHub
commit 0406fe7ade
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 351 additions and 358 deletions

View file

@ -2489,102 +2489,6 @@ class ApiTest extends DatabaseTest
$this->assertArrayHasKey('friendica:attendmaybe', $result);
}
/**
* Test the api_format_items_profiles() function.
*
* @return void
*/
public function testApiFormatItemsProfiles()
{
$profile_row = [
'id' => 'profile_id',
'profile-name' => 'profile_name',
'is-default' => true,
'hide-friends' => true,
'photo' => 'profile_photo',
'thumb' => 'profile_thumb',
'publish' => true,
'net-publish' => true,
'pdesc' => 'description',
'dob' => 'date_of_birth',
'address' => 'address',
'locality' => 'city',
'region' => 'region',
'postal-code' => 'postal_code',
'country-name' => 'country',
'hometown' => 'hometown',
'gender' => 'gender',
'marital' => 'marital',
'with' => 'marital_with',
'howlong' => 'marital_since',
'sexual' => 'sexual',
'politic' => 'politic',
'religion' => 'religion',
'pub_keywords' => 'public_keywords',
'prv_keywords' => 'private_keywords',
'likes' => 'likes',
'dislikes' => 'dislikes',
'about' => 'about',
'music' => 'music',
'book' => 'book',
'tv' => 'tv',
'film' => 'film',
'interest' => 'interest',
'romance' => 'romance',
'work' => 'work',
'education' => 'education',
'contact' => 'social_networks',
'homepage' => 'homepage'
];
$result = api_format_items_profiles($profile_row);
$this->assertEquals(
[
'profile_id' => 'profile_id',
'profile_name' => 'profile_name',
'is_default' => true,
'hide_friends' => true,
'profile_photo' => 'profile_photo',
'profile_thumb' => 'profile_thumb',
'publish' => true,
'net_publish' => true,
'description' => 'description',
'date_of_birth' => 'date_of_birth',
'address' => 'address',
'city' => 'city',
'region' => 'region',
'postal_code' => 'postal_code',
'country' => 'country',
'hometown' => 'hometown',
'gender' => 'gender',
'marital' => 'marital',
'marital_with' => 'marital_with',
'marital_since' => 'marital_since',
'sexual' => 'sexual',
'politic' => 'politic',
'religion' => 'religion',
'public_keywords' => 'public_keywords',
'private_keywords' => 'private_keywords',
'likes' => 'likes',
'dislikes' => 'dislikes',
'about' => 'about',
'music' => 'music',
'book' => 'book',
'tv' => 'tv',
'film' => 'film',
'interest' => 'interest',
'romance' => 'romance',
'work' => 'work',
'education' => 'education',
'social_networks' => 'social_networks',
'homepage' => 'homepage',
'users' => null
],
$result
);
}
/**
* Test the api_format_items() function.
*
@ -3994,58 +3898,6 @@ XML;
$this->markTestIncomplete();
}
/**
* Test the api_friendica_profile_show() function.
*
* @return void
*/
public function testApiFriendicaProfileShow()
{
$result = api_friendica_profile_show('json');
// We can't use assertSelfUser() here because the user object is missing some properties.
$this->assertEquals($this->selfUser['id'], $result['$result']['friendica_owner']['cid']);
$this->assertEquals('DFRN', $result['$result']['friendica_owner']['location']);
$this->assertEquals($this->selfUser['name'], $result['$result']['friendica_owner']['name']);
$this->assertEquals($this->selfUser['nick'], $result['$result']['friendica_owner']['screen_name']);
$this->assertEquals('dfrn', $result['$result']['friendica_owner']['network']);
$this->assertTrue($result['$result']['friendica_owner']['verified']);
$this->assertFalse($result['$result']['multi_profiles']);
}
/**
* Test the api_friendica_profile_show() function with a profile ID.
*
* @return void
*/
public function testApiFriendicaProfileShowWithProfileId()
{
$this->markTestIncomplete('We need to add a dataset for this.');
}
/**
* Test the api_friendica_profile_show() function with a wrong profile ID.
*
* @return void
* @expectedException Friendica\Network\HTTPException\BadRequestException
*/
public function testApiFriendicaProfileShowWithWrongProfileId()
{
$_REQUEST['profile_id'] = 666;
api_friendica_profile_show('json');
}
/**
* Test the api_friendica_profile_show() function without an authenticated user.
*
* @return void
* @expectedException Friendica\Network\HTTPException\ForbiddenException
*/
public function testApiFriendicaProfileShowWithoutAuthenticatedUser()
{
$_SESSION['authenticated'] = false;
api_friendica_profile_show('json');
}
/**
* Test the api_saved_searches_list() function.
*