X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=tests%2FWallabag%2FCoreBundle%2FHelper%2FDownloadImagesTest.php;h=3c720425a55846af8b4855c1ea5d94420cf1e13e;hb=48d136d3a08d7f4ca8e0d434d8104c746d31957d;hp=51ab1bcdd4f103c1fad2e9bc342f87e8f008c5f3;hpb=8fe73e076c75f185e44ee992e6f2ec6157aecf8e;p=github%2Fwallabag%2Fwallabag.git
diff --git a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
index 51ab1bcd..3c720425 100644
--- a/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/DownloadImagesTest.php
@@ -2,10 +2,8 @@
namespace Tests\Wallabag\CoreBundle\Helper;
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\Mock;
+use GuzzleHttp\Psr7\Response;
+use Http\Mock\Client as HttpMockClient;
use Monolog\Handler\TestHandler;
use Monolog\Logger;
use PHPUnit\Framework\TestCase;
@@ -32,18 +30,14 @@ class DownloadImagesTest extends TestCase
*/
public function testProcessHtml($html, $url)
{
- $client = new Client();
+ $httpMockClient = new HttpMockClient();
- $mock = new Mock([
- new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processHtml(123, $html, $url);
@@ -53,18 +47,13 @@ class DownloadImagesTest extends TestCase
public function testProcessHtmlWithBadImage()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => 'application/json'], Stream::factory('')),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => 'application/json'], ''));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, 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');
@@ -85,18 +74,13 @@ class DownloadImagesTest extends TestCase
*/
public function testProcessSingleImage($header, $extension)
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => $header], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => $header], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, 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);
@@ -104,18 +88,13 @@ class DownloadImagesTest extends TestCase
public function testProcessSingleImageWithBadUrl()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(404, []),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(404, []));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, 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');
@@ -123,18 +102,13 @@ class DownloadImagesTest extends TestCase
public function testProcessSingleImageWithBadImage()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => 'image/png'], Stream::factory('')),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], ''));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, 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');
@@ -142,18 +116,13 @@ class DownloadImagesTest extends TestCase
public function testProcessSingleImageFailAbsolute()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, 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');
@@ -161,18 +130,13 @@ class DownloadImagesTest extends TestCase
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);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(
123,
@@ -186,22 +150,55 @@ class DownloadImagesTest extends TestCase
public function testProcessImageWithSrcset()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
- new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
- new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
+ $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
+ $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processHtml(123, '![](http://piketty.blog.lemonde.fr/files/2017/10/F1FR-530x375.jpg)
', 'http://piketty.blog.lemonde.fr/2017/10/12/budget-2018-la-jeunesse-sacrifiee/');
$this->assertNotContains('http://piketty.blog.lemonde.fr/', $res, 'Image srcset attribute were not replaced');
}
+
+ public function testProcessImageWithTrickySrcset()
+ {
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
+ $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
+ $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
+
+ $logHandler = new TestHandler();
+ $logger = new Logger('test', [$logHandler]);
+
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $res = $download->processHtml(123, '
', 'https://css-tricks.com/the-critical-request/');
+
+ $this->assertNotContains('f_auto,q_auto', $res, 'Image srcset attribute were not replaced');
+ }
+
+ public function testProcessImageWithNullPath()
+ {
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
+
+ $logHandler = new TestHandler();
+ $logger = new Logger('test', [$logHandler]);
+
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+
+ $res = $download->processSingleImage(
+ 123,
+ null,
+ 'https://framablog.org/2018/06/30/engagement-atypique/'
+ );
+ $this->assertFalse($res);
+ }
}