Merge branch 'develop' into feature/vue-serverview

This commit is contained in:
Dane Everitt 2018-09-05 21:34:59 -07:00
commit 5ca13839cf
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
110 changed files with 7190 additions and 2093 deletions

View file

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