From 359b3f43cc42aa593cdba7dc8e1d6fa121cc3f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 29 Sep 2015 17:05:17 +0200
Subject: * rename AuthenticationListener * add tests

---
 .../EventListener/AuthenticationListener.php       | 44 ----------
 .../RegistrationConfirmedListener.php              | 44 ++++++++++
 .../CoreBundle/Resources/config/services.yml       |  2 +-
 .../views/themes/baggy/Security/login.html.twig    |  1 +
 .../Tests/Controller/SecurityControllerTest.php    | 93 ++++++++++++++++++++++
 5 files changed, 139 insertions(+), 45 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php
 create mode 100644 src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php

(limited to 'src')

diff --git a/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php b/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php
deleted file mode 100644
index 7c2826ec..00000000
--- a/src/Wallabag/CoreBundle/EventListener/AuthenticationListener.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\EventListener;
-
-use FOS\UserBundle\FOSUserEvents;
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use FOS\UserBundle\Event\FilterUserResponseEvent;
-use Wallabag\CoreBundle\Entity\Config;
-
-class AuthenticationListener implements EventSubscriberInterface
-{
-    private $em;
-    private $container;
-
-    public function __construct(Container $container, $em)
-    {
-        $this->container = $container;
-        $this->em = $em;
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            FOSUserEvents::REGISTRATION_CONFIRMED => 'authenticate',
-        );
-    }
-
-    public function authenticate(FilterUserResponseEvent $event, $eventName = null, EventDispatcherInterface $eventDispatcher = null)
-    {
-        if (!$event->getUser()->isEnabled()) {
-            return;
-        }
-
-        $config = new Config($event->getUser());
-        $config->setTheme($this->container->getParameter('theme'));
-        $config->setItemsPerPage($this->container->getParameter('items_on_page'));
-        $config->setRssLimit($this->container->getParameter('rss_limit'));
-        $config->setLanguage($this->container->getParameter('language'));
-        $this->em->persist($config);
-        $this->em->flush();
-    }
-}
diff --git a/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php b/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php
new file mode 100644
index 00000000..bcc84923
--- /dev/null
+++ b/src/Wallabag/CoreBundle/EventListener/RegistrationConfirmedListener.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Wallabag\CoreBundle\EventListener;
+
+use FOS\UserBundle\FOSUserEvents;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use FOS\UserBundle\Event\FilterUserResponseEvent;
+use Wallabag\CoreBundle\Entity\Config;
+
+class RegistrationConfirmedListener implements EventSubscriberInterface
+{
+    private $em;
+    private $container;
+
+    public function __construct(Container $container, $em)
+    {
+        $this->container = $container;
+        $this->em = $em;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return array(
+            FOSUserEvents::REGISTRATION_CONFIRMED => 'authenticate',
+        );
+    }
+
+    public function authenticate(FilterUserResponseEvent $event, $eventName = null, EventDispatcherInterface $eventDispatcher = null)
+    {
+        if (!$event->getUser()->isEnabled()) {
+            return;
+        }
+
+        $config = new Config($event->getUser());
+        $config->setTheme($this->container->getParameter('theme'));
+        $config->setItemsPerPage($this->container->getParameter('items_on_page'));
+        $config->setRssLimit($this->container->getParameter('rss_limit'));
+        $config->setLanguage($this->container->getParameter('language'));
+        $this->em->persist($config);
+        $this->em->flush();
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 96ea482a..f2247260 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -47,7 +47,7 @@ services:
             - @wallabag_core.graby
 
     wallabag_core.registration_confirmed:
-        class: Wallabag\CoreBundle\EventListener\AuthenticationListener
+        class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener
         arguments: [@service_container, @doctrine.orm.entity_manager]
         tags:
             - { name: kernel.event_subscriber }
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
index 5437d20c..9a59dfc6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
@@ -32,6 +32,7 @@
                 <div class="row mts txtcenter">
                     <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
                     <button type="submit">Login</button>
+                    <a href="{{ path('fos_user_registration_register') }}" class="button">{% trans %}Register{% endtrans %}</a>
                     <a href="{{ path('forgot_password') }}" class="small">Forgot your password?</a>
                 </div>
             </fieldset>
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
index 759ef01b..78b4952e 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
@@ -8,6 +8,99 @@ use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
 
 class SecurityControllerTest extends WallabagCoreTestCase
 {
+    public function testRegister()
+    {
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/register/');
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertContains('Register', $client->getResponse()->getContent());
+    }
+
+    public function dataForCreateAccountFailed()
+    {
+        return array(
+            array(
+                array(
+                    'fos_user_registration_form[email]' => '',
+                    'fos_user_registration_form[username]' => 'newuser',
+                    'fos_user_registration_form[plainPassword][first]' => 'mypassword',
+                    'fos_user_registration_form[plainPassword][second]' => 'mypassword',
+                ),
+                'Please enter an email',
+            ),
+            array(
+                array(
+                    'fos_user_registration_form[email]' => 'newuser@wallabag.org',
+                    'fos_user_registration_form[username]' => 'admin',
+                    'fos_user_registration_form[plainPassword][first]' => 'mypassword',
+                    'fos_user_registration_form[plainPassword][second]' => 'mypassword',
+                ),
+                'The username is already used',
+            ),
+            array(
+                array(
+                    'fos_user_registration_form[email]' => 'newuser@wallabag.org',
+                    'fos_user_registration_form[username]' => 'newuser',
+                    'fos_user_registration_form[plainPassword][first]' => 'mypassword1',
+                    'fos_user_registration_form[plainPassword][second]' => 'mypassword2',
+                ),
+                'The entered passwords don&#039;t match',
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider dataForCreateAccountFailed
+     */
+    public function testCreateAccountFailed($data, $expectedMessage)
+    {
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/register/');
+
+        $form = $crawler->filter('input[type=submit]')->form();
+
+        $client->submit($form, $data);
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertContains($expectedMessage, $client->getResponse()->getContent());
+    }
+
+    public function dataForCreateAccountSuccess()
+    {
+        return array(
+            array(
+                array(
+                    'fos_user_registration_form[email]' => 'newuser@wallabag.org',
+                    'fos_user_registration_form[username]' => 'newuser',
+                    'fos_user_registration_form[plainPassword][first]' => 'mypassword',
+                    'fos_user_registration_form[plainPassword][second]' => 'mypassword',
+                ),
+            )
+        );
+    }
+
+    /**
+     * @dataProvider dataForCreateAccountSuccess
+     */
+    public function testCreateAccountSuccess($data)
+    {
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/register/');
+
+        $form = $crawler->filter('input[type=submit]')->form();
+
+        $client->submit($form, $data);
+        $this->assertEquals(302, $client->getResponse()->getStatusCode());
+
+        $crawler = $client->followRedirect();
+
+        $this->assertContains('The user has been created successfully', $client->getResponse()->getContent());
+    }
+
     public function testLogin()
     {
         $client = $this->getClient();
-- 
cgit v1.2.3