Merge branch '3.4' into 4.0

* 3.4:
  [SecurityBundle] fix test
This commit is contained in:
Nicolas Grekas 2018-05-25 13:23:22 +02:00
commit c0894b1a21

View File

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