From 63de167befb4adddc12e852163b883d953701a59 Mon Sep 17 00:00:00 2001 From: Xheni Myrtaj Date: Mon, 28 Jan 2019 00:30:01 +0100 Subject: [PATCH 1/7] get the number of subscribers of list, Fix #115 Signed-off-by: Xheni Myrtaj --- src/Controller/ListController.php | 15 ++++ .../Controller/AbstractControllerTest.php | 10 +++ .../Controller/Fixtures/SubscriberList.csv | 1 + .../Controller/ListControllerTest.php | 90 +++++++++++++++++++ 4 files changed, 116 insertions(+) diff --git a/src/Controller/ListController.php b/src/Controller/ListController.php index f54006f..39b0fcd 100644 --- a/src/Controller/ListController.php +++ b/src/Controller/ListController.php @@ -16,6 +16,7 @@ * This controller provides REST API access to subscriber lists. * * @author Oliver Klee + * @author Xheni Myrtaj */ class ListController extends FOSRestController implements ClassResourceInterface { @@ -96,4 +97,18 @@ public function getMembersAction(Request $request, SubscriberList $list): View return View::create()->setData($list->getSubscribers()); } + + /** + * Gets the total number of subscribers of a list. + * @param Request $request + * @param SubscriberList $list + * + * @return View + */ + public function getCountAction(Request $request, SubscriberList $list): View + { + $this->requireAuthentication($request); + + return View::create()->setData(count($list->getSubscribers())); + } } diff --git a/tests/Integration/Controller/AbstractControllerTest.php b/tests/Integration/Controller/AbstractControllerTest.php index bcf3857..352a83f 100644 --- a/tests/Integration/Controller/AbstractControllerTest.php +++ b/tests/Integration/Controller/AbstractControllerTest.php @@ -102,6 +102,16 @@ protected function getDecodedJsonResponseContent(): array return json_decode($this->client->getResponse()->getContent(), true); } + /** + * Returns Int as response content. + * + * @return int + */ + protected function getIntResponseContent(): int + { + return json_decode($this->client->getResponse()->getContent(), true); + } + /** * Asserts that the (decoded) JSON response content is the same as the expected array. * diff --git a/tests/Integration/Controller/Fixtures/SubscriberList.csv b/tests/Integration/Controller/Fixtures/SubscriberList.csv index 0213ea1..59f6e18 100644 --- a/tests/Integration/Controller/Fixtures/SubscriberList.csv +++ b/tests/Integration/Controller/Fixtures/SubscriberList.csv @@ -1,3 +1,4 @@ id,name,description,entered,modified,listorder,prefix,active,category,owner 1,"News","News (and some fun stuff)","2016-06-22 15:01:17","2016-06-23 19:50:43",12,"phpList",1,"news",1 2,"More news","","2016-06-22 15:01:17","2016-06-23 19:50:43",12,"",1,"",1 +3,"Tech news","","2019-02-11 15:01:15","2019-02-11 19:50:43",12,"",1,"",1 diff --git a/tests/Integration/Controller/ListControllerTest.php b/tests/Integration/Controller/ListControllerTest.php index ff19769..1c97ba6 100644 --- a/tests/Integration/Controller/ListControllerTest.php +++ b/tests/Integration/Controller/ListControllerTest.php @@ -10,6 +10,7 @@ * Testcase. * * @author Oliver Klee + * @author Xheni Myrtaj */ class ListControllerTest extends AbstractControllerTest { @@ -107,6 +108,16 @@ public function getListsWithCurrentSessionKeyReturnsListData() 'public' => true, 'category' => '', 'id' => 2, + ], + [ + 'name' => 'Tech news', + 'description' => '', + 'creation_date' => '2019-02-11T15:01:15+00:00', + 'list_position' => 12, + 'subject_prefix' => '', + 'public' => true, + 'category' => '', + 'id' => 3, ] ] ); @@ -320,4 +331,83 @@ public function getListMembersWithCurrentSessionKeyForExistingListWithSubscriber ] ); } + + /** + * @test + */ + public function getListCountForExistingListWithoutSessionKeyReturnsForbiddenStatus() + { + $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); + $this->applyDatabaseChanges(); + + $this->client->request('get', '/api/v2/lists/1/count'); + + $this->assertHttpForbidden(); + } + + /** + * @test + */ + public function getListCountForExistingListWithExpiredSessionKeyReturnsForbiddenStatus() + { + $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); + $this->getDataSet()->addTable(static::ADMINISTRATOR_TABLE_NAME, __DIR__ . '/Fixtures/Administrator.csv'); + $this->getDataSet()->addTable(static::TOKEN_TABLE_NAME, __DIR__ . '/Fixtures/AdministratorToken.csv'); + $this->applyDatabaseChanges(); + + $this->client->request( + 'get', + '/api/v2/lists/1/count', + [], + [], + ['PHP_AUTH_USER' => 'unused', 'PHP_AUTH_PW' => 'cfdf64eecbbf336628b0f3071adba763'] + ); + + $this->assertHttpForbidden(); + } + + /** + * @test + */ + public function getListCountWithCurrentSessionKeyForExistingListReturnsOkayStatus() + { + $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); + $this->applyDatabaseChanges(); + + $this->authenticatedJsonRequest('get', '/api/v2/lists/1/count'); + + $this->assertHttpOkay(); + } + + /** + * @test + */ + public function getListCountWithCurrentSessionKeyForExistingListWithSubscribersReturnsSubscribersCount() + { + $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); + $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/Fixtures/Subscriber.csv'); + $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/Fixtures/Subscription.csv'); + $this->applyDatabaseChanges(); + + $this->authenticatedJsonRequest('get', '/api/v2/lists/2/count'); + $response = $this->getIntResponseContent(); + + static::assertSame(1, $response); + } + + /** + * @test + */ + public function getListCountWithCurrentSessionKeyForExistingListWithNoSubscribersReturnsZero() + { + $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); + $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/Fixtures/Subscriber.csv'); + $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/Fixtures/Subscription.csv'); + $this->applyDatabaseChanges(); + + $this->authenticatedJsonRequest('get', '/api/v2/lists/3/count'); + $response = $this->getIntResponseContent(); + + static::assertSame(0, $response); + } } From 5f89fbc385e3e7e554b3ba8af2c7c3ee010e3aa5 Mon Sep 17 00:00:00 2001 From: Xheni Myrtaj Date: Thu, 14 Feb 2019 15:47:14 +0100 Subject: [PATCH 2/7] Add empty line before param annotation Signed-off-by: Xheni Myrtaj --- src/Controller/ListController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Controller/ListController.php b/src/Controller/ListController.php index 39b0fcd..279753e 100644 --- a/src/Controller/ListController.php +++ b/src/Controller/ListController.php @@ -100,6 +100,7 @@ public function getMembersAction(Request $request, SubscriberList $list): View /** * Gets the total number of subscribers of a list. + * * @param Request $request * @param SubscriberList $list * From 11b5ad87ade54379e05f9bd0f5f76a1d4c2f6f4c Mon Sep 17 00:00:00 2001 From: Xheni Myrtaj Date: Tue, 19 Mar 2019 14:49:34 +0100 Subject: [PATCH 3/7] Make the intent clearer with the description and the name Signed-off-by: Xheni Myrtaj --- tests/Integration/Controller/AbstractControllerTest.php | 4 ++-- tests/Integration/Controller/ListControllerTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Integration/Controller/AbstractControllerTest.php b/tests/Integration/Controller/AbstractControllerTest.php index 352a83f..169ece2 100644 --- a/tests/Integration/Controller/AbstractControllerTest.php +++ b/tests/Integration/Controller/AbstractControllerTest.php @@ -103,11 +103,11 @@ protected function getDecodedJsonResponseContent(): array } /** - * Returns Int as response content. + * Returns the response content as int. * * @return int */ - protected function getIntResponseContent(): int + protected function getResponseContentAsInt(): int { return json_decode($this->client->getResponse()->getContent(), true); } diff --git a/tests/Integration/Controller/ListControllerTest.php b/tests/Integration/Controller/ListControllerTest.php index 1c97ba6..d12b76d 100644 --- a/tests/Integration/Controller/ListControllerTest.php +++ b/tests/Integration/Controller/ListControllerTest.php @@ -390,7 +390,7 @@ public function getListCountWithCurrentSessionKeyForExistingListWithSubscribersR $this->applyDatabaseChanges(); $this->authenticatedJsonRequest('get', '/api/v2/lists/2/count'); - $response = $this->getIntResponseContent(); + $response = $this->getResponseContentAsInt(); static::assertSame(1, $response); } @@ -406,7 +406,7 @@ public function getListCountWithCurrentSessionKeyForExistingListWithNoSubscriber $this->applyDatabaseChanges(); $this->authenticatedJsonRequest('get', '/api/v2/lists/3/count'); - $response = $this->getIntResponseContent(); + $response = $this->getResponseContentAsInt(); static::assertSame(0, $response); } From ba0c892d4fb2e7c1ca3a365fa4f8245aaba03927 Mon Sep 17 00:00:00 2001 From: Xheni Myrtaj Date: Tue, 19 Mar 2019 14:51:58 +0100 Subject: [PATCH 4/7] Add the comma after the last array element Signed-off-by: Xheni Myrtaj --- tests/Integration/Controller/ListControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Integration/Controller/ListControllerTest.php b/tests/Integration/Controller/ListControllerTest.php index d12b76d..e11283c 100644 --- a/tests/Integration/Controller/ListControllerTest.php +++ b/tests/Integration/Controller/ListControllerTest.php @@ -118,7 +118,7 @@ public function getListsWithCurrentSessionKeyReturnsListData() 'public' => true, 'category' => '', 'id' => 3, - ] + ], ] ); } From b5985f6dac4126caba02d5a4d4e55b7ece2de29f Mon Sep 17 00:00:00 2001 From: Xheni Myrtaj Date: Wed, 3 Apr 2019 16:47:46 +0100 Subject: [PATCH 5/7] Change function name to Countsubscribers, fix the tests Signed-off-by: Xheni Myrtaj --- src/Controller/ListController.php | 2 +- .../Controller/ListControllerTest.php | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Controller/ListController.php b/src/Controller/ListController.php index 279753e..cd7599a 100644 --- a/src/Controller/ListController.php +++ b/src/Controller/ListController.php @@ -106,7 +106,7 @@ public function getMembersAction(Request $request, SubscriberList $list): View * * @return View */ - public function getCountAction(Request $request, SubscriberList $list): View + public function getCountsubscribersAction(Request $request, SubscriberList $list): View { $this->requireAuthentication($request); diff --git a/tests/Integration/Controller/ListControllerTest.php b/tests/Integration/Controller/ListControllerTest.php index e11283c..083b795 100644 --- a/tests/Integration/Controller/ListControllerTest.php +++ b/tests/Integration/Controller/ListControllerTest.php @@ -335,12 +335,12 @@ public function getListMembersWithCurrentSessionKeyForExistingListWithSubscriber /** * @test */ - public function getListCountForExistingListWithoutSessionKeyReturnsForbiddenStatus() + public function getListCountsubscribersForExistingListWithoutSessionKeyReturnsForbiddenStatus() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->applyDatabaseChanges(); - $this->client->request('get', '/api/v2/lists/1/count'); + $this->client->request('get', '/api/v2/lists/1/countsubscribers'); $this->assertHttpForbidden(); } @@ -348,7 +348,7 @@ public function getListCountForExistingListWithoutSessionKeyReturnsForbiddenStat /** * @test */ - public function getListCountForExistingListWithExpiredSessionKeyReturnsForbiddenStatus() + public function getListCountsubscribersForExistingListWithExpiredSessionKeyReturnsForbiddenStatus() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->getDataSet()->addTable(static::ADMINISTRATOR_TABLE_NAME, __DIR__ . '/Fixtures/Administrator.csv'); @@ -357,7 +357,7 @@ public function getListCountForExistingListWithExpiredSessionKeyReturnsForbidden $this->client->request( 'get', - '/api/v2/lists/1/count', + '/api/v2/lists/1/countsubscribers', [], [], ['PHP_AUTH_USER' => 'unused', 'PHP_AUTH_PW' => 'cfdf64eecbbf336628b0f3071adba763'] @@ -369,12 +369,12 @@ public function getListCountForExistingListWithExpiredSessionKeyReturnsForbidden /** * @test */ - public function getListCountWithCurrentSessionKeyForExistingListReturnsOkayStatus() + public function getListCountsubscribersWithCurrentSessionKeyForExistingListReturnsOkayStatus() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->applyDatabaseChanges(); - $this->authenticatedJsonRequest('get', '/api/v2/lists/1/count'); + $this->authenticatedJsonRequest('get', '/api/v2/lists/1/countsubscribers'); $this->assertHttpOkay(); } @@ -382,32 +382,32 @@ public function getListCountWithCurrentSessionKeyForExistingListReturnsOkayStatu /** * @test */ - public function getListCountWithCurrentSessionKeyForExistingListWithSubscribersReturnsSubscribersCount() + public function getListCountsubscribersWithCurrentSessionKeyForExistingListWithNoSubscribersReturnsZero() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/Fixtures/Subscriber.csv'); $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/Fixtures/Subscription.csv'); $this->applyDatabaseChanges(); - $this->authenticatedJsonRequest('get', '/api/v2/lists/2/count'); + $this->authenticatedJsonRequest('get', '/api/v2/lists/3/countsubscribers'); $response = $this->getResponseContentAsInt(); - - static::assertSame(1, $response); + + static::assertSame(0, $response); } /** * @test */ - public function getListCountWithCurrentSessionKeyForExistingListWithNoSubscribersReturnsZero() + public function getListCountsubscribersWithCurrentSessionKeyForExistingListWithSubscribersReturnsSubscribersCount() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/Fixtures/Subscriber.csv'); $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/Fixtures/Subscription.csv'); $this->applyDatabaseChanges(); - $this->authenticatedJsonRequest('get', '/api/v2/lists/3/count'); + $this->authenticatedJsonRequest('get', '/api/v2/lists/2/countsubscribers'); $response = $this->getResponseContentAsInt(); - static::assertSame(0, $response); + static::assertSame(1, $response); } } From 36281cad16744ae5b61f67caf3b6b6dc83292ca2 Mon Sep 17 00:00:00 2001 From: Xheni Myrtaj Date: Tue, 23 Apr 2019 10:46:42 +0200 Subject: [PATCH 6/7] Change the function name to getCountSubscribersAction Signed-off-by: Xheni Myrtaj --- src/Controller/ListController.php | 2 +- .../Controller/ListControllerTest.php | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Controller/ListController.php b/src/Controller/ListController.php index cd7599a..18ca299 100644 --- a/src/Controller/ListController.php +++ b/src/Controller/ListController.php @@ -106,7 +106,7 @@ public function getMembersAction(Request $request, SubscriberList $list): View * * @return View */ - public function getCountsubscribersAction(Request $request, SubscriberList $list): View + public function getCountSubscribersAction(Request $request, SubscriberList $list): View { $this->requireAuthentication($request); diff --git a/tests/Integration/Controller/ListControllerTest.php b/tests/Integration/Controller/ListControllerTest.php index 083b795..ae6f0d3 100644 --- a/tests/Integration/Controller/ListControllerTest.php +++ b/tests/Integration/Controller/ListControllerTest.php @@ -335,12 +335,12 @@ public function getListMembersWithCurrentSessionKeyForExistingListWithSubscriber /** * @test */ - public function getListCountsubscribersForExistingListWithoutSessionKeyReturnsForbiddenStatus() + public function getListCountSubscribersForExistingListWithoutSessionKeyReturnsForbiddenStatus() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->applyDatabaseChanges(); - $this->client->request('get', '/api/v2/lists/1/countsubscribers'); + $this->client->request('get', '/api/v2/lists/1/count/subscribers'); $this->assertHttpForbidden(); } @@ -348,7 +348,7 @@ public function getListCountsubscribersForExistingListWithoutSessionKeyReturnsFo /** * @test */ - public function getListCountsubscribersForExistingListWithExpiredSessionKeyReturnsForbiddenStatus() + public function getListCountSubscribersForExistingListWithExpiredSessionKeyReturnsForbiddenStatus() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->getDataSet()->addTable(static::ADMINISTRATOR_TABLE_NAME, __DIR__ . '/Fixtures/Administrator.csv'); @@ -357,7 +357,7 @@ public function getListCountsubscribersForExistingListWithExpiredSessionKeyRetur $this->client->request( 'get', - '/api/v2/lists/1/countsubscribers', + '/api/v2/lists/1/count/subscribers', [], [], ['PHP_AUTH_USER' => 'unused', 'PHP_AUTH_PW' => 'cfdf64eecbbf336628b0f3071adba763'] @@ -369,12 +369,12 @@ public function getListCountsubscribersForExistingListWithExpiredSessionKeyRetur /** * @test */ - public function getListCountsubscribersWithCurrentSessionKeyForExistingListReturnsOkayStatus() + public function getListCountSubscribersWithCurrentSessionKeyForExistingListReturnsOkayStatus() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->applyDatabaseChanges(); - $this->authenticatedJsonRequest('get', '/api/v2/lists/1/countsubscribers'); + $this->authenticatedJsonRequest('get', '/api/v2/lists/1/count/subscribers'); $this->assertHttpOkay(); } @@ -382,32 +382,32 @@ public function getListCountsubscribersWithCurrentSessionKeyForExistingListRetur /** * @test */ - public function getListCountsubscribersWithCurrentSessionKeyForExistingListWithNoSubscribersReturnsZero() + public function getListCountSubscribersWithCurrentSessionKeyForExistingListWithNoSubscribersReturnsZero() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/Fixtures/Subscriber.csv'); $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/Fixtures/Subscription.csv'); $this->applyDatabaseChanges(); - $this->authenticatedJsonRequest('get', '/api/v2/lists/3/countsubscribers'); - $response = $this->getResponseContentAsInt(); + $this->authenticatedJsonRequest('get', '/api/v2/lists/3/count/subscribers'); + $responseContent = $this->getResponseContentAsInt(); - static::assertSame(0, $response); + static::assertSame(0, $responseContent); } /** * @test */ - public function getListCountsubscribersWithCurrentSessionKeyForExistingListWithSubscribersReturnsSubscribersCount() + public function getListCountSubscribersWithCurrentSessionKeyForExistingListWithSubscribersReturnsSubscribersCount() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/Fixtures/Subscriber.csv'); $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/Fixtures/Subscription.csv'); $this->applyDatabaseChanges(); - $this->authenticatedJsonRequest('get', '/api/v2/lists/2/countsubscribers'); - $response = $this->getResponseContentAsInt(); + $this->authenticatedJsonRequest('get', '/api/v2/lists/2/count/subscribers'); + $responseContent = $this->getResponseContentAsInt(); - static::assertSame(1, $response); + static::assertSame(1, $responseContent); } } From 23a897483f0338be498c3eed60619efceea34c74 Mon Sep 17 00:00:00 2001 From: Xheni Myrtaj Date: Tue, 23 Apr 2019 14:02:06 +0200 Subject: [PATCH 7/7] Change the name to SubscribersCount Signed-off-by: Xheni Myrtaj --- src/Controller/ListController.php | 2 +- .../Controller/ListControllerTest.php | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Controller/ListController.php b/src/Controller/ListController.php index 18ca299..d73bb00 100644 --- a/src/Controller/ListController.php +++ b/src/Controller/ListController.php @@ -106,7 +106,7 @@ public function getMembersAction(Request $request, SubscriberList $list): View * * @return View */ - public function getCountSubscribersAction(Request $request, SubscriberList $list): View + public function getSubscribersCountAction(Request $request, SubscriberList $list): View { $this->requireAuthentication($request); diff --git a/tests/Integration/Controller/ListControllerTest.php b/tests/Integration/Controller/ListControllerTest.php index ae6f0d3..4b449e4 100644 --- a/tests/Integration/Controller/ListControllerTest.php +++ b/tests/Integration/Controller/ListControllerTest.php @@ -335,12 +335,12 @@ public function getListMembersWithCurrentSessionKeyForExistingListWithSubscriber /** * @test */ - public function getListCountSubscribersForExistingListWithoutSessionKeyReturnsForbiddenStatus() + public function getListSubscribersCountForExistingListWithoutSessionKeyReturnsForbiddenStatus() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->applyDatabaseChanges(); - $this->client->request('get', '/api/v2/lists/1/count/subscribers'); + $this->client->request('get', '/api/v2/lists/1/subscribers/count'); $this->assertHttpForbidden(); } @@ -348,7 +348,7 @@ public function getListCountSubscribersForExistingListWithoutSessionKeyReturnsFo /** * @test */ - public function getListCountSubscribersForExistingListWithExpiredSessionKeyReturnsForbiddenStatus() + public function getListSubscribersCountForExistingListWithExpiredSessionKeyReturnsForbiddenStatus() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->getDataSet()->addTable(static::ADMINISTRATOR_TABLE_NAME, __DIR__ . '/Fixtures/Administrator.csv'); @@ -357,7 +357,7 @@ public function getListCountSubscribersForExistingListWithExpiredSessionKeyRetur $this->client->request( 'get', - '/api/v2/lists/1/count/subscribers', + '/api/v2/lists/1/subscribers/count', [], [], ['PHP_AUTH_USER' => 'unused', 'PHP_AUTH_PW' => 'cfdf64eecbbf336628b0f3071adba763'] @@ -369,12 +369,12 @@ public function getListCountSubscribersForExistingListWithExpiredSessionKeyRetur /** * @test */ - public function getListCountSubscribersWithCurrentSessionKeyForExistingListReturnsOkayStatus() + public function getListSubscribersCountWithCurrentSessionKeyForExistingListReturnsOkayStatus() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->applyDatabaseChanges(); - $this->authenticatedJsonRequest('get', '/api/v2/lists/1/count/subscribers'); + $this->authenticatedJsonRequest('get', '/api/v2/lists/1/subscribers/count'); $this->assertHttpOkay(); } @@ -382,14 +382,14 @@ public function getListCountSubscribersWithCurrentSessionKeyForExistingListRetur /** * @test */ - public function getListCountSubscribersWithCurrentSessionKeyForExistingListWithNoSubscribersReturnsZero() + public function getListSubscribersCountWithCurrentSessionKeyForExistingListWithNoSubscribersReturnsZero() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/Fixtures/Subscriber.csv'); $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/Fixtures/Subscription.csv'); $this->applyDatabaseChanges(); - $this->authenticatedJsonRequest('get', '/api/v2/lists/3/count/subscribers'); + $this->authenticatedJsonRequest('get', '/api/v2/lists/3/subscribers/count'); $responseContent = $this->getResponseContentAsInt(); static::assertSame(0, $responseContent); @@ -398,14 +398,14 @@ public function getListCountSubscribersWithCurrentSessionKeyForExistingListWithN /** * @test */ - public function getListCountSubscribersWithCurrentSessionKeyForExistingListWithSubscribersReturnsSubscribersCount() + public function getListSubscribersCountWithCurrentSessionKeyForExistingListWithSubscribersReturnsSubscribersCount() { $this->getDataSet()->addTable(static::LISTS_TABLE_NAME, __DIR__ . '/Fixtures/SubscriberList.csv'); $this->getDataSet()->addTable(static::SUBSCRIBER_TABLE_NAME, __DIR__ . '/Fixtures/Subscriber.csv'); $this->getDataSet()->addTable(static::SUBSCRIPTION_TABLE_NAME, __DIR__ . '/Fixtures/Subscription.csv'); $this->applyDatabaseChanges(); - $this->authenticatedJsonRequest('get', '/api/v2/lists/2/count/subscribers'); + $this->authenticatedJsonRequest('get', '/api/v2/lists/2/subscribers/count'); $responseContent = $this->getResponseContentAsInt(); static::assertSame(1, $responseContent);