Fix multiple controller unit test failures
This commit is contained in:
parent
7b3393aff9
commit
54228e8124
9 changed files with 404 additions and 317 deletions
|
@ -2,22 +2,14 @@
|
|||
|
||||
namespace Tests\Unit\Http\Middleware;
|
||||
|
||||
use Mockery as m;
|
||||
use Tests\TestCase;
|
||||
use Illuminate\Http\Request;
|
||||
use Pterodactyl\Models\User;
|
||||
use Tests\Traits\Http\RequestMockHelpers;
|
||||
use Tests\Traits\Http\MocksMiddlewareClosure;
|
||||
use Symfony\Component\HttpFoundation\ParameterBag;
|
||||
use Tests\Assertions\MiddlewareAttributeAssertionsTrait;
|
||||
|
||||
abstract class MiddlewareTestCase extends TestCase
|
||||
{
|
||||
use MiddlewareAttributeAssertionsTrait, MocksMiddlewareClosure;
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Http\Request|\Mockery\Mock
|
||||
*/
|
||||
protected $request;
|
||||
use MiddlewareAttributeAssertionsTrait, MocksMiddlewareClosure, RequestMockHelpers;
|
||||
|
||||
/**
|
||||
* Setup tests with a mocked request object and normal attributes.
|
||||
|
@ -26,33 +18,6 @@ abstract class MiddlewareTestCase extends TestCase
|
|||
{
|
||||
parent::setUp();
|
||||
|
||||
$this->request = m::mock(Request::class);
|
||||
$this->request->attributes = new ParameterBag();
|
||||
}
|
||||
|
||||
/**
|
||||
* Set a request attribute on the mock object.
|
||||
*
|
||||
* @param string $attribute
|
||||
* @param mixed $value
|
||||
*/
|
||||
protected function setRequestAttribute(string $attribute, $value)
|
||||
{
|
||||
$this->request->attributes->set($attribute, $value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the mocked request user. If a user model is not provided, a factory model
|
||||
* will be created and returned.
|
||||
*
|
||||
* @param \Pterodactyl\Models\User|null $user
|
||||
* @return \Pterodactyl\Models\User
|
||||
*/
|
||||
protected function setRequestUser(User $user = null): User
|
||||
{
|
||||
$user = $user instanceof User ? $user : factory(User::class)->make();
|
||||
$this->request->shouldReceive('user')->withNoArgs()->andReturn($user);
|
||||
|
||||
return $user;
|
||||
$this->buildRequestMock();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue