From 8dd31f895e612cc072b43c4f4727df9af8c454fa Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 10 Nov 2018 15:30:11 -0800 Subject: [PATCH] Fix test, update changelog --- CHANGELOG.md | 1 + tests/Unit/Http/Controllers/Base/IndexControllerTest.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea2027f69..0f388a7f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. * Terminal was not properly displaying longer lines leading to some visual inconsistency. * Assorted translation updates. * Pagination for server listing now properly respects configuration setting. +* Client API now properly respects permissions that are set and allows subusers to access their assigned servers. ### Changed * Removed PhraseApp integration from Panel code as it is no longer used. diff --git a/tests/Unit/Http/Controllers/Base/IndexControllerTest.php b/tests/Unit/Http/Controllers/Base/IndexControllerTest.php index 6f18138ad..ebcb565e9 100644 --- a/tests/Unit/Http/Controllers/Base/IndexControllerTest.php +++ b/tests/Unit/Http/Controllers/Base/IndexControllerTest.php @@ -73,7 +73,7 @@ class IndexControllerTest extends ControllerTestCase $this->request->shouldReceive('input')->with('query')->once()->andReturn('searchTerm'); $this->repository->shouldReceive('setSearchTerm')->with('searchTerm')->once()->andReturnSelf() - ->shouldReceive('filterUserAccessServers')->with($model, User::FILTER_LEVEL_ALL) + ->shouldReceive('filterUserAccessServers')->with($model, User::FILTER_LEVEL_ALL, config('pterodactyl.paginate.frontend.servers')) ->once()->andReturn($paginator); $response = $this->controller->getIndex($this->request);