From 4d4e8e3580e940ae13174f63829dd95976e8e6bb Mon Sep 17 00:00:00 2001 From: "J. King" Date: Thu, 30 Nov 2017 12:49:23 -0500 Subject: [PATCH] TTRSS: correct feed renaming; fixes #128 --- lib/REST/TinyTinyRSS/API.php | 2 +- tests/REST/TinyTinyRSS/TestTinyTinyAPI.php | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/REST/TinyTinyRSS/API.php b/lib/REST/TinyTinyRSS/API.php index c6ba1e0b..5e46705e 100644 --- a/lib/REST/TinyTinyRSS/API.php +++ b/lib/REST/TinyTinyRSS/API.php @@ -911,7 +911,7 @@ class API extends \JKingWeb\Arsse\REST\AbstractHandler { throw new Exception("INCORRECT_USAGE"); } $in = [ - 'name' => $data['caption'], + 'title' => $data['caption'], ]; try { // try to rename the feed diff --git a/tests/REST/TinyTinyRSS/TestTinyTinyAPI.php b/tests/REST/TinyTinyRSS/TestTinyTinyAPI.php index 69e6ef4c..93670f14 100644 --- a/tests/REST/TinyTinyRSS/TestTinyTinyAPI.php +++ b/tests/REST/TinyTinyRSS/TestTinyTinyAPI.php @@ -599,9 +599,9 @@ LONG_STRING; ['op' => "renameFeed", 'sid' => "PriestsOfSyrinx"], ]; $db = [ - [Arsse::$user->id, 42, ['name' => "Ook"]], - [Arsse::$user->id, 2112, ['name' => "Eek"]], - [Arsse::$user->id, 42, ['name' => "Eek"]], + [Arsse::$user->id, 42, ['title' => "Ook"]], + [Arsse::$user->id, 2112, ['title' => "Eek"]], + [Arsse::$user->id, 42, ['title' => "Eek"]], ]; Phake::when(Arsse::$db)->subscriptionPropertiesSet(...$db[0])->thenReturn(true); Phake::when(Arsse::$db)->subscriptionPropertiesSet(...$db[1])->thenThrow(new ExceptionInput("subjectMissing")); @@ -623,7 +623,9 @@ LONG_STRING; $this->assertResponse($exp, $this->req($in[6])); $this->assertResponse($exp, $this->req($in[7])); $this->assertResponse($exp, $this->req($in[8])); - Phake::verify(Arsse::$db, Phake::times(3))->subscriptionPropertiesSet(Arsse::$user->id, $this->anything(), $this->anything()); + Phake::verify(Arsse::$db)->subscriptionPropertiesSet(...$db[0]); + Phake::verify(Arsse::$db)->subscriptionPropertiesSet(...$db[1]); + Phake::verify(Arsse::$db)->subscriptionPropertiesSet(...$db[2]); } public function testRetrieveTheGlobalUnreadCount() {