X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2FWallabag%2FCoreBundle%2FHelper%2FContentProxyTest.php;h=9ce72c79c1277ec08ded6eb7f3d8b4265cc4fdf7;hb=1ebc8e1f024ae0f13a495872ba7b3705251bfc1f;hp=8ed7fa5f8cfaa837be42cd8c343363a190951279;hpb=715fabf8f286177c7abb216f0c867a989de18c32;p=github%2Fwallabag%2Fwallabag.git
diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index 8ed7fa5f..9ce72c79 100644
--- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@ -36,7 +36,9 @@ class ContentProxyTest extends TestCase
'html' => false,
'title' => '',
'url' => '',
- 'content_type' => '',
+ 'headers' => [
+ 'content-type' => '',
+ ],
'language' => '',
]);
@@ -71,7 +73,9 @@ class ContentProxyTest extends TestCase
'html' => false,
'title' => '',
'url' => '',
- 'content_type' => '',
+ 'headers' => [
+ 'content-type' => '',
+ ],
'language' => '',
]);
@@ -104,15 +108,14 @@ class ContentProxyTest extends TestCase
->method('fetchContent')
->willReturn([
'html' => false,
- 'title' => '',
+ 'title' => 'my title',
'url' => '',
- 'content_type' => '',
+ 'headers' => [
+ 'content-type' => '',
+ ],
'language' => '',
'status' => '',
- 'open_graph' => [
- 'og_title' => 'my title',
- 'og_description' => 'desc',
- ],
+ 'description' => 'desc',
]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
@@ -147,13 +150,12 @@ class ContentProxyTest extends TestCase
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'status' => '200',
- 'open_graph' => [
- 'og_title' => 'my OG title',
- 'og_description' => 'OG desc',
- 'og_image' => 'http://3.3.3.3/cover.jpg',
+ 'description' => 'OG desc',
+ 'image' => 'http://3.3.3.3/cover.jpg',
+ 'headers' => [
+ 'content-type' => 'text/html',
],
]);
@@ -189,13 +191,12 @@ class ContentProxyTest extends TestCase
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'status' => '200',
- 'open_graph' => [
- 'og_title' => 'my OG title',
- 'og_description' => 'OG desc',
- 'og_image' => null,
+ 'description' => 'OG desc',
+ 'image' => null,
+ 'headers' => [
+ 'content-type' => 'text/html',
],
]);
@@ -231,14 +232,12 @@ class ContentProxyTest extends TestCase
'html' => "
Test
![](http://3.3.3.3/cover.jpg)
",
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
'language' => 'fr',
'status' => '200',
- 'open_graph' => [
- 'og_title' => 'my OG title',
- 'og_description' => 'OG desc',
- 'og_image' => null,
- ],
+ 'image' => null,
]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
@@ -273,14 +272,12 @@ class ContentProxyTest extends TestCase
'html' => "Test
![](http://3.3.3.3/nevermind.jpg)
",
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
'language' => 'fr',
'status' => '200',
- 'open_graph' => [
- 'og_title' => 'my OG title',
- 'og_description' => 'OG desc',
- 'og_image' => 'http://3.3.3.3/cover.jpg',
- ],
+ 'image' => 'http://3.3.3.3/cover.jpg',
]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
@@ -320,9 +317,11 @@ class ContentProxyTest extends TestCase
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'dontexist',
'status' => '200',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
]);
$proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage);
@@ -364,14 +363,13 @@ class ContentProxyTest extends TestCase
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
'language' => 'fr',
'status' => '200',
- 'open_graph' => [
- 'og_title' => 'my OG title',
- 'og_description' => 'OG desc',
- 'og_image' => 'https://',
- ],
+ 'description' => 'OG desc',
+ 'image' => 'https://',
]);
$proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage);
@@ -404,12 +402,12 @@ class ContentProxyTest extends TestCase
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'date' => '1395635872',
'authors' => ['Jeremy', 'Nico', 'Thomas'],
- 'all_headers' => [
- 'Cache-Control' => 'no-cache',
+ 'headers' => [
+ 'cache-control' => 'no-cache',
+ 'content-type' => 'text/html',
],
]
);
@@ -447,9 +445,11 @@ class ContentProxyTest extends TestCase
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'date' => '2016-09-08T11:55:58+0200',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
]
);
@@ -482,9 +482,11 @@ class ContentProxyTest extends TestCase
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'date' => '01 02 2012',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
]
);
@@ -499,7 +501,7 @@ class ContentProxyTest extends TestCase
$records = $handler->getRecords();
- $this->assertCount(1, $records);
+ $this->assertCount(3, $records);
$this->assertContains('Error while defining date', $records[0]['message']);
}
@@ -519,8 +521,10 @@ class ContentProxyTest extends TestCase
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
]
);
@@ -559,13 +563,13 @@ class ContentProxyTest extends TestCase
'html' => $html,
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
- 'content_type' => 'text/html',
'language' => 'fr',
'status' => '200',
- 'open_graph' => [
- 'og_title' => 'my OG title',
- 'og_description' => 'OG desc',
- 'og_image' => 'http://3.3.3.3/cover.jpg',
+ //'og_title' => 'my OG title',
+ 'description' => 'OG desc',
+ 'image' => 'http://3.3.3.3/cover.jpg',
+ 'headers' => [
+ 'content-type' => 'text/html',
],
]
);
@@ -597,9 +601,10 @@ class ContentProxyTest extends TestCase
'html' => '![](http://1.1.1.1/image.jpg)
',
'title' => 'this is my title',
'url' => 'http://1.1.1.1/image.jpg',
- 'content_type' => 'image/jpeg',
'status' => '200',
- 'open_graph' => [],
+ 'headers' => [
+ 'content-type' => 'image/jpeg',
+ ],
]);
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
@@ -637,7 +642,9 @@ class ContentProxyTest extends TestCase
'html' => false,
'title' => $actualTitle,
'url' => '',
- 'content_type' => 'text/html',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
'language' => '',
]);
@@ -672,7 +679,9 @@ class ContentProxyTest extends TestCase
'html' => false,
'title' => $actualTitle,
'url' => '',
- 'content_type' => 'text/html',
+ 'headers' => [
+ 'content-type' => 'text/html',
+ ],
'language' => '',
]);
@@ -706,7 +715,9 @@ class ContentProxyTest extends TestCase
'html' => false,
'title' => $actualTitle,
'url' => '',
- 'content_type' => 'application/pdf',
+ 'headers' => [
+ 'content-type' => 'application/pdf',
+ ],
'language' => '',
]);
@@ -740,7 +751,9 @@ class ContentProxyTest extends TestCase
'html' => false,
'title' => $actualTitle,
'url' => '',
- 'content_type' => 'application/pdf',
+ 'headers' => [
+ 'content-type' => 'application/pdf',
+ ],
'language' => '',
]);
@@ -774,7 +787,9 @@ class ContentProxyTest extends TestCase
'html' => false,
'title' => $actualTitle,
'url' => '',
- 'content_type' => 'application/pdf',
+ 'headers' => [
+ 'content-type' => 'application/pdf',
+ ],
'language' => '',
]);
@@ -809,7 +824,9 @@ class ContentProxyTest extends TestCase
'html' => false,
'title' => $actualTitle,
'url' => '',
- 'content_type' => 'application/pdf',
+ 'headers' => [
+ 'content-type' => 'application/pdf',
+ ],
'language' => '',
]);
@@ -939,7 +956,9 @@ class ContentProxyTest extends TestCase
'html' => false,
'title' => '',
'url' => $content_url,
- 'content_type' => '',
+ 'headers' => [
+ 'content-type' => '',
+ ],
'language' => '',
],
true
@@ -970,7 +989,9 @@ class ContentProxyTest extends TestCase
}
/**
- * https://stackoverflow.com/a/18506801.
+ * Convert hex to string.
+ *
+ * @see https://stackoverflow.com/a/18506801
*
* @param $hex
*