X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FTests%2FController%2FConfigControllerTest.php;h=d7d341aa28d1224172d6486c358ec6232a7b890b;hb=2385f891e5992e84501d4cd47565a7bf0af14331;hp=4aceed1506c5ccba21b6aab4c7e5ace06bf86a65;hpb=d9085c63e35bb708f560722fff5f4f5ad322c27b;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
index 4aceed15..d7d341aa 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
@@ -25,9 +25,9 @@ class ConfigControllerTest extends WallabagTestCase
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
-        $this->assertCount(1, $crawler->filter('input[type=number]'));
         $this->assertCount(1, $crawler->filter('button[id=config_save]'));
         $this->assertCount(1, $crawler->filter('button[id=change_passwd_save]'));
+        $this->assertCount(1, $crawler->filter('button[id=user_save]'));
     }
 
     public function testUpdate()
@@ -53,7 +53,7 @@ class ConfigControllerTest extends WallabagTestCase
 
         $crawler = $client->followRedirect();
 
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text')));
+        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
         $this->assertContains('Config saved', $alert[0]);
     }
 
@@ -104,7 +104,7 @@ class ConfigControllerTest extends WallabagTestCase
                     'change_passwd[new_password][first]' => '',
                     'change_passwd[new_password][second]' => '',
                 ),
-                'Wrong value for your current password'
+                'Wrong value for your current password',
             ),
             array(
                 array(
@@ -112,7 +112,7 @@ class ConfigControllerTest extends WallabagTestCase
                     'change_passwd[new_password][first]' => '',
                     'change_passwd[new_password][second]' => '',
                 ),
-                'This value should not be blank'
+                'This value should not be blank',
             ),
             array(
                 array(
@@ -120,7 +120,7 @@ class ConfigControllerTest extends WallabagTestCase
                     'change_passwd[new_password][first]' => 'hop',
                     'change_passwd[new_password][second]' => '',
                 ),
-                'The password fields must match'
+                'The password fields must match',
             ),
             array(
                 array(
@@ -128,7 +128,7 @@ class ConfigControllerTest extends WallabagTestCase
                     'change_passwd[new_password][first]' => 'hop',
                     'change_passwd[new_password][second]' => 'hop',
                 ),
-                'Password should by at least 6 chars long'
+                'Password should by at least',
             ),
         );
     }
@@ -178,7 +178,173 @@ class ConfigControllerTest extends WallabagTestCase
 
         $crawler = $client->followRedirect();
 
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.flash-notice')->extract(array('_text')));
+        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
         $this->assertContains('Password updated', $alert[0]);
     }
+
+    public function dataForUserFailed()
+    {
+        return array(
+            array(
+                array(
+                    'user[username]' => '',
+                    'user[name]' => '',
+                    'user[email]' => '',
+                ),
+                'This value should not be blank.',
+            ),
+            array(
+                array(
+                    'user[username]' => 'ad',
+                    'user[name]' => '',
+                    'user[email]' => '',
+                ),
+                'This value is too short.',
+            ),
+            array(
+                array(
+                    'user[username]' => 'admin',
+                    'user[name]' => '',
+                    'user[email]' => 'test',
+                ),
+                'This value is not a valid email address.',
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider dataForUserFailed
+     */
+    public function testUserFailed($data, $expectedMessage)
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/config');
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+        $form = $crawler->filter('button[id=user_save]')->form();
+
+        $crawler = $client->submit($form, $data);
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(array('_text')));
+        $this->assertContains($expectedMessage, $alert[0]);
+    }
+
+    public function testUserUpdate()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/config');
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+        $form = $crawler->filter('button[id=user_save]')->form();
+
+        $data = array(
+            'user[username]' => 'admin',
+            'user[name]' => 'new name',
+            'user[email]' => 'admin@wallabag.io',
+        );
+
+        $client->submit($form, $data);
+
+        $this->assertEquals(302, $client->getResponse()->getStatusCode());
+
+        $crawler = $client->followRedirect();
+
+        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
+        $this->assertContains('Information updated', $alert[0]);
+    }
+
+    public function dataForNewUserFailed()
+    {
+        return array(
+            array(
+                array(
+                    'new_user[username]' => '',
+                    'new_user[password]' => '',
+                    'new_user[email]' => '',
+                ),
+                'This value should not be blank.',
+            ),
+            array(
+                array(
+                    'new_user[username]' => 'ad',
+                    'new_user[password]' => '',
+                    'new_user[email]' => '',
+                ),
+                'This value is too short.',
+            ),
+            array(
+                array(
+                    'new_user[username]' => 'wallace',
+                    'new_user[password]' => '',
+                    'new_user[email]' => 'test',
+                ),
+                'This value is not a valid email address.',
+            ),
+            array(
+                array(
+                    'new_user[username]' => 'wallace',
+                    'new_user[password]' => 'admin',
+                    'new_user[email]' => 'wallace@wallace.me',
+                ),
+                'Password should by at least',
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider dataForNewUserFailed
+     */
+    public function testNewUserFailed($data, $expectedMessage)
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/config');
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+        $form = $crawler->filter('button[id=new_user_save]')->form();
+
+        $crawler = $client->submit($form, $data);
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(array('_text')));
+        $this->assertContains($expectedMessage, $alert[0]);
+    }
+
+    public function testNewUserCreated()
+    {
+        $this->logInAs('admin');
+        $client = $this->getClient();
+
+        $crawler = $client->request('GET', '/config');
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+
+        $form = $crawler->filter('button[id=new_user_save]')->form();
+
+        $data = array(
+            'new_user[username]' => 'wallace',
+            'new_user[password]' => 'wallace1',
+            'new_user[email]' => 'wallace@wallace.me',
+        );
+
+        $client->submit($form, $data);
+
+        $this->assertEquals(302, $client->getResponse()->getStatusCode());
+
+        $crawler = $client->followRedirect();
+
+        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
+        $this->assertContains('User "wallace" added', $alert[0]);
+    }
 }