1
0
mirror of https://github.com/flarum/core.git synced 2025-07-30 21:20:24 +02:00

Fix failing tests + CS

This commit is contained in:
Toby Zerner
2015-10-11 23:37:51 +10:30
parent 208d90293d
commit b53e612007
5 changed files with 22 additions and 20 deletions

View File

@@ -2,6 +2,8 @@
namespace tests\Flarum\Admin\Middleware;
use Flarum\Admin\Middleware\AuthenticateWithCookie;
use Flarum\Admin\Middleware\RequireAdministrateAbility;
use Flarum\Core\Access\Gate;
use Flarum\Core\Exception\PermissionDeniedException;
use Illuminate\Contracts\Container\Container;
use Mockery as m;
@@ -9,19 +11,19 @@ use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use tests\Test\TestCase;
class LoginWithCookieAndCheckAdminTest extends TestCase
class RequireAdministrateAbilityTest extends TestCase
{
public function test_it_should_not_allow_invalid_logins()
{
$this->setExpectedException(PermissionDeniedException::class);
$container = m::mock(Container::class);
$request = m::mock(ServerRequestInterface::class);
$gate = m::mock(Gate::class);
$request = m::mock(ServerRequestInterface::class)->shouldIgnoreMissing();
$response = m::mock(ResponseInterface::class);
$request->shouldReceive('getCookieParams')->andReturn([]);
$gate->shouldReceive('forUser->allows')->andReturn(false);
$middleware = new AuthenticateWithCookie($container);
$middleware = new RequireAdministrateAbility($gate);
$middleware->__invoke($request, $response);
}
}

View File

@@ -19,14 +19,14 @@ class DatabaseSettingsRepositoryTest extends TestCase
public function test_requesting_an_existing_setting_should_return_its_value()
{
$this->connection->shouldReceive("table->where->pluck")->andReturn('value');
$this->connection->shouldReceive("table->where->value")->andReturn('value');
$this->assertEquals('value', $this->repository->get('key'));
}
public function test_non_existent_setting_values_should_return_null()
{
$this->connection->shouldReceive("table->where->pluck")->andReturn(null);
$this->connection->shouldReceive("table->where->value")->andReturn(null);
$this->assertEquals('default', $this->repository->get('key', 'default'));
}