Merge branch '4.1'

* 4.1:
  fix tests
This commit is contained in:
Fabien Potencier 2018-05-25 09:49:09 +02:00
commit 97622b2172
2 changed files with 9 additions and 4 deletions

View File

@ -35,18 +35,18 @@ class LogoutTest extends WebTestCase
public function testCsrfTokensAreClearedOnLogout()
{
$client = $this->createClient(array('test_case' => 'LogoutWithoutSessionInvalidation', 'root_config' => 'config.yml'));
$client->getContainer()->get('security.csrf.token_storage')->setToken('foo', 'bar');
$client->getContainer()->get('test.security.csrf.token_storage')->setToken('foo', 'bar');
$client->request('POST', '/login', array(
'_username' => 'johannes',
'_password' => 'test',
));
$this->assertTrue($client->getContainer()->get('security.csrf.token_storage')->hasToken('foo'));
$this->assertSame('bar', $client->getContainer()->get('security.csrf.token_storage')->getToken('foo'));
$this->assertTrue($client->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));
$this->assertSame('bar', $client->getContainer()->get('test.security.csrf.token_storage')->getToken('foo'));
$client->request('GET', '/logout');
$this->assertFalse($client->getContainer()->get('security.csrf.token_storage')->hasToken('foo'));
$this->assertFalse($client->getContainer()->get('test.security.csrf.token_storage')->hasToken('foo'));
}
}

View File

@ -1,6 +1,11 @@
imports:
- { resource: ./../config/framework.yml }
services:
test.security.csrf.token_storage:
alias: security.csrf.token_storage
public: true
security:
encoders:
Symfony\Component\Security\Core\User\User: plaintext