Merge pull request #73 from andreskrey/development

v2.0.1
andreskrey · Nov 27, 2018 · 23f2175 · 23f2175
2 parents e1b31f9 + b04fa77
commit 23f2175
Show file tree

Hide file tree

Showing 153 changed files with 922 additions and 422 deletions.
diff --git a/src/Readability.php b/src/Readability.php
@@ -287,10 +287,10 @@ private function getMetadata()
 
         $values = [];
         // property is a space-separated list of values
-        $propertyPattern = '/\s*(dc|dcterm|og|twitter)\s*:\s*(author|creator|description|title)\s*/i';
+        $propertyPattern = '/\s*(dc|dcterm|og|twitter)\s*:\s*(author|creator|description|title|image)\s*/i';
 
         // name is a single value
-        $namePattern = '/^\s*(?:(dc|dcterm|og|twitter|weibo:(article|webpage))\s*[\.:]\s*)?(author|creator|description|title)\s*$/i';
+        $namePattern = '/^\s*(?:(dc|dcterm|og|twitter|weibo:(article|webpage))\s*[\.:]\s*)?(author|creator|description|title|image)\s*$/i';
 
         // Find description tags.
         foreach ($this->dom->getElementsByTagName('meta') as $meta) {

diff --git a/test/ReadabilityTest.php b/test/ReadabilityTest.php
@@ -59,7 +59,7 @@ public function testHTMLParserParsesImages($html, $expectedResult, $expectedMeta
         $readability = new Readability($configuration);
         $readability->parse($html);
 
-        $this->assertSame($expectedImages, json_encode($readability->getImages()));
+        $this->assertSame(json_decode($expectedImages, true), $readability->getImages());
     }
 
     public function getSamplePages()

diff --git a/test/test-pages/001/expected-images.json b/test/test-pages/001/expected-images.json
@@ -1 +1,3 @@
-["http:\/\/fakehost\/static\/code\/2013\/blanket-coverage.png"]
+[
+    "http:\/\/fakehost\/static\/code\/2013\/blanket-coverage.png"
+]
diff --git a/test/test-pages/001/expected-metadata.json b/test/test-pages/001/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "Get your Frontend JavaScript Code Covered | Code",
-  "Author": "Nicolas Perriault —",
-  "Excerpt": "Nicolas Perriault's homepage."
-}
+    "Title": "Get your Frontend JavaScript Code Covered | Code",
+    "Author": "Nicolas Perriault —",
+    "Excerpt": "Nicolas Perriault's homepage.",
+    "Direction": null,
+    "Image": null
+}
diff --git a/test/test-pages/002/expected-metadata.json b/test/test-pages/002/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "This API is so Fetching!",
-  "Author": "Nikhil Marathe",
-  "Excerpt": "For more than a decade the Web has used XMLHttpRequest (XHR) to achieve asynchronous requests in JavaScript. While very useful, XHR is not a very ..."
-}
+    "Title": "This API is so Fetching!",
+    "Author": "Nikhil Marathe",
+    "Excerpt": "For more than a decade the Web has used XMLHttpRequest (XHR) to achieve asynchronous requests in JavaScript. While very useful, XHR is not a very ...",
+    "Direction": null,
+    "Image": null
+}
diff --git a/test/test-pages/003-metadata-preferred/expected-metadata.json b/test/test-pages/003-metadata-preferred/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "Dublin Core property title",
-  "Author": "Dublin Core property author",
-  "Excerpt": "Dublin Core property description"
-}
+    "Title": "Dublin Core property title",
+    "Author": "Dublin Core property author",
+    "Excerpt": "Dublin Core property description",
+    "Direction": null,
+    "Image": null
+}
diff --git a/test/test-pages/004-metadata-space-separated-properties/expected-metadata.json b/test/test-pages/004-metadata-space-separated-properties/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "Preferred title",
-  "Author": "Creator Name",
-  "Excerpt": "Preferred description"
-}
+    "Title": "Preferred title",
+    "Author": "Creator Name",
+    "Excerpt": "Preferred description",
+    "Direction": null,
+    "Image": null
+}
diff --git a/test/test-pages/aclu/expected-images.json b/test/test-pages/aclu/expected-images.json
@@ -1 +1,3 @@
-[]
+[
+    "https:\/\/www.aclu.org\/sites\/default\/files\/styles\/metatag_og_image_1200x630\/public\/field_share_image\/web18-facebook-socialshare-1200x628-v02.png?itok=p77cQjOm"
+]
diff --git a/test/test-pages/aclu/expected-metadata.json b/test/test-pages/aclu/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "Facebook Is Tracking Me Even Though I’m Not on Facebook",
-  "Author": "By Daniel Kahn Gillmor, Senior Staff Technologist, ACLU Speech, Privacy, and Technology Project",
-  "Excerpt": "I don't use Facebook. I'm not technophobic — I'm a geek. I've been using email since the early 1990s, I have accounts on hundreds of services around the net, and I do software development and internet protocol design both for work and for fun. I believe that a globe-spanning communications network like the internet can be a positive social force, and I publish much of my own work on the open web."
-}
+    "Title": "Facebook Is Tracking Me Even Though I’m Not on Facebook",
+    "Author": "By Daniel Kahn Gillmor, Senior Staff Technologist, ACLU Speech, Privacy, and Technology Project",
+    "Excerpt": "I don't use Facebook. I'm not technophobic — I'm a geek. I've been using email since the early 1990s, I have accounts on hundreds of services around the net, and I do software development and internet protocol design both for work and for fun. I believe that a globe-spanning communications network like the internet can be a positive social force, and I publish much of my own work on the open web.",
+    "Image": "https:\/\/www.aclu.org\/sites\/default\/files\/styles\/metatag_og_image_1200x630\/public\/field_share_image\/web18-facebook-socialshare-1200x628-v02.png?itok=p77cQjOm",
+    "Direction": "ltr"
+}
diff --git a/test/test-pages/ars-1/expected-images.json b/test/test-pages/ars-1/expected-images.json
@@ -1 +1,3 @@
-["http:\/\/cdn.arstechnica.net\/wp-content\/uploads\/2015\/04\/server-crash-640x426.jpg"]
+[
+    "http:\/\/cdn.arstechnica.net\/wp-content\/uploads\/2015\/04\/server-crash-640x426.jpg"
+]
diff --git a/test/test-pages/ars-1/expected-metadata.json b/test/test-pages/ars-1/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "Just-released Minecraft exploit makes it easy to crash game servers",
-  "Author": "by Dan Goodin - Apr 16, 2015 8:02 pm UTC",
-  "Excerpt": "Two-year-old bug exposes thousands of servers to crippling attack."
-}
+    "Title": "Just-released Minecraft exploit makes it easy to crash game servers",
+    "Author": "by Dan Goodin - Apr 16, 2015 8:02 pm UTC",
+    "Excerpt": "Two-year-old bug exposes thousands of servers to crippling attack.",
+    "Image": "http:\/\/cdn.arstechnica.net\/wp-content\/uploads\/2015\/04\/server-crash-640x426.jpg",
+    "Direction": null
+}
diff --git a/test/test-pages/base-url-base-element-relative/expected-images.json b/test/test-pages/base-url-base-element-relative/expected-images.json
@@ -1 +1,6 @@
-{"0":"http:\/\/fakehost\/test\/base\/foo\/bar\/baz.png","2":"http:\/\/fakehost\/foo\/bar\/baz.png","3":"http:\/\/test\/foo\/bar\/baz.png","4":"https:\/\/test\/foo\/bar\/baz.png"}
+{
+    "0": "http:\/\/fakehost\/test\/base\/foo\/bar\/baz.png",
+    "2": "http:\/\/fakehost\/foo\/bar\/baz.png",
+    "3": "http:\/\/test\/foo\/bar\/baz.png",
+    "4": "https:\/\/test\/foo\/bar\/baz.png"
+}
diff --git a/test/test-pages/base-url-base-element-relative/expected-metadata.json b/test/test-pages/base-url-base-element-relative/expected-metadata.json
@@ -1,4 +1,7 @@
 {
-  "Title": "Base URL with base relative test",
-  "Excerpt": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\n      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\n      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\n      cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\n      proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-}
+    "Title": "Base URL with base relative test",
+    "Excerpt": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\n      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\n      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\n      cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\n      proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "Author": null,
+    "Direction": null,
+    "Image": null
+}
diff --git a/test/test-pages/base-url-base-element/expected-images.json b/test/test-pages/base-url-base-element/expected-images.json
@@ -1 +1,5 @@
-{"0":"http:\/\/fakehost\/foo\/bar\/baz.png","3":"http:\/\/test\/foo\/bar\/baz.png","4":"https:\/\/test\/foo\/bar\/baz.png"}
+{
+    "0": "http:\/\/fakehost\/foo\/bar\/baz.png",
+    "3": "http:\/\/test\/foo\/bar\/baz.png",
+    "4": "https:\/\/test\/foo\/bar\/baz.png"
+}
diff --git a/test/test-pages/base-url-base-element/expected-metadata.json b/test/test-pages/base-url-base-element/expected-metadata.json
@@ -1,4 +1,7 @@
 {
-  "Title": "Base URL with base test",
-  "Excerpt": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\n      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\n      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\n      cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\n      proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-}
+    "Title": "Base URL with base test",
+    "Excerpt": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\n      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\n      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\n      cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\n      proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "Author": null,
+    "Direction": null,
+    "Image": null
+}
diff --git a/test/test-pages/base-url/expected-images.json b/test/test-pages/base-url/expected-images.json
@@ -1 +1,6 @@
-{"0":"http:\/\/fakehost\/test\/foo\/bar\/baz.png","2":"http:\/\/fakehost\/foo\/bar\/baz.png","3":"http:\/\/test\/foo\/bar\/baz.png","4":"https:\/\/test\/foo\/bar\/baz.png"}
+{
+    "0": "http:\/\/fakehost\/test\/foo\/bar\/baz.png",
+    "2": "http:\/\/fakehost\/foo\/bar\/baz.png",
+    "3": "http:\/\/test\/foo\/bar\/baz.png",
+    "4": "https:\/\/test\/foo\/bar\/baz.png"
+}
diff --git a/test/test-pages/base-url/expected-metadata.json b/test/test-pages/base-url/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "Base URL test",
-  "Author": null,
-  "Excerpt": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\n      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\n      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\n      cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\n      proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-}
+    "Title": "Base URL test",
+    "Author": null,
+    "Excerpt": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\n      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\n      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\n      cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\n      proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    "Direction": null,
+    "Image": null
+}
diff --git a/test/test-pages/basic-tags-cleaning/expected-metadata.json b/test/test-pages/basic-tags-cleaning/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "Basic tag cleaning test",
-  "Author": null,
-  "Excerpt": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n        tempor incididunt ut labore et dolore magna aliqua."
-}
+    "Title": "Basic tag cleaning test",
+    "Author": null,
+    "Excerpt": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n        tempor incididunt ut labore et dolore magna aliqua.",
+    "Direction": null,
+    "Image": null
+}
diff --git a/test/test-pages/bbc-1/expected-images.json b/test/test-pages/bbc-1/expected-images.json
@@ -1 +1,7 @@
-{"0":"http:\/\/ichef.bbci.co.uk\/news\/555\/cpsprodpb\/462D\/production\/_84456971_gettyimages-167501087.jpg","1":"http:\/\/ichef.bbci.co.uk\/news\/555\/media\/images\/76020000\/jpg\/_76020974_line976.jpg","2":"http:\/\/ichef-1.bbci.co.uk\/news\/555\/cpsprodpb\/6D3D\/production\/_84456972_p072315al-0500.jpg","4":"http:\/\/ichef-1.bbci.co.uk\/news\/555\/cpsprodpb\/142FD\/production\/_84458628_shirtreuters.jpg"}
+{
+    "0": "http:\/\/ichef.bbci.co.uk\/news\/1024\/cpsprodpb\/3D8B\/production\/_84455751_84455749.jpg",
+    "1": "http:\/\/ichef.bbci.co.uk\/news\/555\/cpsprodpb\/462D\/production\/_84456971_gettyimages-167501087.jpg",
+    "2": "http:\/\/ichef.bbci.co.uk\/news\/555\/media\/images\/76020000\/jpg\/_76020974_line976.jpg",
+    "3": "http:\/\/ichef-1.bbci.co.uk\/news\/555\/cpsprodpb\/6D3D\/production\/_84456972_p072315al-0500.jpg",
+    "5": "http:\/\/ichef-1.bbci.co.uk\/news\/555\/cpsprodpb\/142FD\/production\/_84458628_shirtreuters.jpg"
+}
diff --git a/test/test-pages/bbc-1/expected-metadata.json b/test/test-pages/bbc-1/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "Obama admits US gun laws are his 'biggest frustration' - BBC News",
-  "Author": null,
-  "Excerpt": "President Barack Obama tells the BBC his failure to pass \"common sense gun safety laws\" is the greatest frustration of his presidency."
-}
+    "Title": "Obama admits US gun laws are his 'biggest frustration' - BBC News",
+    "Author": null,
+    "Excerpt": "President Barack Obama tells the BBC his failure to pass \"common sense gun safety laws\" is the greatest frustration of his presidency.",
+    "Image": "http:\/\/ichef.bbci.co.uk\/news\/1024\/cpsprodpb\/3D8B\/production\/_84455751_84455749.jpg",
+    "Direction": null
+}
diff --git a/test/test-pages/blogger/expected-images.json b/test/test-pages/blogger/expected-images.json
@@ -1 +1,6 @@
-{"0":"https:\/\/1.bp.blogspot.com\/-YIPC5jkXkDE\/Vy7YPSqFKWI\/AAAAAAAAAxI\/a7D6Ji2GxoUvcrwUkI4RLZcr2LFQEJCTACLcB\/s640\/block-diagram.png","2":"https:\/\/1.bp.blogspot.com\/-k3naUT3uXao\/Vy7WFac246I\/AAAAAAAAAw8\/mePy_ostO8QJra5ZJrbP2WGhTlJ0B_r8gCLcB\/s640\/schematic-from-hell.png","3":"https:\/\/2.bp.blogspot.com\/-kIekczO693g\/Vy7dBqYifXI\/AAAAAAAAAxc\/hMNJBs5bedIQOrBzzkhq4gbmhR-n58EQwCLcB\/s400\/graph-labels.png"}
+[
+    "https:\/\/1.bp.blogspot.com\/-YIPC5jkXkDE\/Vy7YPSqFKWI\/AAAAAAAAAxI\/a7D6Ji2GxoUvcrwUkI4RLZcr2LFQEJCTACLcB\/w1200-h630-p-nu\/block-diagram.png",
+    "https:\/\/1.bp.blogspot.com\/-YIPC5jkXkDE\/Vy7YPSqFKWI\/AAAAAAAAAxI\/a7D6Ji2GxoUvcrwUkI4RLZcr2LFQEJCTACLcB\/s640\/block-diagram.png",
+    "https:\/\/1.bp.blogspot.com\/-k3naUT3uXao\/Vy7WFac246I\/AAAAAAAAAw8\/mePy_ostO8QJra5ZJrbP2WGhTlJ0B_r8gCLcB\/s640\/schematic-from-hell.png",
+    "https:\/\/2.bp.blogspot.com\/-kIekczO693g\/Vy7dBqYifXI\/AAAAAAAAAxc\/hMNJBs5bedIQOrBzzkhq4gbmhR-n58EQwCLcB\/s400\/graph-labels.png"
+]
diff --git a/test/test-pages/blogger/expected-metadata.json b/test/test-pages/blogger/expected-metadata.json
@@ -1,5 +1,7 @@
 {
-  "Title": "Open Verilog flow for Silego GreenPak4 programmable logic devices",
-  "Author": null,
-  "Excerpt": "I've written a couple of posts in the past few months but they were all for the blog at work  so I figured I'm long overdue for one on Silic..."
-}
+    "Title": "Open Verilog flow for Silego GreenPak4 programmable logic devices",
+    "Author": null,
+    "Excerpt": "I've written a couple of posts in the past few months but they were all for the blog at work  so I figured I'm long overdue for one on Silic...",
+    "Image": "https:\/\/1.bp.blogspot.com\/-YIPC5jkXkDE\/Vy7YPSqFKWI\/AAAAAAAAAxI\/a7D6Ji2GxoUvcrwUkI4RLZcr2LFQEJCTACLcB\/w1200-h630-p-nu\/block-diagram.png",
+    "Direction": null
+}
diff --git a/test/test-pages/breitbart/expected-images.json b/test/test-pages/breitbart/expected-images.json
@@ -1 +1,4 @@
-["http:\/\/media.breitbart.com\/media\/2016\/11\/GettyImages-621866810-640x480.jpg"]
+[
+    "http:\/\/fakehost\/test\/480",
+    "http:\/\/media.breitbart.com\/media\/2016\/11\/GettyImages-621866810-640x480.jpg"
+]
diff --git a/test/test-pages/breitbart/expected-metadata.json b/test/test-pages/breitbart/expected-metadata.json
@@ -1,6 +1,7 @@
 {
-  "Title": "'Neutral' Snopes Fact-Checker David Emery: 'Are There Any Un-Angry Trump Supporters?' - Breitbart",
-  "Author": "by Lucas Nolan22 Dec 2016651",
-  "Direction": null,
-  "Excerpt": "Snopes fact checker and staff writer David Emery posted to Twitter asking if there were “any un-angry Trump supporters?”"
-}
+    "Title": "'Neutral' Snopes Fact-Checker David Emery: 'Are There Any Un-Angry Trump Supporters?' - Breitbart",
+    "Author": "by Lucas Nolan22 Dec 2016651",
+    "Direction": null,
+    "Excerpt": "Snopes fact checker and staff writer David Emery posted to Twitter asking if there were “any un-angry Trump supporters?”",
+    "Image": "http:\/\/fakehost\/test\/480"
+}
diff --git a/test/test-pages/bug-1255978/expected-images.json b/test/test-pages/bug-1255978/expected-images.json
@@ -1 +1,9 @@
-["https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2014\/03\/18\/10\/bandb2.jpg","https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2015\/05\/26\/11\/hotel-door-getty.jpg","https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2013\/07\/31\/15\/luggage-3.jpg","https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2015\/04\/13\/11\/Lifestyle-hotels.jpg","https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2014\/03\/13\/16\/agenda7.jpg","http:\/\/fakehost\/sites\/all\/themes\/ines_themes\/independent_theme\/img\/reuse.png"]
+[
+    "https:\/\/static.independent.co.uk\/s3fs-public\/thumbnails\/image\/2015\/12\/06\/10\/bed-hotel-room.jpg",
+    "https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2014\/03\/18\/10\/bandb2.jpg",
+    "https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2015\/05\/26\/11\/hotel-door-getty.jpg",
+    "https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2013\/07\/31\/15\/luggage-3.jpg",
+    "https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2015\/04\/13\/11\/Lifestyle-hotels.jpg",
+    "https:\/\/static.independent.co.uk\/s3fs-public\/styles\/story_medium\/public\/thumbnails\/image\/2014\/03\/13\/16\/agenda7.jpg",
+    "http:\/\/fakehost\/sites\/all\/themes\/ines_themes\/independent_theme\/img\/reuse.png"
+]
diff --git a/test/test-pages/bug-1255978/expected-metadata.json b/test/test-pages/bug-1255978/expected-metadata.json
@@ -1,6 +1,7 @@
 {
-  "Title": "Seven secrets that hotel owners don't want you to know",
-  "Author": "Hazel Sheffield",
-  "Direction": null,
-  "Excerpt": "Most people go to hotels for the pleasure of sleeping in a giant bed with clean white sheets and waking up to fresh towels in the morning. But those towels and sheets might not be as clean as they look, according to the hotel bosses that responded to an online thread about the things hotel owners don’t want you to know."
-}
+    "Title": "Seven secrets that hotel owners don't want you to know",
+    "Author": "Hazel Sheffield",
+    "Direction": null,
+    "Excerpt": "Most people go to hotels for the pleasure of sleeping in a giant bed with clean white sheets and waking up to fresh towels in the morning. But those towels and sheets might not be as clean as they look, according to the hotel bosses that responded to an online thread about the things hotel owners don’t want you to know.",
+    "Image": "https:\/\/static.independent.co.uk\/s3fs-public\/thumbnails\/image\/2015\/12\/06\/10\/bed-hotel-room.jpg"
+}
diff --git a/test/test-pages/buzzfeed-1/expected-images.json b/test/test-pages/buzzfeed-1/expected-images.json
@@ -1 +1,5 @@
-["http:\/\/s3-static-ak.buzzfed.com\/static\/2015-04\/22\/5\/campaign_images\/webdr03\/student-dies-after-diet-pills-she-bought-online-b-2-28712-1429696299-24_big.jpg","http:\/\/ak-hdl.buzzfed.com\/static\/2015-04\/21\/5\/enhanced\/webdr12\/grid-cell-2501-1429608056-15.jpg","http:\/\/ak-hdl.buzzfed.com\/static\/2015-04\/21\/5\/enhanced\/webdr12\/grid-cell-2501-1429608057-18.jpg"]
+[
+    "http:\/\/fakehost\/test\/412",
+    "http:\/\/ak-hdl.buzzfed.com\/static\/2015-04\/21\/5\/enhanced\/webdr12\/grid-cell-2501-1429608056-15.jpg",
+    "http:\/\/ak-hdl.buzzfed.com\/static\/2015-04\/21\/5\/enhanced\/webdr12\/grid-cell-2501-1429608057-18.jpg"
+]
diff --git a/test/test-pages/buzzfeed-1/expected-metadata.json b/test/test-pages/buzzfeed-1/expected-metadata.json
@@ -1,4 +1,7 @@
 {
-  "Title": "Student Dies After Diet Pills She Bought Online \"Burned Her Up From Within\"",
-  "Excerpt": "An inquest into Eloise Parry's death has been adjourned until July."
-}
+    "Title": "Student Dies After Diet Pills She Bought Online \"Burned Her Up From Within\"",
+    "Excerpt": "An inquest into Eloise Parry's death has been adjourned until July.",
+    "Image": "http:\/\/fakehost\/test\/412",
+    "Author": null,
+    "Direction": null
+}
diff --git a/test/test-pages/challenges/expected-images.json b/test/test-pages/challenges/expected-images.json
@@ -1 +1,3 @@
-[]
+[
+    "http:\/\/fakehost\/img\/cha\/placeholders\/placeholder_1000x750.jpg"
+]
diff --git a/test/test-pages/challenges/expected-metadata.json b/test/test-pages/challenges/expected-metadata.json
@@ -1,3 +1,7 @@
 {
-  "Title": "Les motivations du tueur de Las Vegas demeurent floues"
-}
+    "Title": "Les motivations du tueur de Las Vegas demeurent floues",
+    "Image": "http:\/\/fakehost\/img\/cha\/placeholders\/placeholder_1000x750.jpg",
+    "Author": null,
+    "Direction": null,
+    "Excerpt": "par Alexandria Sage et Lisa Girion"
+}
diff --git a/test/test-pages/clean-links/expected-images.json b/test/test-pages/clean-links/expected-images.json
@@ -1 +1,3 @@
-["http:\/\/fakehost\/test\/hmhome.gif "]
+[
+    "http:\/\/fakehost\/test\/hmhome.gif "
+]