4 files changed, 87 insertions, 77 deletions

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 51425fe1..f2d26750 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -57,7 +57,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
         $crawler = $client->followRedirect();
 
         $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
-        $this->assertContains('Config saved', $alert[0]);
+        $this->assertContains('flashes.config.notice.config_saved', $alert[0]);
     }
 
     public function dataForUpdateFailed()
@@ -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',
             ),
         );
     }
@@ -177,7 +177,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
         $crawler = $client->followRedirect();
 
         $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
-        $this->assertContains('Password updated', $alert[0]);
+        $this->assertContains('flashes.config.notice.password_updated', $alert[0]);
     }
 
     public function dataForUserFailed()
@@ -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,8 +244,8 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $crawler = $client->followRedirect();
 
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
-        $this->assertContains('Information updated', $alert[0]);
+        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(array('_text')));
+        $this->assertContains('flashes.config.notice.user_updated', $alert[0]);
     }
 
     public function dataForNewUserFailed()
@@ -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',
             ),
         );
     }
@@ -346,7 +346,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
         $crawler = $client->followRedirect();
 
         $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
-        $this->assertContains('User "wallace" added', $alert[0]);
+        $this->assertContains('flashes.config.notice.user_added', $alert[0]);
 
         $em = $client->getContainer()->get('doctrine.orm.entity_manager');
         $user = $em
@@ -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()
@@ -418,11 +418,6 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $crawler = $client->request('GET', '/config');
 
-        if (500 == $client->getResponse()->getStatusCode()) {
-            var_export($client->getResponse()->getContent());
-            die();
-        }
-
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
         $form = $crawler->filter('button[id=rss_config_save]')->form();
@@ -438,7 +433,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
         $crawler = $client->followRedirect();
 
         $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
-        $this->assertContains('RSS information updated', $alert[0]);
+        $this->assertContains('flashes.config.notice.rss_updated', $alert[0]);
     }
 
     public function dataForRssFailed()
@@ -454,7 +449,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
                 array(
                     'rss_config[rss_limit]' => 1000000000000,
                 ),
-                'This will certainly kill the app',
+                'validator.rss_limit_too_hight',
             ),
         );
     }
@@ -504,7 +499,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
         $crawler = $client->followRedirect();
 
         $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
-        $this->assertContains('Tagging rules updated', $alert[0]);
+        $this->assertContains('flashes.config.notice.tagging_rules_updated', $alert[0]);
 
         $deleteLink = $crawler->filter('.delete')->last()->link();
 
@@ -513,7 +508,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $crawler = $client->followRedirect();
         $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
-        $this->assertContains('Tagging rule deleted', $alert[0]);
+        $this->assertContains('flashes.config.notice.tagging_rules_deleted', $alert[0]);
     }
 
     public function dataForTaggingRuleFailed()
@@ -556,12 +551,14 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $form = $crawler->filter('button[id=tagging_rule_save]')->form();
 
-        $client->submit($form, $data);
+        $crawler = $client->submit($form, $data);
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
+        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(array('_text')));
+
         foreach ($messages as $message) {
-            $this->assertContains($message, $client->getResponse()->getContent());
+            $this->assertContains($message, $body[0]);
         }
     }
 
@@ -574,9 +571,11 @@ class ConfigControllerTest extends WallabagCoreTestCase
             ->getRepository('WallabagCoreBundle:TaggingRule')
             ->findAll()[0];
 
-        $client->request('GET', '/tagging-rule/delete/'.$rule->getId());
+        $crawler = $client->request('GET', '/tagging-rule/delete/'.$rule->getId());
+
         $this->assertEquals(403, $client->getResponse()->getStatusCode());
-        $this->assertContains('You can not access this tagging ryle', $client->getResponse()->getContent());
+        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(array('_text')));
+        $this->assertContains('You can not access this tagging rule', $body[0]);
     }
 
     public function testDemoMode()
@@ -603,7 +602,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
         $client->submit($form, $data);
 
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertContains('In demonstration mode, you can\'t change password for this user.', $client->getContainer()->get('session')->getFlashBag()->get('notice')[0]);
+        $this->assertContains('flashes.config.notice.password_not_updated_demo', $client->getContainer()->get('session')->getFlashBag()->get('notice')[0]);
 
         $config->set('demo_mode_enabled', 0);
         $config->set('demo_mode_username', 'wallabag');
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
index 5512d6e1..46fbaf91 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
@@ -25,17 +25,18 @@ class EntryControllerTest extends WallabagCoreTestCase
         $client = $this->getClient();
 
         $client->request('GET', '/unread/list');
-        $client->followRedirect();
+        $crawler = $client->followRedirect();
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $this->assertContains('We\'ll accompany you to visit wallabag', $client->getResponse()->getContent());
+        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(array('_text')));
+        $this->assertContains('quickstart.intro.paragraph_1', $body[0]);
 
         // 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,
@@ -45,8 +46,9 @@ class EntryControllerTest extends WallabagCoreTestCase
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
         $client->followRedirect();
 
-        $client->request('GET', '/unread/list');
-        $this->assertContains('There is one entry.', $client->getResponse()->getContent());
+        $crawler = $client->request('GET', '/unread/list');
+        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(array('_text')));
+        $this->assertContains('entry.list.number_on_the_page', $body[0]);
     }
 
     public function testGetNew()
@@ -59,7 +61,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 +98,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 +119,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 +148,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 +172,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',
@@ -240,10 +242,11 @@ class EntryControllerTest extends WallabagCoreTestCase
             ->getRepository('WallabagCoreBundle:Entry')
             ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
 
-        $client->request('GET', '/view/'.$content->getId());
+        $crawler = $client->request('GET', '/view/'.$content->getId());
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $this->assertContains($content->getTitle(), $client->getResponse()->getContent());
+        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(array('_text')));
+        $this->assertContains($content->getTitle(), $body[0]);
     }
 
     /**
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
index b9f5d835..ed292633 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
@@ -12,53 +12,61 @@ 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');
+        if (!$client->getContainer()->getParameter('twofactor_auth')) {
+            $this->markTestSkipped('twofactor_auth is not enabled.');
 
-            $date = new \DateTime();
-            $user->addTrustedComputer('ABCDEF', $date->add(new \DateInterval('P1M')));
-            $this->assertTrue($user->isTrustedComputer('ABCDEF'));
-            $this->assertFalse($user->isTrustedComputer('FEDCBA'));
+            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'));
     }
 }
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
index d6391282..338121e7 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
@@ -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,