From defd3d15b63236fefa5b3f880de344f213414d1b Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 9 Jun 2018 20:39:40 +0000 Subject: [PATCH] Possibly fixed test --- include/api.php | 4 ++-- tests/ApiTest.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/api.php b/include/api.php index dba20d4c1b..00c2173c38 100644 --- a/include/api.php +++ b/include/api.php @@ -1920,7 +1920,7 @@ function api_statuses_show($type) $statuses = Item::select(api_user(), [], $condition, $params); /// @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."); } @@ -2000,7 +2000,7 @@ function api_conversation_show($type) $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; $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."); } diff --git a/tests/ApiTest.php b/tests/ApiTest.php index f0e27b4af1..c21f651d5f 100644 --- a/tests/ApiTest.php +++ b/tests/ApiTest.php @@ -1871,7 +1871,7 @@ class ApiTest extends DatabaseTest $this->app->argv[1] = '1.1'; $this->app->argv[3] = 'create'; $this->app->argc = 10; - $_REQUEST['id'] = 1; + $_REQUEST['id'] = 3; $result = api_favorites_create_destroy('json'); $this->assertStatus($result['status']); } @@ -1885,7 +1885,7 @@ class ApiTest extends DatabaseTest $this->app->argv[1] = '1.1'; $this->app->argv[3] = 'create'; $this->app->argc = 10; - $_REQUEST['id'] = 1; + $_REQUEST['id'] = 3; $result = api_favorites_create_destroy('rss'); $this->assertXml($result, 'status'); } @@ -1899,7 +1899,7 @@ class ApiTest extends DatabaseTest $this->app->argv[1] = '1.1'; $this->app->argv[3] = 'destroy'; $this->app->argc = 10; - $_REQUEST['id'] = 1; + $_REQUEST['id'] = 3; $result = api_favorites_create_destroy('json'); $this->assertStatus($result['status']); }