pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Ensure language is valid

Browse Source 
- Do not override locale if user has choosen a locale from the login screen.
- Add some tests about locale url
This commit is contained in:
Jeremy Benoist
2018-10-13 09:24:39 +02:00
parent be417ef236
commit 4d4147b228
6 changed files with 76 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
View File

@ -965,4 +965,39 @@ class ConfigControllerTest extends WallabagCoreTestCase
$client->request('GET', '/config/view-mode');
}
public function testChangeLocaleWithoutReferer()
{
$client = $this->getClient();
$client->request('GET', '/locale/de');
$client->followRedirect();
$this->assertSame('de', $client->getRequest()->getLocale());
$this->assertSame('de', $client->getContainer()->get('session')->get('_locale'));
}
public function testChangeLocaleWithReferer()
{
$client = $this->getClient();
$client->request('GET', '/login');
$client->request('GET', '/locale/de');
$client->followRedirect();
$this->assertSame('de', $client->getRequest()->getLocale());
$this->assertSame('de', $client->getContainer()->get('session')->get('_locale'));
}
public function testChangeLocaleToBadLocale()
{
$client = $this->getClient();
$client->request('GET', '/login');
$client->request('GET', '/locale/yuyuyuyu');
$client->followRedirect();
$this->assertNotSame('yuyuyuyu', $client->getRequest()->getLocale());
$this->assertNotSame('yuyuyuyu', $client->getContainer()->get('session')->get('_locale'));
}
}

23
tests/Wallabag/CoreBundle/Event/Listener/UserLocaleListenerTest.php
View File

@ -56,4 +56,27 @@ class UserLocaleListenerTest extends TestCase
$this->assertNull($session->get('_locale'));
}
public function testWithLanguageFromSession()
{
$session = new Session(new MockArraySessionStorage());
$listener = new UserLocaleListener($session);
$session->set('_locale', 'de');
$user = new User();
$user->setEnabled(true);
$config = new Config($user);
$config->setLanguage('fr');
$user->setConfig($config);
$userToken = new UsernamePasswordToken($user, '', 'test');
$request = Request::create('/');
$event = new InteractiveLoginEvent($request, $userToken);
$listener->onInteractiveLogin($event);
$this->assertSame('de', $session->get('_locale'));
}
}