namespace Wallabag\CoreBundle\Tests\Controller;
-use Wallabag\CoreBundle\Tests\WallabagTestCase;
+use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-class ConfigControllerTest extends WallabagTestCase
+class ConfigControllerTest extends WallabagCoreTestCase
{
public function testLogin()
{
$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]'));
+ $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]'));
}
$form = $crawler->filter('button[id=config_save]')->form();
$data = array(
- 'config[theme]' => 'baggy',
+ 'config[theme]' => 0,
'config[items_per_page]' => '30',
'config[language]' => 'fr_FR',
);
{
return array(
array(array(
- 'config[theme]' => 'baggy',
+ 'config[theme]' => 0,
'config[items_per_page]' => '',
'config[language]' => 'fr_FR',
)),
array(array(
- 'config[theme]' => 'baggy',
+ 'config[theme]' => 0,
'config[items_per_page]' => '12',
'config[language]' => '',
)),
return array(
array(
array(
- 'change_passwd[old_password]' => 'baggy',
+ 'change_passwd[old_password]' => 'material',
'change_passwd[new_password][first]' => '',
'change_passwd[new_password][second]' => '',
),
return array(
array(
array(
- 'user[username]' => '',
- 'user[name]' => '',
- 'user[email]' => '',
+ 'update_user[name]' => '',
+ 'update_user[email]' => '',
),
- 'This value should not be blank.',
+ 'Please enter an email',
),
array(
array(
- 'user[username]' => 'ad',
- 'user[name]' => '',
- 'user[email]' => '',
+ 'update_user[name]' => '',
+ 'update_user[email]' => 'test',
),
- 'This value is too short.',
- ),
- array(
- array(
- 'user[username]' => 'admin',
- 'user[name]' => '',
- 'user[email]' => 'test',
- ),
- 'This value is not a valid email address.',
+ 'The email is not valid',
),
);
}
$this->assertEquals(200, $client->getResponse()->getStatusCode());
- $form = $crawler->filter('button[id=user_save]')->form();
+ $form = $crawler->filter('button[id=update_user_save]')->form();
$crawler = $client->submit($form, $data);
$this->assertEquals(200, $client->getResponse()->getStatusCode());
- $form = $crawler->filter('button[id=user_save]')->form();
+ $form = $crawler->filter('button[id=update_user_save]')->form();
$data = array(
- 'user[username]' => 'admin',
- 'user[name]' => 'new name',
- 'user[email]' => 'admin@wallabag.io',
+ 'update_user[name]' => 'new name',
+ 'update_user[email]' => 'admin@wallabag.io',
);
$client->submit($form, $data);
array(
array(
'new_user[username]' => '',
- 'new_user[password]' => '',
+ 'new_user[plainPassword][first]' => '',
+ 'new_user[plainPassword][second]' => '',
'new_user[email]' => '',
),
- 'This value should not be blank.',
+ 'Please enter a username',
),
array(
array(
- 'new_user[username]' => 'ad',
- 'new_user[password]' => '',
+ 'new_user[username]' => 'a',
+ 'new_user[plainPassword][first]' => 'mypassword',
+ 'new_user[plainPassword][second]' => 'mypassword',
'new_user[email]' => '',
),
- 'This value is too short.',
+ 'The username is too short',
),
array(
array(
'new_user[username]' => 'wallace',
- 'new_user[password]' => '',
+ 'new_user[plainPassword][first]' => 'mypassword',
+ 'new_user[plainPassword][second]' => 'mypassword',
'new_user[email]' => 'test',
),
- 'This value is not a valid email address.',
+ 'The email is not valid',
+ ),
+ array(
+ array(
+ 'new_user[username]' => 'admin',
+ 'new_user[plainPassword][first]' => 'wallacewallace',
+ 'new_user[plainPassword][second]' => 'wallacewallace',
+ 'new_user[email]' => 'wallace@wallace.me',
+ ),
+ 'The username is already used',
),
array(
array(
'new_user[username]' => 'wallace',
- 'new_user[password]' => 'admin',
+ 'new_user[plainPassword][first]' => 'mypassword1',
+ 'new_user[plainPassword][second]' => 'mypassword2',
'new_user[email]' => 'wallace@wallace.me',
),
- 'Password should by at least',
+ 'This value is not valid',
),
);
}
$data = array(
'new_user[username]' => 'wallace',
- 'new_user[password]' => 'wallace1',
+ 'new_user[plainPassword][first]' => 'wallace1',
+ 'new_user[plainPassword][second]' => 'wallace1',
'new_user[email]' => 'wallace@wallace.me',
);
$this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(array('_text')));
$this->assertContains('User "wallace" added', $alert[0]);
+
+ $em = $client->getContainer()->get('doctrine.orm.entity_manager');
+ $user = $em
+ ->getRepository('WallabagUserBundle:User')
+ ->findOneByUsername('wallace');
+
+ $this->assertTrue(false !== $user);
+ $this->assertTrue($user->isEnabled());
}
public function testRssUpdateResetToken()
// reset the token
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$user = $em
- ->getRepository('WallabagCoreBundle:User')
+ ->getRepository('WallabagUserBundle:User')
->findOneByUsername('admin');
if (!$user) {
);
$this->assertEquals(200, $client->getResponse()->getStatusCode());
- $content = json_decode($client->getResponse()->getContent(), true);;
+ $content = json_decode($client->getResponse()->getContent(), true);
$this->assertArrayHasKey('token', $content);
}