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

Convert english translation file

Browse Source 
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
This commit is contained in:
Jeremy Benoist
2016-03-09 08:59:08 +01:00
parent d2b4f01d74
commit 0d42217e4e
80 changed files with 1145 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
View File

@ -102,7 +102,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'change_passwd[new_password][first]' => '',
'change_passwd[new_password][second]' => '',
),
'Wrong value for your current password',
'validator.password_wrong_value',
),
array(
array(
@ -118,7 +118,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'change_passwd[new_password][first]' => 'hop',
'change_passwd[new_password][second]' => '',
),
'The password fields must match',
'validator.password_must_match',
),
array(
array(
@ -126,7 +126,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'change_passwd[new_password][first]' => 'hop',
'change_passwd[new_password][second]' => 'hop',
),
'Password should by at least',
'validator.password_too_short',
),
);
}
@ -188,14 +188,14 @@ class ConfigControllerTest extends WallabagCoreTestCase
'update_user[name]' => '',
'update_user[email]' => '',
),
'Please enter an email',
'fos_user.email.blank',
),
array(
array(
'update_user[name]' => '',
'update_user[email]' => 'test',
),
'The email is not valid',
'fos_user.email.invalid',
),
);
}
@ -244,7 +244,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
$crawler = $client->followRedirect();
$this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
$this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(array('_text')));
$this->assertContains('Information updated', $alert[0]);
}
@ -258,7 +258,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'new_user[plainPassword][second]' => '',
'new_user[email]' => '',
),
'Please enter a username',
'fos_user.username.blank',
),
array(
array(
@ -267,7 +267,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'new_user[plainPassword][second]' => 'mypassword',
'new_user[email]' => '',
),
'The username is too short',
'fos_user.username.short',
),
array(
array(
@ -276,7 +276,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'new_user[plainPassword][second]' => 'mypassword',
'new_user[email]' => 'test',
),
'The email is not valid',
'fos_user.email.invalid',
),
array(
array(
@ -285,7 +285,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'new_user[plainPassword][second]' => 'wallacewallace',
'new_user[email]' => 'wallace@wallace.me',
),
'The username is already used',
'fos_user.username.already_used',
),
array(
array(
@ -294,7 +294,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
'new_user[plainPassword][second]' => 'mypassword2',
'new_user[email]' => 'wallace@wallace.me',
),
'The password fields must match',
'validator.password_must_match',
),
);
}
@ -382,7 +382,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(array('_text')));
$this->assertContains('You need to generate a token first.', $body[0]);
$this->assertContains('config.form_rss.no_token', $body[0]);
$client->request('GET', '/generate-token');
$this->assertEquals(302, $client->getResponse()->getStatusCode());
@ -390,7 +390,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
$crawler = $client->followRedirect();
$this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(array('_text')));
$this->assertNotContains('You need to generate a token first.', $body[0]);
$this->assertNotContains('config.form_rss.no_token', $body[0]);
}
public function testGenerateTokenAjax()
@ -454,7 +454,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
array(
'rss_config[rss_limit]' => 1000000000000,
),
'This will certainly kill the app',
'validator.rss_limit_too_hight',
),
);
}

16
src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
View File

@ -28,14 +28,14 @@ class EntryControllerTest extends WallabagCoreTestCase
$client->followRedirect();
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$this->assertContains('We\'ll accompany you to visit wallabag', $client->getResponse()->getContent());
$this->assertContains('quickstart.intro.paragraph_1', $client->getResponse()->getContent());
// Test if quickstart is disabled when user has 1 entry
$crawler = $client->request('GET', '/new');
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$form = $crawler->filter('button[type=submit]')->form();
$form = $crawler->filter('form[name=entry]')->form();
$data = array(
'entry[url]' => $this->url,
@ -46,7 +46,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$client->followRedirect();
$client->request('GET', '/unread/list');
$this->assertContains('There is one entry.', $client->getResponse()->getContent());
$this->assertContains('entry.list.number_on_the_page', $client->getResponse()->getContent());
}
public function testGetNew()
@ -59,7 +59,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$this->assertCount(1, $crawler->filter('input[type=url]'));
$this->assertCount(1, $crawler->filter('button[type=submit]'));
$this->assertCount(1, $crawler->filter('form[name=entry]'));
}
public function testPostNewViaBookmarklet()
@ -96,7 +96,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$form = $crawler->filter('button[type=submit]')->form();
$form = $crawler->filter('form[name=entry]')->form();
$crawler = $client->submit($form);
@ -117,7 +117,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$form = $crawler->filter('button[type=submit]')->form();
$form = $crawler->filter('form[name=entry]')->form();
$data = array(
'entry[url]' => $this->url,
@ -146,7 +146,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$form = $crawler->filter('button[type=submit]')->form();
$form = $crawler->filter('form[name=entry]')->form();
$data = array(
'entry[url]' => $this->url,
@ -170,7 +170,7 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$form = $crawler->filter('button[type=submit]')->form();
$form = $crawler->filter('form[name=entry]')->form();
$data = array(
'entry[url]' => $url = 'https://github.com/wallabag/wallabag',

74
src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
View File

@ -12,53 +12,59 @@ class SecurityControllerTest extends WallabagCoreTestCase
$client = $this->getClient();
$client->followRedirects();
$client->request('GET', '/config');
$this->assertContains('RSS', $client->getResponse()->getContent());
$crawler = $client->request('GET', '/config');
$this->assertContains('config.form_rss.description', $crawler->filter('body')->extract(array('_text'))[0]);
}
public function testLoginWith2Factor()
{
$client = $this->getClient();
if ($client->getContainer()->getParameter('twofactor_auth')) {
$client->followRedirects();
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
$user->setTwoFactorAuthentication(true);
$em->persist($user);
$em->flush();
$this->logInAs('admin');
$client->request('GET', '/config');
$this->assertContains('trusted computer', $client->getResponse()->getContent());
// restore user
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
$user->setTwoFactorAuthentication(false);
$em->persist($user);
$em->flush();
if (!$client->getContainer()->getParameter('twofactor_auth')) {
$this->markTestSkipped('twofactor_auth is not enabled.');
return;
}
$client->followRedirects();
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
$user->setTwoFactorAuthentication(true);
$em->persist($user);
$em->flush();
$this->logInAs('admin');
$crawler = $client->request('GET', '/config');
$this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(array('_text'))[0]);
// restore user
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
$user->setTwoFactorAuthentication(false);
$em->persist($user);
$em->flush();
}
public function testTrustedComputer()
{
$client = $this->getClient();
if ($client->getContainer()->getParameter('twofactor_auth')) {
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
$date = new \DateTime();
$user->addTrustedComputer('ABCDEF', $date->add(new \DateInterval('P1M')));
$this->assertTrue($user->isTrustedComputer('ABCDEF'));
$this->assertFalse($user->isTrustedComputer('FEDCBA'));
if (!$client->getContainer()->getParameter('twofactor_auth')) {
$this->markTestSkipped('twofactor_auth is not enabled.');
return;
}
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
$date = new \DateTime();
$user->addTrustedComputer('ABCDEF', $date->add(new \DateInterval('P1M')));
$this->assertTrue($user->isTrustedComputer('ABCDEF'));
$this->assertFalse($user->isTrustedComputer('FEDCBA'));
}
}

2
src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
View File

@ -30,7 +30,7 @@ class TagControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/view/'.$entry->getId());
$form = $crawler->filter('button[id=tag_save]')->form();
$form = $crawler->filter('form[name=tag]')->form();
$data = array(
'tag[label]' => $this->tagName,