X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FWallabag%2FCoreBundle%2FHelper%2FDownloadImagesTest.php;h=c61f65d03cfe8dfa897300dc4beabeae3fbfa6d2;hb=f808b01692a835673f328d7221ba8c212caa9b61;hp=920c21d99e06364d064213ad520abfaa910103de;hpb=5a619812ca3eb05a82a023ccdaee13501eb8d45f;p=github%2Fwallabag%2Fwallabag.git
diff --git a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
index 920c21d9..c61f65d0 100644
--- a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
@@ -2,35 +2,52 @@
namespace Tests\Wallabag\CoreBundle\Helper;
-use Wallabag\CoreBundle\Helper\DownloadImages;
-use Psr\Log\NullLogger;
-use Monolog\Logger;
-use Monolog\Handler\TestHandler;
use GuzzleHttp\Client;
-use GuzzleHttp\Subscriber\Mock;
use GuzzleHttp\Message\Response;
use GuzzleHttp\Stream\Stream;
+use GuzzleHttp\Subscriber\Mock;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
+use Wallabag\CoreBundle\Helper\DownloadImages;
class DownloadImagesTest extends \PHPUnit_Framework_TestCase
{
- public function testProcessHtml()
+ public function dataForSuccessImage()
+ {
+ return [
+ 'imgur' => [
+ '
![](http://i.imgur.com/T9qgcHc.jpg)
',
+ 'http://imgur.com/gallery/WxtWY',
+ ],
+ 'image with &' => [
+ '![](https://i2.wp.com/www.tvaddons.ag/wp-content/uploads/2017/01/Screen-Shot-2017-01-07-at-10.17.40-PM.jpg?w=640&ssl=1)
',
+ 'https://www.tvaddons.ag/realdebrid-kodi-jarvis/',
+ ],
+ ];
+ }
+
+ /**
+ * @dataProvider dataForSuccessImage
+ */
+ public function testProcessHtml($html, $url)
{
$client = new Client();
$mock = new Mock([
- new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__.'/../fixtures/unnamed.png'))),
+ new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
]);
$client->getEmitter()->attach($mock);
$logHandler = new TestHandler();
- $logger = new Logger('test', array($logHandler));
+ $logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir().'/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
- $res = $download->processHtml(123, '![](http://i.imgur.com/T9qgcHc.jpg)
', 'http://imgur.com/gallery/WxtWY');
+ $res = $download->processHtml(123, $html, $url);
- $this->assertContains('http://wallabag.io/assets/images/9/b/9b0ead26/c638b4c2.png', $res);
+ // this the base path of all image (since it's calculated using the entry id: 123)
+ $this->assertContains('http://wallabag.io/assets/images/9/b/9b0ead26/', $res);
}
public function testProcessHtmlWithBadImage()
@@ -44,9 +61,9 @@ class DownloadImagesTest extends \PHPUnit_Framework_TestCase
$client->getEmitter()->attach($mock);
$logHandler = new TestHandler();
- $logger = new Logger('test', array($logHandler));
+ $logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir().'/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processHtml(123, '![](http://i.imgur.com/T9qgcHc.jpg)
', 'http://imgur.com/gallery/WxtWY');
$this->assertContains('http://i.imgur.com/T9qgcHc.jpg', $res, 'Image were not replace because of content-type');
@@ -70,18 +87,18 @@ class DownloadImagesTest extends \PHPUnit_Framework_TestCase
$client = new Client();
$mock = new Mock([
- new Response(200, ['content-type' => $header], Stream::factory(file_get_contents(__DIR__.'/../fixtures/unnamed.png'))),
+ new Response(200, ['content-type' => $header], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
]);
$client->getEmitter()->attach($mock);
$logHandler = new TestHandler();
- $logger = new Logger('test', array($logHandler));
+ $logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir().'/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, 'T9qgcHc.jpg', 'http://imgur.com/gallery/WxtWY');
- $this->assertContains('/assets/images/9/b/9b0ead26/ebe60399.'.$extension, $res);
+ $this->assertContains('/assets/images/9/b/9b0ead26/ebe60399.' . $extension, $res);
}
public function testProcessSingleImageWithBadUrl()
@@ -95,9 +112,9 @@ class DownloadImagesTest extends \PHPUnit_Framework_TestCase
$client->getEmitter()->attach($mock);
$logHandler = new TestHandler();
- $logger = new Logger('test', array($logHandler));
+ $logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir().'/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, 'T9qgcHc.jpg', 'http://imgur.com/gallery/WxtWY');
$this->assertFalse($res, 'Image can not be found, so it will not be replaced');
@@ -114,9 +131,9 @@ class DownloadImagesTest extends \PHPUnit_Framework_TestCase
$client->getEmitter()->attach($mock);
$logHandler = new TestHandler();
- $logger = new Logger('test', array($logHandler));
+ $logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir().'/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, 'http://i.imgur.com/T9qgcHc.jpg', 'http://imgur.com/gallery/WxtWY');
$this->assertFalse($res, 'Image can not be loaded, so it will not be replaced');
@@ -127,17 +144,42 @@ class DownloadImagesTest extends \PHPUnit_Framework_TestCase
$client = new Client();
$mock = new Mock([
- new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__.'/../fixtures/unnamed.png'))),
+ new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
]);
$client->getEmitter()->attach($mock);
$logHandler = new TestHandler();
- $logger = new Logger('test', array($logHandler));
+ $logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir().'/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, '/i.imgur.com/T9qgcHc.jpg', 'imgur.com/gallery/WxtWY');
$this->assertFalse($res, 'Absolute image can not be determined, so it will not be replaced');
}
+
+ public function testProcessRealImage()
+ {
+ $client = new Client();
+
+ $mock = new Mock([
+ new Response(200, ['content-type' => null], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
+ ]);
+
+ $client->getEmitter()->attach($mock);
+
+ $logHandler = new TestHandler();
+ $logger = new Logger('test', [$logHandler]);
+
+ $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+
+ $res = $download->processSingleImage(
+ 123,
+ 'https://cdn.theconversation.com/files/157200/article/width926/gsj2rjp2-1487348607.jpg',
+ 'https://theconversation.com/conversation-avec-gerald-bronner-ce-nest-pas-la-post-verite-qui-nous-menace-mais-lextension-de-notre-credulite-73089'
+ );
+
+ $this->assertContains('http://wallabag.io/assets/images/9/b/9b0ead26/', $res, 'Content-Type was empty but data is ok for an image');
+ $this->assertContains('DownloadImages: Checking extension (alternative)', $logHandler->getRecords()[3]['message']);
+ }
}