mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-23 09:31:04 +00:00
Change the way to login user in tests
Instead of using a HTTP request we just login user like FOSUser does. It allows us to mock service in container for functional tests. Also, fix a bad config name in fos_user for firewall And finally, add functional test to PocketImport
This commit is contained in:
parent
2bc9cad78e
commit
fdc90ceb17
6 changed files with 90 additions and 9 deletions
|
@ -176,7 +176,7 @@ liip_theme:
|
||||||
|
|
||||||
fos_user:
|
fos_user:
|
||||||
db_driver: orm
|
db_driver: orm
|
||||||
firewall_name: main
|
firewall_name: secured_area
|
||||||
user_class: Wallabag\UserBundle\Entity\User
|
user_class: Wallabag\UserBundle\Entity\User
|
||||||
registration:
|
registration:
|
||||||
confirmation:
|
confirmation:
|
||||||
|
|
|
@ -36,7 +36,7 @@ class SecurityControllerTest extends WallabagCoreTestCase
|
||||||
$em->persist($user);
|
$em->persist($user);
|
||||||
$em->flush();
|
$em->flush();
|
||||||
|
|
||||||
$this->logInAs('admin');
|
$this->logInAsUsingHttp('admin');
|
||||||
$crawler = $client->request('GET', '/config');
|
$crawler = $client->request('GET', '/config');
|
||||||
$this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(['_text'])[0]);
|
$this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(['_text'])[0]);
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,12 @@ class TagControllerTest extends WallabagCoreTestCase
|
||||||
$client->submit($form, $data);
|
$client->submit($form, $data);
|
||||||
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
||||||
|
|
||||||
|
// be sure to reload the entry
|
||||||
|
$entry = $client->getContainer()
|
||||||
|
->get('doctrine.orm.entity_manager')
|
||||||
|
->getRepository('WallabagCoreBundle:Entry')
|
||||||
|
->findOneByUsernameAndNotArchived('admin');
|
||||||
|
|
||||||
$this->assertEquals(1, count($entry->getTags()));
|
$this->assertEquals(1, count($entry->getTags()));
|
||||||
|
|
||||||
# tag already exists and already assigned
|
# tag already exists and already assigned
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
namespace Tests\Wallabag\CoreBundle;
|
namespace Tests\Wallabag\CoreBundle;
|
||||||
|
|
||||||
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
|
||||||
|
use Symfony\Component\BrowserKit\Cookie;
|
||||||
|
|
||||||
abstract class WallabagCoreTestCase extends WebTestCase
|
abstract class WallabagCoreTestCase extends WebTestCase
|
||||||
{
|
{
|
||||||
|
@ -20,7 +21,38 @@ abstract class WallabagCoreTestCase extends WebTestCase
|
||||||
$this->client = static::createClient();
|
$this->client = static::createClient();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Login a user without making a HTTP request.
|
||||||
|
* If we make a HTTP request we lose ability to mock service in the container.
|
||||||
|
*
|
||||||
|
* @param string $username User to log in
|
||||||
|
*/
|
||||||
public function logInAs($username)
|
public function logInAs($username)
|
||||||
|
{
|
||||||
|
$container = $this->client->getContainer();
|
||||||
|
$session = $container->get('session');
|
||||||
|
|
||||||
|
$userManager = $container->get('fos_user.user_manager');
|
||||||
|
$loginManager = $container->get('fos_user.security.login_manager');
|
||||||
|
$firewallName = $container->getParameter('fos_user.firewall_name');
|
||||||
|
|
||||||
|
$user = $userManager->findUserBy(array('username' => $username));
|
||||||
|
$loginManager->loginUser($firewallName, $user);
|
||||||
|
|
||||||
|
$session->set('_security_'.$firewallName, serialize($container->get('security.token_storage')->getToken()));
|
||||||
|
$session->save();
|
||||||
|
|
||||||
|
$cookie = new Cookie($session->getName(), $session->getId());
|
||||||
|
$this->client->getCookieJar()->set($cookie);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instead of `logInAs` this method use a HTTP request to log in the user.
|
||||||
|
* Could be better for some tests.
|
||||||
|
*
|
||||||
|
* @param string $username User to log in
|
||||||
|
*/
|
||||||
|
public function logInAsUsingHttp($username)
|
||||||
{
|
{
|
||||||
$crawler = $this->client->request('GET', '/login');
|
$crawler = $this->client->request('GET', '/login');
|
||||||
$form = $crawler->filter('button[type=submit]')->form();
|
$form = $crawler->filter('button[type=submit]')->form();
|
||||||
|
|
|
@ -22,15 +22,13 @@ class PocketControllerTest extends WallabagCoreTestCase
|
||||||
$this->logInAs('admin');
|
$this->logInAs('admin');
|
||||||
$client = $this->getClient();
|
$client = $this->getClient();
|
||||||
|
|
||||||
$crawler = $client->request('GET', '/import/pocket/auth');
|
$client->request('GET', '/import/pocket/auth');
|
||||||
|
|
||||||
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testImportPocketAuth()
|
public function testImportPocketAuth()
|
||||||
{
|
{
|
||||||
$this->markTestSkipped('PocketImport: Find a way to properly mock a service.');
|
|
||||||
|
|
||||||
$this->logInAs('admin');
|
$this->logInAs('admin');
|
||||||
$client = $this->getClient();
|
$client = $this->getClient();
|
||||||
|
|
||||||
|
@ -43,9 +41,9 @@ class PocketControllerTest extends WallabagCoreTestCase
|
||||||
->method('getRequestToken')
|
->method('getRequestToken')
|
||||||
->willReturn('token');
|
->willReturn('token');
|
||||||
|
|
||||||
$client->getContainer()->set('wallabag_import.pocket.import', $pocketImport);
|
static::$kernel->getContainer()->set('wallabag_import.pocket.import', $pocketImport);
|
||||||
|
|
||||||
$crawler = $client->request('GET', '/import/pocket/auth');
|
$client->request('GET', '/import/pocket/auth');
|
||||||
|
|
||||||
$this->assertEquals(301, $client->getResponse()->getStatusCode());
|
$this->assertEquals(301, $client->getResponse()->getStatusCode());
|
||||||
$this->assertContains('getpocket.com/auth/authorize', $client->getResponse()->headers->get('location'));
|
$this->assertContains('getpocket.com/auth/authorize', $client->getResponse()->headers->get('location'));
|
||||||
|
@ -56,10 +54,55 @@ class PocketControllerTest extends WallabagCoreTestCase
|
||||||
$this->logInAs('admin');
|
$this->logInAs('admin');
|
||||||
$client = $this->getClient();
|
$client = $this->getClient();
|
||||||
|
|
||||||
$crawler = $client->request('GET', '/import/pocket/callback');
|
$pocketImport = $this->getMockBuilder('Wallabag\ImportBundle\Import\PocketImport')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
|
|
||||||
|
$pocketImport
|
||||||
|
->expects($this->once())
|
||||||
|
->method('authorize')
|
||||||
|
->willReturn(false);
|
||||||
|
|
||||||
|
static::$kernel->getContainer()->set('wallabag_import.pocket.import', $pocketImport);
|
||||||
|
|
||||||
|
$client->request('GET', '/import/pocket/callback');
|
||||||
|
|
||||||
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
||||||
$this->assertContains('import/pocket', $client->getResponse()->headers->get('location'));
|
$this->assertContains('/', $client->getResponse()->headers->get('location'), 'Import is ok, redirect to homepage');
|
||||||
$this->assertEquals('flashes.import.notice.failed', $client->getContainer()->get('session')->getFlashBag()->peek('notice')[0]);
|
$this->assertEquals('flashes.import.notice.failed', $client->getContainer()->get('session')->getFlashBag()->peek('notice')[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testImportPocketCallback()
|
||||||
|
{
|
||||||
|
$this->logInAs('admin');
|
||||||
|
$client = $this->getClient();
|
||||||
|
|
||||||
|
$pocketImport = $this->getMockBuilder('Wallabag\ImportBundle\Import\PocketImport')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
|
|
||||||
|
$pocketImport
|
||||||
|
->expects($this->once())
|
||||||
|
->method('authorize')
|
||||||
|
->willReturn(true);
|
||||||
|
|
||||||
|
$pocketImport
|
||||||
|
->expects($this->once())
|
||||||
|
->method('setMarkAsRead')
|
||||||
|
->with(false)
|
||||||
|
->willReturn($pocketImport);
|
||||||
|
|
||||||
|
$pocketImport
|
||||||
|
->expects($this->once())
|
||||||
|
->method('import')
|
||||||
|
->willReturn(true);
|
||||||
|
|
||||||
|
static::$kernel->getContainer()->set('wallabag_import.pocket.import', $pocketImport);
|
||||||
|
|
||||||
|
$client->request('GET', '/import/pocket/callback');
|
||||||
|
|
||||||
|
$this->assertEquals(302, $client->getResponse()->getStatusCode());
|
||||||
|
$this->assertContains('/', $client->getResponse()->headers->get('location'), 'Import is ok, redirect to homepage');
|
||||||
|
$this->assertEquals('flashes.import.notice.summary', $client->getContainer()->get('session')->getFlashBag()->peek('notice')[0]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
BIN
tests/Wallabag/ImportBundle/fixtures/unnamed.png
Normal file
BIN
tests/Wallabag/ImportBundle/fixtures/unnamed.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.6 KiB |
Loading…
Reference in a new issue