Merge pull request #1178 from alphagov/default-to-placeholder-image-f…

…or-newslike-content

Default to placeholder image for newslike content

app/presenters/content_item/news_image.rb

@@ -0,0 +1,18 @@
+module ContentItem
+  module NewsImage
+    def image
+      content_item.dig("details", "image") || default_news_image || placeholder_image
+    end
+
+  private
+
+    def default_news_image
+      organisation = content_item.dig("links", "primary_publishing_organisation")
+      organisation[0].dig("details", "default_news_image") if organisation.present?
+    end
+
+    def placeholder_image
+      "https://assets.publishing.service.gov.uk/government/assets/placeholder.jpg"
+    end
+  end
+end

app/presenters/news_article_presenter.rb

@@ -6,15 +6,5 @@ class NewsArticlePresenter < ContentItemPresenter
   include ContentItem::Shareable
   include ContentItem::TitleAndContext
   include ContentItem::Metadata
-
-  def image
-    content_item["details"].dig("image") || default_news_image
-  end
-
-private
-
-  def default_news_image
-    organisation = content_item["links"].dig("primary_publishing_organisation")
-    organisation[0].dig("details", "default_news_image") if organisation.present?
-  end
+  include ContentItem::NewsImage
 end

app/presenters/speech_presenter.rb

@@ -5,10 +5,7 @@ class SpeechPresenter < ContentItemPresenter
   include ContentItem::Updatable
   include ContentItem::TitleAndContext
   include ContentItem::Metadata
-
-  def image
-    content_item["details"]["image"]
-  end
+  include ContentItem::NewsImage
 
   def delivery_type
     if document_type == 'authored_article'

app/presenters/world_location_news_article_presenter.rb

@@ -6,8 +6,5 @@ class WorldLocationNewsArticlePresenter < ContentItemPresenter
   include ContentItem::Shareable
   include ContentItem::TitleAndContext
   include ContentItem::Metadata
-
-  def image
-    content_item["details"]["image"]
-  end
+  include ContentItem::NewsImage
 end

test/presenters/content_item/news_image_test.rb

@@ -0,0 +1,41 @@
+require "test_helper"
+
+class ContentItemNewsImageTest < ActiveSupport::TestCase
+  class DummyContentItem
+    include ContentItem::NewsImage
+    attr_accessor :content_item
+
+    def initialize
+      @content_item = {
+        "base_path" => "/a/base/path",
+        "details" => {},
+        "links" => {},
+      }
+    end
+  end
+
+  test "presents the document's image if present" do
+    item = DummyContentItem.new
+    image = { "url" => "http://www.test.dev.gov.uk/lead_image.jpg" }
+    item.content_item["details"]["image"] = image
+
+    assert_equal image, item.image
+  end
+
+  test "presents the document's organisation's default_news_image if document's image is not present" do
+    item = DummyContentItem.new
+    default_news_image = { "url" => "http://www.test.dev.gov.uk/default_news_image.jpg" }
+    item.content_item["links"]["primary_publishing_organisation"] = [
+      "details" => { "default_news_image" => default_news_image }
+    ]
+
+    assert_equal default_news_image, item.image
+  end
+
+  test "presents a placeholder image if document has no image or default news image" do
+    item = DummyContentItem.new
+    placeholder_image = "https://assets.publishing.service.gov.uk/government/assets/placeholder.jpg"
+
+    assert_equal placeholder_image, item.image
+  end
+end

test/presenters/news_article_presenter_test.rb

@@ -45,25 +45,6 @@ class PresentedNewsArticleTest < NewsArticlePresenterTestCase
     test 'presents the locale' do
       assert_equal schema_item['locale'], presented_item.locale
     end
-
-    test 'presents the document\'s image if present' do
-      assert_equal schema_item['details']['image'], presented_item.image
-    end
-
-    test 'presents the document\'s organisation\'s default_news_image if document\'s image is not present' do
-      default_news_image = { 'url' => 'http://www.test.dev.gov.uk/default_news_image.jpg' }
-      example = schema_item
-      example['details'].delete('image')
-      example['links'] = {
-        'primary_publishing_organisation' => [
-          'details' => {
-            'default_news_image' => default_news_image
-          }
-        ]
-      }
-      presented_item = present_example(example)
-      assert_equal default_news_image, presented_item.image
-    end
   end
 
   class HistoryModePresentedNewsArticle < NewsArticlePresenterTestCase