+ {% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %}
+
{{ import.description|trans }}
{{ 'import.wallabag_v1.how_to'|trans }}
diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index d79d8fa2b..05830555e 100644
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -14,3 +14,9 @@ services:
- "@router"
tags:
- { name: kernel.event_subscriber }
+
+ wallabag_user.user_repository:
+ class: Wallabag\UserBundle\Repository\UserRepository
+ factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
+ arguments:
+ - WallabagUserBundle:User
diff --git a/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php b/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php
new file mode 100644
index 000000000..eb7fce79f
--- /dev/null
+++ b/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php
@@ -0,0 +1,86 @@
+getClient()->getKernel());
+ $application->add(new ImportCommand());
+
+ $command = $application->find('wallabag:import');
+
+ $tester = new CommandTester($command);
+ $tester->execute([
+ 'command' => $command->getName(),
+ ]);
+ }
+
+ /**
+ * @expectedException Symfony\Component\Config\Definition\Exception\Exception
+ * @expectedExceptionMessage not found
+ */
+ public function testRunImportCommandWithoutFilepath()
+ {
+ $application = new Application($this->getClient()->getKernel());
+ $application->add(new ImportCommand());
+
+ $command = $application->find('wallabag:import');
+
+ $tester = new CommandTester($command);
+ $tester->execute([
+ 'command' => $command->getName(),
+ 'userId' => 1,
+ 'filepath' => 1,
+ ]);
+ }
+
+ /**
+ * @expectedException Symfony\Component\Config\Definition\Exception\Exception
+ * @expectedExceptionMessage User with id
+ */
+ public function testRunImportCommandWithoutUserId()
+ {
+ $application = new Application($this->getClient()->getKernel());
+ $application->add(new ImportCommand());
+
+ $command = $application->find('wallabag:import');
+
+ $tester = new CommandTester($command);
+ $tester->execute([
+ 'command' => $command->getName(),
+ 'userId' => 0,
+ 'filepath' => './',
+ ]);
+ }
+
+ public function testRunImportCommand()
+ {
+ $application = new Application($this->getClient()->getKernel());
+ $application->add(new ImportCommand());
+
+ $command = $application->find('wallabag:import');
+
+ $tester = new CommandTester($command);
+ $tester->execute([
+ 'command' => $command->getName(),
+ 'userId' => 1,
+ 'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.root_dir').'/../tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
+ '--importer' => 'v2',
+ ]);
+
+ $this->assertContains('imported', $tester->getDisplay());
+ $this->assertContains('already saved', $tester->getDisplay());
+ }
+}
diff --git a/tests/Wallabag/ImportBundle/Command/RedisWorkerCommandTest.php b/tests/Wallabag/ImportBundle/Command/RedisWorkerCommandTest.php
new file mode 100644
index 000000000..749528478
--- /dev/null
+++ b/tests/Wallabag/ImportBundle/Command/RedisWorkerCommandTest.php
@@ -0,0 +1,74 @@
+getClient()->getKernel());
+ $application->add(new RedisWorkerCommand());
+
+ $command = $application->find('wallabag:import:redis-worker');
+
+ $tester = new CommandTester($command);
+ $tester->execute([
+ 'command' => $command->getName(),
+ ]);
+ }
+
+ /**
+ * @expectedException Symfony\Component\Config\Definition\Exception\Exception
+ * @expectedExceptionMessage No queue or consumer found for service name
+ */
+ public function testRunRedisWorkerCommandWithBadService()
+ {
+ $application = new Application($this->getClient()->getKernel());
+ $application->add(new RedisWorkerCommand());
+
+ $command = $application->find('wallabag:import:redis-worker');
+
+ $tester = new CommandTester($command);
+ $tester->execute([
+ 'command' => $command->getName(),
+ 'serviceName' => 'YOMONSERVICE',
+ ]);
+ }
+
+ public function testRunRedisWorkerCommand()
+ {
+ $application = new Application($this->getClient()->getKernel());
+ $application->add(new RedisWorkerCommand());
+
+ $factory = new RedisMockFactory();
+ $redisMock = $factory->getAdapter('Predis\Client', true);
+
+ $application->getKernel()->getContainer()->set('wallabag_core.redis.client', $redisMock);
+
+ // put a fake message in the queue so the worker will stop after reading that message
+ // instead of waiting for others
+ $redisMock->lpush('wallabag.import.readability', '{}');
+
+ $command = $application->find('wallabag:import:redis-worker');
+
+ $tester = new CommandTester($command);
+ $tester->execute([
+ 'command' => $command->getName(),
+ 'serviceName' => 'readability',
+ '--maxIterations' => 1,
+ ]);
+
+ $this->assertContains('Worker started at', $tester->getDisplay());
+ $this->assertContains('Waiting for message', $tester->getDisplay());
+ }
+}
diff --git a/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php
new file mode 100644
index 000000000..a3263771c
--- /dev/null
+++ b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php
@@ -0,0 +1,225 @@
+getMockBuilder('Doctrine\ORM\EntityManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $em
+ ->expects($this->once())
+ ->method('flush');
+
+ $em
+ ->expects($this->exactly(2))
+ ->method('clear');
+
+ $body = <<<'JSON'
+{
+ "item_id": "1402935436",
+ "resolved_id": "1402935436",
+ "given_url": "http://mashable.com/2016/09/04/leslie-jones-back-on-twitter-after-hack/?utm_campaign=Mash-Prod-RSS-Feedburner-All-Partial&utm_cid=Mash-Prod-RSS-Feedburner-All-Partial",
+ "given_title": "Leslie Jones is back on Twitter and her comeback tweet rules",
+ "favorite": "0",
+ "status": "0",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 0,
+ "resolved_title": "Leslie Jones is back on Twitter and her comeback tweet rules",
+ "resolved_url": "http://mashable.com/2016/09/04/leslie-jones-back-on-twitter-after-hack/?utm_campaign=Mash-Prod-RSS-Feedburner-All-Partial&utm_cid=Mash-Prod-RSS-Feedburner-All-Partial",
+ "excerpt": "Leslie Jones is back to communicating with her adoring public on Twitter after cowardly hacker-trolls drove her away, probably to compensate for their own failings. It all started with a mic drop ...",
+ "is_article": "1",
+ "is_index": "0",
+ "has_video": "0",
+ "has_image": "1",
+ "word_count": "200",
+ "tags": {
+ "ifttt": {
+ "item_id": "1402935436",
+ "tag": "ifttt"
+ },
+ "mashable": {
+ "item_id": "1402935436",
+ "tag": "mashable"
+ }
+ },
+ "authors": {
+ "2484273": {
+ "item_id": "1402935436",
+ "author_id": "2484273",
+ "name": "Adam Rosenberg",
+ "url": "http://mashable.com/author/adam-rosenberg/"
+ }
+ },
+ "image": {
+ "item_id": "1402935436",
+ "src": "http://i.amz.mshcdn.com/i-V5cS6_sDqFABaVR0hVSBJqG_w=/950x534/https%3A%2F%2Fblueprint-api-production.s3.amazonaws.com%2Fuploads%2Fcard%2Fimage%2F199899%2Fleslie_jones_war_dogs.jpg",
+ "width": "0",
+ "height": "0"
+ },
+ "images": {
+ "1": {
+ "item_id": "1402935436",
+ "image_id": "1",
+ "src": "http://i.amz.mshcdn.com/i-V5cS6_sDqFABaVR0hVSBJqG_w=/950x534/https%3A%2F%2Fblueprint-api-production.s3.amazonaws.com%2Fuploads%2Fcard%2Fimage%2F199899%2Fleslie_jones_war_dogs.jpg",
+ "width": "0",
+ "height": "0",
+ "credit": "Image: Steve Eichner/NameFace/Sipa USA",
+ "caption": ""
+ }
+ },
+ "userId": 1
+}
+JSON;
+
+ $user = new User();
+ $entry = new Entry($user);
+
+ $userRepository = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $userRepository
+ ->expects($this->once())
+ ->method('find')
+ // userId from the body json above
+ ->with(1)
+ ->willReturn($user);
+
+ $import = $this->getMockBuilder('Wallabag\ImportBundle\Import\AbstractImport')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $import
+ ->expects($this->once())
+ ->method('setUser')
+ ->with($user);
+
+ $import
+ ->expects($this->once())
+ ->method('parseEntry')
+ ->with(json_decode($body, true))
+ ->willReturn($entry);
+
+ $consumer = new AMQPEntryConsumer(
+ $em,
+ $userRepository,
+ $import
+ );
+
+ $message = new AMQPMessage($body);
+
+ $consumer->execute($message);
+ }
+
+ public function testMessageWithBadUser()
+ {
+ $em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $em
+ ->expects($this->never())
+ ->method('flush');
+
+ $em
+ ->expects($this->never())
+ ->method('clear');
+
+ $body = '{ "userId": 123 }';
+
+ $user = new User();
+ $entry = new Entry($user);
+
+ $userRepository = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $userRepository
+ ->expects($this->once())
+ ->method('find')
+ // userId from the body json above
+ ->with(123)
+ ->willReturn(null);
+
+ $import = $this->getMockBuilder('Wallabag\ImportBundle\Import\AbstractImport')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $consumer = new AMQPEntryConsumer(
+ $em,
+ $userRepository,
+ $import
+ );
+
+ $message = new AMQPMessage($body);
+
+ $consumer->execute($message);
+ }
+
+ public function testMessageWithEntryProcessed()
+ {
+ $em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $em
+ ->expects($this->never())
+ ->method('flush');
+
+ $em
+ ->expects($this->never())
+ ->method('clear');
+
+ $body = '{ "userId": 123 }';
+
+ $user = new User();
+
+ $userRepository = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $userRepository
+ ->expects($this->once())
+ ->method('find')
+ // userId from the body json above
+ ->with(123)
+ ->willReturn($user);
+
+ $import = $this->getMockBuilder('Wallabag\ImportBundle\Import\AbstractImport')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $import
+ ->expects($this->once())
+ ->method('setUser')
+ ->with($user);
+
+ $import
+ ->expects($this->once())
+ ->method('parseEntry')
+ ->with(json_decode($body, true))
+ ->willReturn(null);
+
+ $consumer = new AMQPEntryConsumer(
+ $em,
+ $userRepository,
+ $import
+ );
+
+ $message = new AMQPMessage($body);
+
+ $consumer->execute($message);
+ }
+}
diff --git a/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php b/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php
new file mode 100644
index 000000000..5e8ee41d8
--- /dev/null
+++ b/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php
@@ -0,0 +1,225 @@
+getMockBuilder('Doctrine\ORM\EntityManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $em
+ ->expects($this->once())
+ ->method('flush');
+
+ $em
+ ->expects($this->exactly(2))
+ ->method('clear');
+
+ $body = <<<'JSON'
+{
+ "item_id": "1402935436",
+ "resolved_id": "1402935436",
+ "given_url": "http://mashable.com/2016/09/04/leslie-jones-back-on-twitter-after-hack/?utm_campaign=Mash-Prod-RSS-Feedburner-All-Partial&utm_cid=Mash-Prod-RSS-Feedburner-All-Partial",
+ "given_title": "Leslie Jones is back on Twitter and her comeback tweet rules",
+ "favorite": "0",
+ "status": "0",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 0,
+ "resolved_title": "Leslie Jones is back on Twitter and her comeback tweet rules",
+ "resolved_url": "http://mashable.com/2016/09/04/leslie-jones-back-on-twitter-after-hack/?utm_campaign=Mash-Prod-RSS-Feedburner-All-Partial&utm_cid=Mash-Prod-RSS-Feedburner-All-Partial",
+ "excerpt": "Leslie Jones is back to communicating with her adoring public on Twitter after cowardly hacker-trolls drove her away, probably to compensate for their own failings. It all started with a mic drop ...",
+ "is_article": "1",
+ "is_index": "0",
+ "has_video": "0",
+ "has_image": "1",
+ "word_count": "200",
+ "tags": {
+ "ifttt": {
+ "item_id": "1402935436",
+ "tag": "ifttt"
+ },
+ "mashable": {
+ "item_id": "1402935436",
+ "tag": "mashable"
+ }
+ },
+ "authors": {
+ "2484273": {
+ "item_id": "1402935436",
+ "author_id": "2484273",
+ "name": "Adam Rosenberg",
+ "url": "http://mashable.com/author/adam-rosenberg/"
+ }
+ },
+ "image": {
+ "item_id": "1402935436",
+ "src": "http://i.amz.mshcdn.com/i-V5cS6_sDqFABaVR0hVSBJqG_w=/950x534/https%3A%2F%2Fblueprint-api-production.s3.amazonaws.com%2Fuploads%2Fcard%2Fimage%2F199899%2Fleslie_jones_war_dogs.jpg",
+ "width": "0",
+ "height": "0"
+ },
+ "images": {
+ "1": {
+ "item_id": "1402935436",
+ "image_id": "1",
+ "src": "http://i.amz.mshcdn.com/i-V5cS6_sDqFABaVR0hVSBJqG_w=/950x534/https%3A%2F%2Fblueprint-api-production.s3.amazonaws.com%2Fuploads%2Fcard%2Fimage%2F199899%2Fleslie_jones_war_dogs.jpg",
+ "width": "0",
+ "height": "0",
+ "credit": "Image: Steve Eichner/NameFace/Sipa USA",
+ "caption": ""
+ }
+ },
+ "userId": 1
+}
+JSON;
+
+ $user = new User();
+ $entry = new Entry($user);
+
+ $userRepository = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $userRepository
+ ->expects($this->once())
+ ->method('find')
+ // userId from the body json above
+ ->with(1)
+ ->willReturn($user);
+
+ $import = $this->getMockBuilder('Wallabag\ImportBundle\Import\AbstractImport')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $import
+ ->expects($this->once())
+ ->method('setUser')
+ ->with($user);
+
+ $import
+ ->expects($this->once())
+ ->method('parseEntry')
+ ->with(json_decode($body, true))
+ ->willReturn($entry);
+
+ $consumer = new RedisEntryConsumer(
+ $em,
+ $userRepository,
+ $import
+ );
+
+ $res = $consumer->manage($body);
+
+ $this->assertTrue($res);
+ }
+
+ public function testMessageWithBadUser()
+ {
+ $em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $em
+ ->expects($this->never())
+ ->method('flush');
+
+ $em
+ ->expects($this->never())
+ ->method('clear');
+
+ $body = '{ "userId": 123 }';
+
+ $user = new User();
+ $entry = new Entry($user);
+
+ $userRepository = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $userRepository
+ ->expects($this->once())
+ ->method('find')
+ // userId from the body json above
+ ->with(123)
+ ->willReturn(null);
+
+ $import = $this->getMockBuilder('Wallabag\ImportBundle\Import\AbstractImport')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $consumer = new RedisEntryConsumer(
+ $em,
+ $userRepository,
+ $import
+ );
+
+ $res = $consumer->manage($body);
+
+ $this->assertFalse($res);
+ }
+
+ public function testMessageWithEntryProcessed()
+ {
+ $em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $em
+ ->expects($this->never())
+ ->method('flush');
+
+ $em
+ ->expects($this->never())
+ ->method('clear');
+
+ $body = '{ "userId": 123 }';
+
+ $user = new User();
+
+ $userRepository = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $userRepository
+ ->expects($this->once())
+ ->method('find')
+ // userId from the body json above
+ ->with(123)
+ ->willReturn($user);
+
+ $import = $this->getMockBuilder('Wallabag\ImportBundle\Import\AbstractImport')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $import
+ ->expects($this->once())
+ ->method('setUser')
+ ->with($user);
+
+ $import
+ ->expects($this->once())
+ ->method('parseEntry')
+ ->with(json_decode($body, true))
+ ->willReturn(null);
+
+ $consumer = new RedisEntryConsumer(
+ $em,
+ $userRepository,
+ $import
+ );
+
+ $res = $consumer->manage($body);
+
+ $this->assertFalse($res);
+ $this->assertFalse($consumer->isStopJob($body));
+ }
+}
diff --git a/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php b/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
index e0e61df88..356732610 100644
--- a/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
@@ -17,6 +17,36 @@ class PocketControllerTest extends WallabagCoreTestCase
$this->assertEquals(1, $crawler->filter('button[type=submit]')->count());
}
+ public function testImportPocketWithRabbitEnabled()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $client->getContainer()->get('craue_config')->set('import_with_rabbitmq', 1);
+
+ $crawler = $client->request('GET', '/import/pocket');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertEquals(1, $crawler->filter('button[type=submit]')->count());
+
+ $client->getContainer()->get('craue_config')->set('import_with_rabbitmq', 0);
+ }
+
+ public function testImportPocketWithRedisEnabled()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $client->getContainer()->get('craue_config')->set('import_with_redis', 1);
+
+ $crawler = $client->request('GET', '/import/pocket');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertEquals(1, $crawler->filter('button[type=submit]')->count());
+
+ $client->getContainer()->get('craue_config')->set('import_with_redis', 0);
+ }
+
public function testImportPocketAuthBadToken()
{
$this->logInAs('admin');
diff --git a/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php b/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php
index 92cf4bfc8..7b88d8917 100644
--- a/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php
@@ -19,6 +19,74 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
$this->assertEquals(1, $crawler->filter('input[type=file]')->count());
}
+ public function testImportReadabilityWithRabbitEnabled()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $client->getContainer()->get('craue_config')->set('import_with_rabbitmq', 1);
+
+ $crawler = $client->request('GET', '/import/readability');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertEquals(1, $crawler->filter('form[name=upload_import_file] > button[type=submit]')->count());
+ $this->assertEquals(1, $crawler->filter('input[type=file]')->count());
+
+ $client->getContainer()->get('craue_config')->set('import_with_rabbitmq', 0);
+ }
+
+ public function testImportReadabilityBadFile()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $crawler = $client->request('GET', '/import/readability');
+ $form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
+
+ $data = [
+ 'upload_import_file[file]' => '',
+ ];
+
+ $client->submit($form, $data);
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ }
+
+ public function testImportReadabilityWithRedisEnabled()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $client->getContainer()->get('craue_config')->set('import_with_redis', 1);
+
+ $crawler = $client->request('GET', '/import/readability');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertEquals(1, $crawler->filter('form[name=upload_import_file] > button[type=submit]')->count());
+ $this->assertEquals(1, $crawler->filter('input[type=file]')->count());
+
+ $form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
+
+ $file = new UploadedFile(__DIR__.'/../fixtures/readability.json', 'readability.json');
+
+ $data = [
+ 'upload_import_file[file]' => $file,
+ ];
+
+ $client->submit($form, $data);
+
+ $this->assertEquals(302, $client->getResponse()->getStatusCode());
+
+ $crawler = $client->followRedirect();
+
+ $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
+ $this->assertContains('flashes.import.notice.summary', $body[0]);
+
+ $this->assertNotEmpty($client->getContainer()->get('wallabag_core.redis.client')->lpop('wallabag.import.readability'));
+
+ $client->getContainer()->get('craue_config')->set('import_with_redis', 0);
+ }
+
public function testImportReadabilityWithFile()
{
$this->logInAs('admin');
@@ -49,6 +117,13 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
$this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
$this->assertContains('flashes.import.notice.summary', $body[0]);
+
+ $this->assertNotEmpty($content->getMimetype());
+ $this->assertNotEmpty($content->getPreviewPicture());
+ $this->assertNotEmpty($content->getLanguage());
+ $this->assertEquals(0, count($content->getTags()));
+ $this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
+ $this->assertEquals('2016-08-25', $content->getCreatedAt()->format('Y-m-d'));
}
public function testImportReadabilityWithFileAndMarkAllAsRead()
diff --git a/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php b/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
index c1025b41c..98e85d453 100644
--- a/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
@@ -19,6 +19,74 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
$this->assertEquals(1, $crawler->filter('input[type=file]')->count());
}
+ public function testImportWallabagWithRabbitEnabled()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $client->getContainer()->get('craue_config')->set('import_with_rabbitmq', 1);
+
+ $crawler = $client->request('GET', '/import/wallabag-v1');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertEquals(1, $crawler->filter('form[name=upload_import_file] > button[type=submit]')->count());
+ $this->assertEquals(1, $crawler->filter('input[type=file]')->count());
+
+ $client->getContainer()->get('craue_config')->set('import_with_rabbitmq', 0);
+ }
+
+ public function testImportWallabagBadFile()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $crawler = $client->request('GET', '/import/wallabag-v1');
+ $form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
+
+ $data = [
+ 'upload_import_file[file]' => '',
+ ];
+
+ $client->submit($form, $data);
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ }
+
+ public function testImportWallabagWithRedisEnabled()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $client->getContainer()->get('craue_config')->set('import_with_redis', 1);
+
+ $crawler = $client->request('GET', '/import/wallabag-v1');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertEquals(1, $crawler->filter('form[name=upload_import_file] > button[type=submit]')->count());
+ $this->assertEquals(1, $crawler->filter('input[type=file]')->count());
+
+ $form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
+
+ $file = new UploadedFile(__DIR__.'/../fixtures/wallabag-v1.json', 'wallabag-v1.json');
+
+ $data = [
+ 'upload_import_file[file]' => $file,
+ ];
+
+ $client->submit($form, $data);
+
+ $this->assertEquals(302, $client->getResponse()->getStatusCode());
+
+ $crawler = $client->followRedirect();
+
+ $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
+ $this->assertContains('flashes.import.notice.summary', $body[0]);
+
+ $this->assertNotEmpty($client->getContainer()->get('wallabag_core.redis.client')->lpop('wallabag.import.wallabag_v1'));
+
+ $client->getContainer()->get('craue_config')->set('import_with_redis', 0);
+ }
+
public function testImportWallabagWithFile()
{
$this->logInAs('admin');
@@ -56,6 +124,12 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
$this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
$this->assertContains('flashes.import.notice.summary', $body[0]);
+
+ $this->assertEmpty($content->getMimetype());
+ $this->assertEmpty($content->getPreviewPicture());
+ $this->assertEmpty($content->getLanguage());
+ $this->assertEquals(1, count($content->getTags()));
+ $this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
}
public function testImportWallabagWithFileAndMarkAllAsRead()
diff --git a/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php b/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
index d8d2c8bf6..74d61f9a2 100644
--- a/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
+++ b/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
@@ -19,6 +19,74 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
$this->assertEquals(1, $crawler->filter('input[type=file]')->count());
}
+ public function testImportWallabagWithRabbitEnabled()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $client->getContainer()->get('craue_config')->set('import_with_rabbitmq', 1);
+
+ $crawler = $client->request('GET', '/import/wallabag-v2');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertEquals(1, $crawler->filter('form[name=upload_import_file] > button[type=submit]')->count());
+ $this->assertEquals(1, $crawler->filter('input[type=file]')->count());
+
+ $client->getContainer()->get('craue_config')->set('import_with_rabbitmq', 0);
+ }
+
+ public function testImportWallabagBadFile()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $crawler = $client->request('GET', '/import/wallabag-v2');
+ $form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
+
+ $data = [
+ 'upload_import_file[file]' => '',
+ ];
+
+ $client->submit($form, $data);
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ }
+
+ public function testImportWallabagWithRedisEnabled()
+ {
+ $this->logInAs('admin');
+ $client = $this->getClient();
+
+ $client->getContainer()->get('craue_config')->set('import_with_redis', 1);
+
+ $crawler = $client->request('GET', '/import/wallabag-v2');
+
+ $this->assertEquals(200, $client->getResponse()->getStatusCode());
+ $this->assertEquals(1, $crawler->filter('form[name=upload_import_file] > button[type=submit]')->count());
+ $this->assertEquals(1, $crawler->filter('input[type=file]')->count());
+
+ $form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
+
+ $file = new UploadedFile(__DIR__.'/../fixtures/wallabag-v2.json', 'wallabag-v2.json');
+
+ $data = [
+ 'upload_import_file[file]' => $file,
+ ];
+
+ $client->submit($form, $data);
+
+ $this->assertEquals(302, $client->getResponse()->getStatusCode());
+
+ $crawler = $client->followRedirect();
+
+ $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
+ $this->assertContains('flashes.import.notice.summary', $body[0]);
+
+ $this->assertNotEmpty($client->getContainer()->get('wallabag_core.redis.client')->lpop('wallabag.import.wallabag_v2'));
+
+ $client->getContainer()->get('craue_config')->set('import_with_redis', 0);
+ }
+
public function testImportWallabagWithFile()
{
$this->logInAs('admin');
@@ -50,9 +118,9 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
$this->getLoggedInUserId()
);
- $this->assertEmpty($content->getMimetype());
- $this->assertEmpty($content->getPreviewPicture());
- $this->assertEmpty($content->getLanguage());
+ $this->assertNotEmpty($content->getMimetype());
+ $this->assertNotEmpty($content->getPreviewPicture());
+ $this->assertNotEmpty($content->getLanguage());
$this->assertEquals(0, count($content->getTags()));
$content = $client->getContainer()
@@ -67,6 +135,8 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
$this->assertNotEmpty($content->getPreviewPicture());
$this->assertNotEmpty($content->getLanguage());
$this->assertEquals(2, count($content->getTags()));
+ $this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
+ $this->assertEquals('2016-09-08', $content->getCreatedAt()->format('Y-m-d'));
}
public function testImportWallabagWithEmptyFile()
diff --git a/tests/Wallabag/ImportBundle/Import/PocketImportTest.php b/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
index 8534e1c8f..952521a2a 100644
--- a/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
+++ b/tests/Wallabag/ImportBundle/Import/PocketImportTest.php
@@ -4,21 +4,17 @@ namespace Tests\Wallabag\ImportBundle\Import;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Entity\Config;
use Wallabag\ImportBundle\Import\PocketImport;
use GuzzleHttp\Client;
use GuzzleHttp\Subscriber\Mock;
use GuzzleHttp\Message\Response;
use GuzzleHttp\Stream\Stream;
+use Wallabag\ImportBundle\Redis\Producer;
use Monolog\Logger;
use Monolog\Handler\TestHandler;
-
-class PocketImportMock extends PocketImport
-{
- public function getAccessToken()
- {
- return $this->accessToken;
- }
-}
+use Simpleue\Queue\RedisQueue;
+use M6Web\Component\RedisMock\RedisMockFactory;
class PocketImportTest extends \PHPUnit_Framework_TestCase
{
@@ -32,45 +28,24 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
{
$this->user = new User();
- $this->tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')
- ->disableOriginalConstructor()
- ->getMock();
+ $config = new Config($this->user);
+ $config->setPocketConsumerKey('xxx');
- $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')
- ->disableOriginalConstructor()
- ->getMock();
+ $this->user->setConfig($config);
$this->contentProxy = $this->getMockBuilder('Wallabag\CoreBundle\Helper\ContentProxy')
->disableOriginalConstructor()
->getMock();
- $token->expects($this->once())
- ->method('getUser')
- ->willReturn($this->user);
-
- $this->tokenStorage->expects($this->once())
- ->method('getToken')
- ->willReturn($token);
-
$this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
->disableOriginalConstructor()
->getMock();
- $config = $this->getMockBuilder('Craue\ConfigBundle\Util\Config')
- ->disableOriginalConstructor()
- ->getMock();
-
- $config->expects($this->any())
- ->method('get')
- ->with('pocket_consumer_key')
- ->willReturn($consumerKey);
-
- $pocket = new PocketImportMock(
- $this->tokenStorage,
+ $pocket = new PocketImport(
$this->em,
- $this->contentProxy,
- $config
+ $this->contentProxy
);
+ $pocket->setUser($this->user);
$this->logHandler = new TestHandler();
$logger = new Logger('test', [$this->logHandler]);
@@ -189,10 +164,16 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
"given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
"favorite": "1",
"status": "1",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 0,
"resolved_title": "The Massive Ryder Cup Preview",
"resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
"excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
"is_article": "1",
+ "is_index": "0",
"has_video": "1",
"has_image": "1",
"word_count": "3197",
@@ -236,10 +217,16 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
"given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
"favorite": "1",
"status": "1",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 1,
"resolved_title": "The Massive Ryder Cup Preview",
"resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
"excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
"is_article": "1",
+ "is_index": "0",
"has_video": "0",
"has_image": "0",
"word_count": "3197"
@@ -279,7 +266,7 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
$res = $pocketImport->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 1], $pocketImport->getSummary());
+ $this->assertEquals(['skipped' => 1, 'imported' => 1, 'queued' => 0], $pocketImport->getSummary());
}
/**
@@ -302,6 +289,11 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
"given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
"favorite": "1",
"status": "1",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 0,
"excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
"is_article": "1",
"has_video": "1",
@@ -315,6 +307,11 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
"given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
"favorite": "1",
"status": "0",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 1,
"excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
"is_article": "1",
"has_video": "0",
@@ -364,7 +361,174 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
$res = $pocketImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 2], $pocketImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 2, 'queued' => 0], $pocketImport->getSummary());
+ }
+
+ /**
+ * Will sample results from https://getpocket.com/developer/docs/v3/retrieve.
+ */
+ public function testImportWithRabbit()
+ {
+ $client = new Client();
+
+ $body = <<<'JSON'
+{
+ "item_id": "229279689",
+ "resolved_id": "229279689",
+ "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+ "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+ "favorite": "1",
+ "status": "1",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 0,
+ "resolved_title": "The Massive Ryder Cup Preview",
+ "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+ "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+ "is_article": "1",
+ "has_video": "0",
+ "has_image": "0",
+ "word_count": "3197"
+}
+JSON;
+
+ $mock = new Mock([
+ new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
+ new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
+ {
+ "status": 1,
+ "list": {
+ "229279690": '.$body.'
+ }
+ }
+ ')),
+ ]);
+
+ $client->getEmitter()->attach($mock);
+
+ $pocketImport = $this->getPocketImport();
+
+ $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $entryRepo->expects($this->never())
+ ->method('findByUrlAndUserId');
+
+ $this->em
+ ->expects($this->never())
+ ->method('getRepository');
+
+ $entry = new Entry($this->user);
+
+ $this->contentProxy
+ ->expects($this->never())
+ ->method('updateEntry');
+
+ $producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $bodyAsArray = json_decode($body, true);
+ // because with just use `new User()` so it doesn't have an id
+ $bodyAsArray['userId'] = null;
+
+ $producer
+ ->expects($this->once())
+ ->method('publish')
+ ->with(json_encode($bodyAsArray));
+
+ $pocketImport->setClient($client);
+ $pocketImport->setProducer($producer);
+ $pocketImport->authorize('wunderbar_code');
+
+ $res = $pocketImport->setMarkAsRead(true)->import();
+
+ $this->assertTrue($res);
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 1], $pocketImport->getSummary());
+ }
+
+ /**
+ * Will sample results from https://getpocket.com/developer/docs/v3/retrieve.
+ */
+ public function testImportWithRedis()
+ {
+ $client = new Client();
+
+ $body = <<<'JSON'
+{
+ "item_id": "229279689",
+ "resolved_id": "229279689",
+ "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+ "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+ "favorite": "1",
+ "status": "1",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 0,
+ "resolved_title": "The Massive Ryder Cup Preview",
+ "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+ "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+ "is_article": "1",
+ "has_video": "0",
+ "has_image": "0",
+ "word_count": "3197"
+}
+JSON;
+
+ $mock = new Mock([
+ new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
+ new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
+ {
+ "status": 1,
+ "list": {
+ "229279690": '.$body.'
+ }
+ }
+ ')),
+ ]);
+
+ $client->getEmitter()->attach($mock);
+
+ $pocketImport = $this->getPocketImport();
+
+ $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $entryRepo->expects($this->never())
+ ->method('findByUrlAndUserId');
+
+ $this->em
+ ->expects($this->never())
+ ->method('getRepository');
+
+ $entry = new Entry($this->user);
+
+ $this->contentProxy
+ ->expects($this->never())
+ ->method('updateEntry');
+
+ $factory = new RedisMockFactory();
+ $redisMock = $factory->getAdapter('Predis\Client', true);
+
+ $queue = new RedisQueue($redisMock, 'pocket');
+ $producer = new Producer($queue);
+
+ $pocketImport->setClient($client);
+ $pocketImport->setProducer($producer);
+ $pocketImport->authorize('wunderbar_code');
+
+ $res = $pocketImport->setMarkAsRead(true)->import();
+
+ $this->assertTrue($res);
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 1], $pocketImport->getSummary());
+
+ $this->assertNotEmpty($redisMock->lpop('pocket'));
}
public function testImportBadResponse()
@@ -402,6 +566,8 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
"status": 1,
"list": {
"229279689": {
+ "status": "1",
+ "favorite": "1",
"resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview"
}
}
@@ -439,6 +605,6 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
$res = $pocketImport->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 0], $pocketImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 1, 'queued' => 0], $pocketImport->getSummary());
}
}
diff --git a/tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php b/tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php
index 706d707b2..d98cd486a 100644
--- a/tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php
+++ b/tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php
@@ -5,8 +5,11 @@ namespace Tests\Wallabag\ImportBundle\Import;
use Wallabag\ImportBundle\Import\ReadabilityImport;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\ImportBundle\Redis\Producer;
use Monolog\Logger;
use Monolog\Handler\TestHandler;
+use Simpleue\Queue\RedisQueue;
+use M6Web\Component\RedisMock\RedisMockFactory;
class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
{
@@ -58,9 +61,9 @@ class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $entryRepo->expects($this->exactly(2))
+ $entryRepo->expects($this->exactly(24))
->method('findByUrlAndUserId')
- ->will($this->onConsecutiveCalls(false, true));
+ ->willReturn(false);
$this->em
->expects($this->any())
@@ -72,14 +75,14 @@ class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
->getMock();
$this->contentProxy
- ->expects($this->exactly(1))
+ ->expects($this->exactly(24))
->method('updateEntry')
->willReturn($entry);
$res = $readabilityImport->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 1], $readabilityImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 24, 'queued' => 0], $readabilityImport->getSummary());
}
public function testImportAndMarkAllAsRead()
@@ -93,7 +96,7 @@ class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
$entryRepo->expects($this->exactly(2))
->method('findByUrlAndUserId')
- ->will($this->onConsecutiveCalls(false, false));
+ ->will($this->onConsecutiveCalls(false, true));
$this->em
->expects($this->any())
@@ -101,7 +104,7 @@ class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
->willReturn($entryRepo);
$this->contentProxy
- ->expects($this->exactly(2))
+ ->expects($this->exactly(1))
->method('updateEntry')
->willReturn(new Entry($this->user));
@@ -117,7 +120,87 @@ class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 2], $readabilityImport->getSummary());
+ $this->assertEquals(['skipped' => 1, 'imported' => 1, 'queued' => 0], $readabilityImport->getSummary());
+ }
+
+ public function testImportWithRabbit()
+ {
+ $readabilityImport = $this->getReadabilityImport();
+ $readabilityImport->setFilepath(__DIR__.'/../fixtures/readability.json');
+
+ $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $entryRepo->expects($this->never())
+ ->method('findByUrlAndUserId');
+
+ $this->em
+ ->expects($this->never())
+ ->method('getRepository');
+
+ $entry = $this->getMockBuilder('Wallabag\CoreBundle\Entity\Entry')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->contentProxy
+ ->expects($this->never())
+ ->method('updateEntry');
+
+ $producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $producer
+ ->expects($this->exactly(24))
+ ->method('publish');
+
+ $readabilityImport->setProducer($producer);
+
+ $res = $readabilityImport->setMarkAsRead(true)->import();
+
+ $this->assertTrue($res);
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 24], $readabilityImport->getSummary());
+ }
+
+ public function testImportWithRedis()
+ {
+ $readabilityImport = $this->getReadabilityImport();
+ $readabilityImport->setFilepath(__DIR__.'/../fixtures/readability.json');
+
+ $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $entryRepo->expects($this->never())
+ ->method('findByUrlAndUserId');
+
+ $this->em
+ ->expects($this->never())
+ ->method('getRepository');
+
+ $entry = $this->getMockBuilder('Wallabag\CoreBundle\Entity\Entry')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->contentProxy
+ ->expects($this->never())
+ ->method('updateEntry');
+
+ $factory = new RedisMockFactory();
+ $redisMock = $factory->getAdapter('Predis\Client', true);
+
+ $queue = new RedisQueue($redisMock, 'readability');
+ $producer = new Producer($queue);
+
+ $readabilityImport->setProducer($producer);
+
+ $res = $readabilityImport->setMarkAsRead(true)->import();
+
+ $this->assertTrue($res);
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 24], $readabilityImport->getSummary());
+
+ $this->assertNotEmpty($redisMock->lpop('readability'));
}
public function testImportBadFile()
diff --git a/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php b/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php
index bdc47dac1..5ab4ad008 100644
--- a/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php
+++ b/tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php
@@ -5,8 +5,11 @@ namespace Tests\Wallabag\ImportBundle\Import;
use Wallabag\ImportBundle\Import\WallabagV1Import;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\ImportBundle\Redis\Producer;
use Monolog\Logger;
use Monolog\Handler\TestHandler;
+use Simpleue\Queue\RedisQueue;
+use M6Web\Component\RedisMock\RedisMockFactory;
class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
{
@@ -79,7 +82,7 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
$res = $wallabagV1Import->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 3], $wallabagV1Import->getSummary());
+ $this->assertEquals(['skipped' => 1, 'imported' => 3, 'queued' => 0], $wallabagV1Import->getSummary());
}
public function testImportAndMarkAllAsRead()
@@ -117,7 +120,87 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 3], $wallabagV1Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 3, 'queued' => 0], $wallabagV1Import->getSummary());
+ }
+
+ public function testImportWithRabbit()
+ {
+ $wallabagV1Import = $this->getWallabagV1Import();
+ $wallabagV1Import->setFilepath(__DIR__.'/../fixtures/wallabag-v1.json');
+
+ $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $entryRepo->expects($this->never())
+ ->method('findByUrlAndUserId');
+
+ $this->em
+ ->expects($this->never())
+ ->method('getRepository');
+
+ $entry = $this->getMockBuilder('Wallabag\CoreBundle\Entity\Entry')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->contentProxy
+ ->expects($this->never())
+ ->method('updateEntry');
+
+ $producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $producer
+ ->expects($this->exactly(4))
+ ->method('publish');
+
+ $wallabagV1Import->setProducer($producer);
+
+ $res = $wallabagV1Import->setMarkAsRead(true)->import();
+
+ $this->assertTrue($res);
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $wallabagV1Import->getSummary());
+ }
+
+ public function testImportWithRedis()
+ {
+ $wallabagV1Import = $this->getWallabagV1Import();
+ $wallabagV1Import->setFilepath(__DIR__.'/../fixtures/wallabag-v1.json');
+
+ $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $entryRepo->expects($this->never())
+ ->method('findByUrlAndUserId');
+
+ $this->em
+ ->expects($this->never())
+ ->method('getRepository');
+
+ $entry = $this->getMockBuilder('Wallabag\CoreBundle\Entity\Entry')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->contentProxy
+ ->expects($this->never())
+ ->method('updateEntry');
+
+ $factory = new RedisMockFactory();
+ $redisMock = $factory->getAdapter('Predis\Client', true);
+
+ $queue = new RedisQueue($redisMock, 'wallabag_v1');
+ $producer = new Producer($queue);
+
+ $wallabagV1Import->setProducer($producer);
+
+ $res = $wallabagV1Import->setMarkAsRead(true)->import();
+
+ $this->assertTrue($res);
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $wallabagV1Import->getSummary());
+
+ $this->assertNotEmpty($redisMock->lpop('wallabag_v1'));
}
public function testImportBadFile()
diff --git a/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php b/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php
index 4a45e0f0a..12bd6bdd0 100644
--- a/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php
+++ b/tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php
@@ -5,8 +5,11 @@ namespace Tests\Wallabag\ImportBundle\Import;
use Wallabag\ImportBundle\Import\WallabagV2Import;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\ImportBundle\Redis\Producer;
use Monolog\Logger;
use Monolog\Handler\TestHandler;
+use Simpleue\Queue\RedisQueue;
+use M6Web\Component\RedisMock\RedisMockFactory;
class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
{
@@ -75,7 +78,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
$res = $wallabagV2Import->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 22, 'imported' => 2], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 22, 'imported' => 2, 'queued' => 0], $wallabagV2Import->getSummary());
}
public function testImportAndMarkAllAsRead()
@@ -113,7 +116,79 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 2], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 2, 'queued' => 0], $wallabagV2Import->getSummary());
+ }
+
+ public function testImportWithRabbit()
+ {
+ $wallabagV2Import = $this->getWallabagV2Import();
+ $wallabagV2Import->setFilepath(__DIR__.'/../fixtures/wallabag-v2.json');
+
+ $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $entryRepo->expects($this->never())
+ ->method('findByUrlAndUserId');
+
+ $this->em
+ ->expects($this->never())
+ ->method('getRepository');
+
+ $this->contentProxy
+ ->expects($this->never())
+ ->method('updateEntry');
+
+ $producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $producer
+ ->expects($this->exactly(24))
+ ->method('publish');
+
+ $wallabagV2Import->setProducer($producer);
+
+ $res = $wallabagV2Import->setMarkAsRead(true)->import();
+
+ $this->assertTrue($res);
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 24], $wallabagV2Import->getSummary());
+ }
+
+ public function testImportWithRedis()
+ {
+ $wallabagV2Import = $this->getWallabagV2Import();
+ $wallabagV2Import->setFilepath(__DIR__.'/../fixtures/wallabag-v2.json');
+
+ $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $entryRepo->expects($this->never())
+ ->method('findByUrlAndUserId');
+
+ $this->em
+ ->expects($this->never())
+ ->method('getRepository');
+
+ $this->contentProxy
+ ->expects($this->never())
+ ->method('updateEntry');
+
+ $factory = new RedisMockFactory();
+ $redisMock = $factory->getAdapter('Predis\Client', true);
+
+ $queue = new RedisQueue($redisMock, 'wallabag_v2');
+ $producer = new Producer($queue);
+
+ $wallabagV2Import->setProducer($producer);
+
+ $res = $wallabagV2Import->setMarkAsRead(true)->import();
+
+ $this->assertTrue($res);
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 24], $wallabagV2Import->getSummary());
+
+ $this->assertNotEmpty($redisMock->lpop('wallabag_v2'));
}
public function testImportBadFile()
@@ -152,7 +227,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
$res = $wallabagV2Import->import();
$this->assertFalse($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 0], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 0], $wallabagV2Import->getSummary());
}
public function testImportWithExceptionFromGraby()
@@ -181,6 +256,6 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
$res = $wallabagV2Import->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 24, 'imported' => 0], $wallabagV2Import->getSummary());
+ $this->assertEquals(['skipped' => 22, 'imported' => 2, 'queued' => 0], $wallabagV2Import->getSummary());
}
}
diff --git a/tests/Wallabag/ImportBundle/fixtures/readability.json b/tests/Wallabag/ImportBundle/fixtures/readability.json
index 343799053..32f6fa530 100644
--- a/tests/Wallabag/ImportBundle/fixtures/readability.json
+++ b/tests/Wallabag/ImportBundle/fixtures/readability.json
@@ -11,14 +11,165 @@
"archive": false
},
{
- "article__excerpt": "TL;DR: Re-use your DOM elements and remove the ones that are far away from the viewport. Use placeholders to account for delayed data. Here’s a demo and the code for the infinite…",
- "favorite": false,
- "date_archived": "2016-08-26T12:21:54",
- "article__url": "https://developers.google.com/web/updates/2016/07/infinite-scroller?imm_mid=0e6839&cmp=em-webops-na-na-newsltr_20160805",
- "date_added": "2016-08-06T05:35:26",
- "date_favorited": null,
- "article__title": "Complexities of an infinite scroller | Web Updates",
- "archive": true
+ "article__title": "Réfugiés: l'UE va créer 100 000 places d'accueil dans les Balkans",
+ "article__url": "http://www.liberation.fr/planete/2015/10/26/refugies-l-ue-va-creer-100-000-places-d-accueil-dans-les-balkans_1408867",
+ "archive": false,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": false
+ },
+ {
+ "article__title": "No title found",
+ "article__url": "http://news.nationalgeographic.com/2016/02/160211-albatrosses-mothers-babies-animals-science/&sf20739758=1",
+ "archive": false,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": true
+ },
+ {
+ "archive": 0,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Échecs",
+ "article__url": "https://fr.wikipedia.org/wiki/Échecs"
+ },
+ {
+ "archive": 0,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "90% des dossiers médicaux des Coréens du sud vendus à des entreprises privées - ZATAZ",
+ "article__url": "http://www.zataz.com/90-des-dossiers-medicaux-des-coreens-du-sud-vendus-a-des-entreprises-privees/"
+ },
+ {
+ "archive": 0,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Mass Surveillance As Art",
+ "article__url": "https://www.nationaljournal.com/s/73311/mass-surveillance-art"
+ },
+ {
+ "archive": 0,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "What David Cameron did to the pig, his party is now doing to the country",
+ "article__url": "http://www.newstatesman.com/2015/09/what-david-cameron-did-pig-his-party-now-doing-country"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "CLICK HERE to support 2016 CES Winner, Revolutionary Auto-Tracking Robot",
+ "article__url": "https://www.indiegogo.com/projects/2016-ces-winner-revolutionary-auto-tracking-robot"
+ },
+ {
+ "archive": 0,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 1,
+ "article__title": "No title found",
+ "article__url": "http://carnetdevol.shost.ca/wordpress/aide-memoire-sur-les-commandes-associees-a-systemd/"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Présentation d'Arduino - Tuto Arduino - Le blog d'Eskimon",
+ "article__url": "http://eskimon.fr/73-arduino-101-presentation"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Lenovo ThinkPad X1 Carbon Ultrabook Review",
+ "article__url": "http://www.notebookcheck.net/Lenovo-ThinkPad-X1-Carbon-Ultrabook-Review.138033.0.html"
+ },
+ {
+ "archive": 0,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Visitons le Château de Landsberg !",
+ "article__url": "http://autour-du-mont-sainte-odile.overblog.com/2016/01/visitons-le-chateau-de-landsberg.html"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Contrer les stéréotypes par les livres : “C'est dès l'enfance qu'ils se construisent”",
+ "article__url": "https://www.actualitte.com/article/monde-edition/contrer-les-stereotypes-par-les-livres-c-est-des-l-enfance-qu-ils-se-construisent/64058"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "[ROM][6.0.1][Layers][N5] TipsyOS official builds {UBER TCs}",
+ "article__url": "http://forum.xda-developers.com/google-nexus-5/development/rom-tipsyos-official-builds-uber-tcs-t3325989"
+ },
+ {
+ "archive": 0,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Top 15 Podcasts All Web Developers Should Follow - Envato Tuts+ Code Article",
+ "article__url": "http://code.tutsplus.com/articles/top-15-podcasts-all-web-developers-should-follow--net-14461"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "University of Mississippi",
+ "article__url": "http://olemiss.edu"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "FinnChristiansen.de Jetzt Dank Let’s Encrypt Per HTTPS Erreichbar",
+ "article__url": "https://www.finnchristiansen.de/2015/12/06/finnchristiansen-de-jetzt-dank-lets-encrypt-per-https-erreichbar/"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Le développeur et l'ingénierie logicielle",
+ "article__url": "http://wemucs.com/le-developpeur-et-lingenierie-logicielle/"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "The Role of Methylation in Gene Expression",
+ "article__url": "http://www.nature.com/scitable/topicpage/the-role-of-methylation-in-gene-expression-1070"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "E-Mail-Adresse kostenlos, FreeMail, De-Mail & Nachrichten",
+ "article__url": "http://web.de"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "OpenSSH Server on Arch Linux | DominicM test",
+ "article__url": "http://dominicm.com/openssh-server-arch-linux/"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Site Moved | Site Help",
+ "article__url": "http://g1.com/help/sitemoved.asp"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "#Maroc : le stylo anti-pédophiles EAGLE d’AMESYS est moins bien configuré que les faux-lowers Twitter du roi Mohammed VI",
+ "article__url": "https://reflets.info/maroc-le-stylo-anti-pedophiles-eagle-damesys-est-moins-bien-configure-que-les-faux-lowers-twitter-du-roi-mohammed-vi/"
+ },
+ {
+ "archive": 1,
+ "date_added": "2016-09-08T11:55:58+0200",
+ "favorite": 0,
+ "article__title": "Simple Cloud Infrastructure for Developers",
+ "article__url": "https://www.digitalocean.com/"
}
],
"recommendations": []