Fix remaining broken tests

This commit is contained in:
Dane Everitt 2018-07-04 19:38:23 -07:00
parent 6c20ea9881
commit c82f273d85
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
7 changed files with 22 additions and 61 deletions

View file

@ -3,19 +3,12 @@
namespace Tests\Unit\Http\Middleware\API;
use Mockery as m;
use Barryvdh\Debugbar\LaravelDebugbar;
use Illuminate\Contracts\Config\Repository;
use Illuminate\Contracts\Foundation\Application;
use Tests\Unit\Http\Middleware\MiddlewareTestCase;
use Pterodactyl\Http\Middleware\Api\SetSessionDriver;
class SetSessionDriverTest extends MiddlewareTestCase
{
/**
* @var \Illuminate\Contracts\Foundation\Application|\Mockery\Mock
*/
private $appMock;
/**
* @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock
*/
@ -28,29 +21,14 @@ class SetSessionDriverTest extends MiddlewareTestCase
{
parent::setUp();
$this->appMock = m::mock(Application::class);
$this->config = m::mock(Repository::class);
}
/**
* Test that a production environment does not try to disable debug bar.
*/
public function testProductionEnvironment()
public function testMiddleware()
{
$this->config->shouldReceive('get')->once()->with('app.debug')->andReturn(false);
$this->config->shouldReceive('set')->once()->with('session.driver', 'array')->andReturnNull();
$this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
}
/**
* Test that a local environment does disable debug bar.
*/
public function testLocalEnvironment()
{
$this->config->shouldReceive('get')->once()->with('app.debug')->andReturn(true);
$this->appMock->shouldReceive('make')->once()->with(LaravelDebugbar::class)->andReturnSelf();
$this->appMock->shouldReceive('disable')->once()->withNoArgs()->andReturnNull();
$this->config->shouldReceive('set')->once()->with('session.driver', 'array')->andReturnNull();
$this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
@ -63,6 +41,6 @@ class SetSessionDriverTest extends MiddlewareTestCase
*/
private function getMiddleware(): SetSessionDriver
{
return new SetSessionDriver($this->appMock, $this->config);
return new SetSessionDriver($this->config);
}
}

View file

@ -88,7 +88,7 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
$response = $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
$this->assertInstanceOf(RedirectResponse::class, $response);
$this->assertEquals(route('account.security'), $response->getTargetUrl());
$this->assertEquals(route('account'), $response->getTargetUrl());
}
/**
@ -132,7 +132,7 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
$response = $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
$this->assertInstanceOf(RedirectResponse::class, $response);
$this->assertEquals(route('account.security'), $response->getTargetUrl());
$this->assertEquals(route('account'), $response->getTargetUrl());
}
/**
@ -156,7 +156,8 @@ class RequireTwoFactorAuthenticationTest extends MiddlewareTestCase
public function ignoredRoutesDataProvider()
{
return [
['account.security'],
['auth'],
['account'],
['account.security.revoke'],
['account.security.totp'],
['account.security.totp.set'],