keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Possibly fixed test

Browse source
This commit is contained in:
Michael 2018-06-09 20:39:40 +00:00
parent b6c344a80a
commit defd3d15b6
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/api.php
View file

@ -1920,7 +1920,7 @@ function api_statuses_show($type)
$statuses = Item::select(api_user(), [], $condition, $params); $statuses = Item::select(api_user(), [], $condition, $params);
/// @TODO How about copying this to above methods which don't check $r ? /// @TODO How about copying this to above methods which don't check $r ?
if (!DBM::is_result($items)) { if (!DBM::is_result($statuses)) {
throw new BadRequestException("There is no status with this id."); throw new BadRequestException("There is no status with this id.");
} }
@ -2000,7 +2000,7 @@ function api_conversation_show($type)
$params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
$statuses = Item::select(api_user(), [], $condition, $params); $statuses = Item::select(api_user(), [], $condition, $params);
if (!DBM::is_result($items)) { if (!DBM::is_result($statuses)) {
throw new BadRequestException("There is no status with id $id."); throw new BadRequestException("There is no status with id $id.");
} }

6
tests/ApiTest.php
View file

@ -1871,7 +1871,7 @@ class ApiTest extends DatabaseTest
$this->app->argv[1] = '1.1'; $this->app->argv[1] = '1.1';
$this->app->argv[3] = 'create'; $this->app->argv[3] = 'create';
$this->app->argc = 10; $this->app->argc = 10;
$_REQUEST['id'] = 1; $_REQUEST['id'] = 3;
$result = api_favorites_create_destroy('json'); $result = api_favorites_create_destroy('json');
$this->assertStatus($result['status']); $this->assertStatus($result['status']);
} }
@ -1885,7 +1885,7 @@ class ApiTest extends DatabaseTest
$this->app->argv[1] = '1.1'; $this->app->argv[1] = '1.1';
$this->app->argv[3] = 'create'; $this->app->argv[3] = 'create';
$this->app->argc = 10; $this->app->argc = 10;
$_REQUEST['id'] = 1; $_REQUEST['id'] = 3;
$result = api_favorites_create_destroy('rss'); $result = api_favorites_create_destroy('rss');
$this->assertXml($result, 'status'); $this->assertXml($result, 'status');
} }
@ -1899,7 +1899,7 @@ class ApiTest extends DatabaseTest
$this->app->argv[1] = '1.1'; $this->app->argv[1] = '1.1';
$this->app->argv[3] = 'destroy'; $this->app->argv[3] = 'destroy';
$this->app->argc = 10; $this->app->argc = 10;
$_REQUEST['id'] = 1; $_REQUEST['id'] = 3;
$result = api_favorites_create_destroy('json'); $result = api_favorites_create_destroy('json');
$this->assertStatus($result['status']); $this->assertStatus($result['status']);
} }