Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt
2018-12-16 14:20:35 -08:00
54 changed files with 407 additions and 243 deletions

View File

@@ -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->index($this->request);