Update middleware code

This commit is contained in:
Dane Everitt 2018-09-03 15:17:53 -07:00
parent 9706a8dc34
commit fd49e524c8
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 9 additions and 33 deletions

View file

@ -3,10 +3,9 @@
namespace Tests\Unit\Http\Middleware;
use Mockery as m;
use Illuminate\Foundation\Application;
use Illuminate\Contracts\Config\Repository;
use Pterodactyl\Http\Middleware\LanguageMiddleware;
use Pterodactyl\Models\User;
use Illuminate\Foundation\Application;
use Pterodactyl\Http\Middleware\LanguageMiddleware;
class LanguageMiddlewareTest extends MiddlewareTestCase
{
@ -15,11 +14,6 @@ class LanguageMiddlewareTest extends MiddlewareTestCase
*/
private $appMock;
/**
* @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock
*/
private $config;
/**
* Setup tests.
*/
@ -28,7 +22,6 @@ class LanguageMiddlewareTest extends MiddlewareTestCase
parent::setUp();
$this->appMock = m::mock(Application::class);
$this->config = m::mock(Repository::class);
}
/**
@ -37,8 +30,6 @@ class LanguageMiddlewareTest extends MiddlewareTestCase
public function testLanguageIsSetForGuest()
{
$this->request->shouldReceive('user')->withNoArgs()->andReturnNull();
$this->config->shouldReceive('get')->with('app.locale', 'en')->once()->andReturn('en');
$this->appMock->shouldReceive('setLocale')->with('en')->once()->andReturnNull();
$this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
@ -47,7 +38,8 @@ class LanguageMiddlewareTest extends MiddlewareTestCase
/**
* Test that a language is defined via the middleware for a user.
*/
public function testLanguageIsSetWithAuthenticatedUser() {
public function testLanguageIsSetWithAuthenticatedUser()
{
$user = factory(User::class)->make(['language' => 'de']);
$this->request->shouldReceive('user')->withNoArgs()->andReturn($user);
@ -63,6 +55,6 @@ class LanguageMiddlewareTest extends MiddlewareTestCase
*/
private function getMiddleware(): LanguageMiddleware
{
return new LanguageMiddleware($this->appMock, $this->config);
return new LanguageMiddleware($this->appMock);
}
}