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

Merge pull request #2327 from wallabag/user-management

Browse Source 
Add users management UI
This commit is contained in:
Jeremy Benoist
2016-10-02 15:00:02 +02:00
committed by GitHub
parent 18b8dc0e99 ccc7faec09
commit 1dc3bee6b9
31 changed files with 917 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@ class ConfigControllerTest extends WallabagCoreTestCase
$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=update_user_save]'));
$this->assertCount(1, $crawler->filter('button[id=new_user_save]'));
$this->assertCount(1, $crawler->filter('button[id=rss_config_save]'));
}
@ -283,119 +282,6 @@ class ConfigControllerTest extends WallabagCoreTestCase
$this->assertContains('flashes.config.notice.user_updated', $alert[0]);
}
public function dataForNewUserFailed()
{
return [
[
[
'new_user[username]' => '',
'new_user[plainPassword][first]' => '',
'new_user[plainPassword][second]' => '',
'new_user[email]' => '',
],
'fos_user.username.blank',
],
[
[
'new_user[username]' => 'a',
'new_user[plainPassword][first]' => 'mypassword',
'new_user[plainPassword][second]' => 'mypassword',
'new_user[email]' => '',
],
'fos_user.username.short',
],
[
[
'new_user[username]' => 'wallace',
'new_user[plainPassword][first]' => 'mypassword',
'new_user[plainPassword][second]' => 'mypassword',
'new_user[email]' => 'test',
],
'fos_user.email.invalid',
],
[
[
'new_user[username]' => 'admin',
'new_user[plainPassword][first]' => 'wallacewallace',
'new_user[plainPassword][second]' => 'wallacewallace',
'new_user[email]' => 'wallace@wallace.me',
],
'fos_user.username.already_used',
],
[
[
'new_user[username]' => 'wallace',
'new_user[plainPassword][first]' => 'mypassword1',
'new_user[plainPassword][second]' => 'mypassword2',
'new_user[email]' => 'wallace@wallace.me',
],
'validator.password_must_match',
],
];
}
/**
* @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(['_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 = [
'new_user[username]' => 'wallace',
'new_user[plainPassword][first]' => 'wallace1',
'new_user[plainPassword][second]' => 'wallace1',
'new_user[email]' => 'wallace@wallace.me',
];
$client->submit($form, $data);
$this->assertEquals(302, $client->getResponse()->getStatusCode());
$crawler = $client->followRedirect();
$this->assertContains('flashes.config.notice.user_added', $crawler->filter('body')->extract(['_text'])[0]);
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('wallace');
$this->assertTrue(false !== $user);
$this->assertTrue($user->isEnabled());
$this->assertEquals('material', $user->getConfig()->getTheme());
$this->assertEquals(12, $user->getConfig()->getItemsPerPage());
$this->assertEquals(50, $user->getConfig()->getRssLimit());
$this->assertEquals('en', $user->getConfig()->getLanguage());
$this->assertEquals(1, $user->getConfig()->getReadingSpeed());
}
public function testRssUpdateResetToken()
{
$this->logInAs('admin');

82
tests/Wallabag/UserBundle/Controller/ManageControllerTest.php Normal file
View File

@ -0,0 +1,82 @@
<?php
namespace Wallabag\UserBundle\Tests\Controller;
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
class ManageControllerTest extends WallabagCoreTestCase
{
public function testLogin()
{
$client = $this->getClient();
$client->request('GET', '/users/');
$this->assertEquals(302, $client->getResponse()->getStatusCode());
$this->assertContains('login', $client->getResponse()->headers->get('location'));
}
public function testCompleteScenario()
{
$this->logInAs('admin');
$client = $this->getClient();
// Create a new user in the database
$crawler = $client->request('GET', '/users/');
$this->assertEquals(200, $client->getResponse()->getStatusCode(), "Unexpected HTTP status code for GET /users/");
$crawler = $client->click($crawler->selectLink('user.list.create_new_one')->link());
// Fill in the form and submit it
$form = $crawler->selectButton('user.form.save')->form(array(
'new_user[username]' => 'test_user',
'new_user[email]' => 'test@test.io',
'new_user[plainPassword][first]' => 'test',
'new_user[plainPassword][second]' => 'test',
));
$client->submit($form);
$client->followRedirect();
$crawler = $client->request('GET', '/users/');
// Check data in the show view
$this->assertGreaterThan(0, $crawler->filter('td:contains("test_user")')->count(), 'Missing element td:contains("test_user")');
// Edit the user
$crawler = $client->click($crawler->selectLink('user.list.edit_action')->last()->link());
$form = $crawler->selectButton('user.form.save')->form(array(
'user[name]' => 'Foo User',
'user[username]' => 'test_user',
'user[email]' => 'test@test.io',
'user[enabled]' => true,
'user[locked]' => false,
));
$client->submit($form);
$crawler = $client->followRedirect();
// Check the element contains an attribute with value equals "Foo User"
$this->assertGreaterThan(0, $crawler->filter('[value="Foo User"]')->count(), 'Missing element [value="Foo User"]');
$crawler = $client->request('GET', '/users/');
$crawler = $client->click($crawler->selectLink('user.list.edit_action')->last()->link());
// Delete the user
$client->submit($crawler->selectButton('user.form.delete')->form());
$crawler = $client->followRedirect();
// Check the user has been delete on the list
$this->assertNotRegExp('/Foo User/', $client->getResponse()->getContent());
}
public function testDeleteDisabledForLoggedUser()
{
$this->logInAs('admin');
$client = $this->getClient();
$crawler = $client->request('GET', '/users/'.$this->getLoggedInUserId().'/edit');
$disabled = $crawler->selectButton('user.form.delete')->extract('disabled');
$this->assertEquals('disabled', $disabled[0]);
}
}