From a72e3a8dfa622b4fbcaa9bed1263fe06b658471d Mon Sep 17 00:00:00 2001
From: Chris Yoong <chris.yoong@digital.cabinet-office.gov.uk>
Date: Fri, 19 Feb 2021 17:46:33 +0000
Subject: [PATCH 1/2] Change to metadata component

Update element from local app to gem
---
 .../helpers/_publisher-metadata-with-logo.scss            | 1 +
 app/presenters/content_item/metadata.rb                   | 8 +++-----
 app/views/shared/_publisher_metadata_with_logo.html.erb   | 2 +-
 test/test_helper.rb                                       | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss b/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss
index 65d591332..0ef38454d 100644
--- a/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss
+++ b/app/assets/stylesheets/helpers/_publisher-metadata-with-logo.scss
@@ -9,6 +9,7 @@
 
   .metadata-column {
     padding-left: 0;
+    padding-top: govuk-spacing(3);
   }
 
   .metadata-logo {
diff --git a/app/presenters/content_item/metadata.rb b/app/presenters/content_item/metadata.rb
index 5f98f8301..635d1885f 100644
--- a/app/presenters/content_item/metadata.rb
+++ b/app/presenters/content_item/metadata.rb
@@ -21,12 +21,10 @@ def important_metadata
 
     def publisher_metadata
       {
-        published: published,
+        from: from,
+        first_published: published,
         last_updated: updated,
-        link_to_history: updated.present?,
-        other: {
-          from: from,
-        },
+        see_updates_link: true,
       }
     end
   end
diff --git a/app/views/shared/_publisher_metadata_with_logo.html.erb b/app/views/shared/_publisher_metadata_with_logo.html.erb
index a7c4583fb..4048a0c90 100644
--- a/app/views/shared/_publisher_metadata_with_logo.html.erb
+++ b/app/views/shared/_publisher_metadata_with_logo.html.erb
@@ -1,7 +1,7 @@
 <div class="govuk-grid-row">
   <div class="metadata-logo-wrapper<%= ' responsive-bottom-margin' if @content_item.try(:logo) %>">
     <div class="govuk-grid-column-two-thirds metadata-column">
-      <%= render "components/publisher-metadata", @content_item.publisher_metadata %>
+      <%= render 'govuk_publishing_components/components/metadata', @content_item.publisher_metadata %>
     </div>
     <div class="govuk-grid-column-one-third">
       <% if @content_item.try(:logo) %>
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 2c07ae889..34c86c8c7 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -93,9 +93,9 @@ def assert_has_published_dates(published = nil, last_updated = nil, history_link
   end
 
   def assert_has_publisher_metadata_other(metadata)
-    within(".app-c-publisher-metadata__other") do
+    within(".gem-c-metadata") do
       assert_has_metadata(
-        metadata, ".app-c-publisher-metadata__term", ".app-c-publisher-metadata__definition"
+        metadata, ".gem-c-metadata__term", ".gem-c-metadata__definition"
       )
     end
   end
@@ -120,7 +120,7 @@ def assert_has_metadata(metadata, term_selector, definition_selector)
   end
 
   def assert_has_publisher_metadata(options)
-    within(".app-c-publisher-metadata") do
+    within(".gem-c-metadata") do
       assert_has_published_dates(options[:published], options[:last_updated], options[:history_link])
       assert_has_publisher_metadata_other(options[:metadata])
     end

From 3dd0db4de74a2e9f43fbab942e444b8933f1c1e5 Mon Sep 17 00:00:00 2001
From: Chris Yoong <chris.yoong@digital.cabinet-office.gov.uk>
Date: Wed, 24 Feb 2021 13:13:57 +0000
Subject: [PATCH 2/2] Updating testing

Update testing, remove app-level metadata test
---
 .../content_items_controller_test.rb          |  2 +-
 test/integration/consultation_test.rb         | 10 ++---
 test/integration/detailed_guide_test.rb       | 13 +++---
 test/integration/document_collection_test.rb  | 12 ++----
 test/integration/fatality_notice_test.rb      | 15 ++++---
 test/integration/news_article_test.rb         | 12 +++---
 test/integration/publication_test.rb          | 12 +++---
 test/integration/specialist_document_test.rb  |  6 +--
 test/integration/speech_test.rb               | 14 +++----
 test/integration/statistical_data_set_test.rb |  8 ++--
 test/test_helper.rb                           | 41 +++++++++++--------
 11 files changed, 68 insertions(+), 77 deletions(-)

diff --git a/test/controllers/content_items_controller_test.rb b/test/controllers/content_items_controller_test.rb
index e0b2ed42c..150316118 100644
--- a/test/controllers/content_items_controller_test.rb
+++ b/test/controllers/content_items_controller_test.rb
@@ -381,7 +381,7 @@ class ContentItemsControllerTest < ActionController::TestCase
     assert_select ".metadata-logo-wrapper", false
     assert_select ".app-c-figure", false
     assert_select ".gem-c-contextual-sidebar", false
-    assert_select ".app-c-published-dates", false
+    assert_select ".gem-c-metadata__definition", false
     assert_select ".gem-c-contextual-footer", false
   end
 
diff --git a/test/integration/consultation_test.rb b/test/integration/consultation_test.rb
index dba73a893..9fb6883e8 100644
--- a/test/integration/consultation_test.rb
+++ b/test/integration/consultation_test.rb
@@ -7,12 +7,10 @@ class ConsultationTest < ActionDispatch::IntegrationTest
     assert_has_component_title(@content_item["title"])
     assert page.has_text?(@content_item["description"])
 
-    assert_has_publisher_metadata(
-      published: "Published 4 November 2016",
-      last_updated: "Last updated 7 November 2016",
-      metadata: {
-        "From": { "Department for Education": "/government/organisations/department-for-education" },
-      },
+    assert_has_metadata(
+      published: "4 November 2016",
+      last_updated: "7 November 2016",
+      from: { "Department for Education": "/government/organisations/department-for-education" },
     )
 
     assert_footer_has_published_dates("Published 4 November 2016", "Last updated 7 November 2016")
diff --git a/test/integration/detailed_guide_test.rb b/test/integration/detailed_guide_test.rb
index f154ce320..370d3365f 100644
--- a/test/integration/detailed_guide_test.rb
+++ b/test/integration/detailed_guide_test.rb
@@ -11,14 +11,11 @@ class DetailedGuideTest < ActionDispatch::IntegrationTest
     assert_has_component_title(@content_item["title"])
     assert page.has_text?(@content_item["description"])
 
-    assert_has_publisher_metadata(
-      published: "Published 12 June 2014",
-      last_updated: "Last updated 18 February 2016",
-      history_link: true,
-      metadata: {
-        "From:": {
-          "HM Revenue & Customs": "/government/organisations/hm-revenue-customs",
-        },
+    assert_has_metadata(
+      published: "12 June 2014",
+      last_updated: "18 February 2016",
+      from: {
+        "HM Revenue & Customs": "/government/organisations/hm-revenue-customs",
       },
     )
   end
diff --git a/test/integration/document_collection_test.rb b/test/integration/document_collection_test.rb
index dc35d121e..1866755cd 100644
--- a/test/integration/document_collection_test.rb
+++ b/test/integration/document_collection_test.rb
@@ -19,14 +19,10 @@ class DocumentCollectionTest < ActionDispatch::IntegrationTest
 
   test "renders metadata and document footer" do
     setup_and_visit_content_item("document_collection")
-    assert_has_publisher_metadata(
-      published: "Published 29 February 2016",
-      metadata:
-      {
-        "From:":
-          {
-            "Driver and Vehicle Standards Agency": "/government/organisations/driver-and-vehicle-standards-agency",
-          },
+    assert_has_metadata(
+      published: "29 February 2016",
+      from: {
+        "Driver and Vehicle Standards Agency": "/government/organisations/driver-and-vehicle-standards-agency",
       },
     )
     assert_footer_has_published_dates("Published 29 February 2016")
diff --git a/test/integration/fatality_notice_test.rb b/test/integration/fatality_notice_test.rb
index be7369fc7..cb02068d2 100644
--- a/test/integration/fatality_notice_test.rb
+++ b/test/integration/fatality_notice_test.rb
@@ -20,12 +20,11 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest
 
     assert_not page.has_css?(".gem-c-notice")
 
-    assert_has_publisher_metadata(
-      published: "Published 27 February 1881",
-      last_updated: "Last updated 14 September 2016",
-      history_link: true,
-      metadata: {
-        "From": { "Ministry of Defence": "/government/organisations/ministry-of-defence" },
+    assert_has_metadata(
+      published: "27 February 1881",
+      last_updated: "14 September 2016",
+      from: {
+        "Ministry of Defence": "/government/organisations/ministry-of-defence",
       },
     )
 
@@ -60,8 +59,8 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest
 
   test "fatality notice with minister" do
     setup_and_visit_content_item("fatality_notice_with_minister")
-    assert_has_publisher_metadata_other(
-      "From": {
+    assert_has_metadata(
+      from: {
         "Ministry of Defence": "/government/organisations/ministry-of-defence",
         "The Rt Hon Sir Eric Pickles MP": "/government/people/eric-pickles",
       },
diff --git a/test/integration/news_article_test.rb b/test/integration/news_article_test.rb
index afbb47b40..73e124180 100644
--- a/test/integration/news_article_test.rb
+++ b/test/integration/news_article_test.rb
@@ -12,13 +12,11 @@ class NewsArticleTest < ActionDispatch::IntegrationTest
   test "renders first published and from in metadata and document footer" do
     setup_and_visit_content_item("news_article")
 
-    assert_has_publisher_metadata(
-      published: "Published 25 December 2016",
-      metadata: {
-        "From": {
-          "Prime Minister's Office, 10 Downing Street":
-            "/government/organisations/prime-ministers-office-10-downing-street",
-        },
+    assert_has_metadata(
+      published: "25 December 2016",
+      from: {
+        "Prime Minister's Office, 10 Downing Street":
+        "/government/organisations/prime-ministers-office-10-downing-street",
       },
     )
 
diff --git a/test/integration/publication_test.rb b/test/integration/publication_test.rb
index 5a17dd8c3..6e4f02af5 100644
--- a/test/integration/publication_test.rb
+++ b/test/integration/publication_test.rb
@@ -19,13 +19,11 @@ class PublicationTest < ActionDispatch::IntegrationTest
   test "renders metadata and document footer" do
     setup_and_visit_content_item("publication")
 
-    assert_has_publisher_metadata(
-      published: "Published 3 May 2016",
-      metadata: {
-        "From": {
-          "Environment Agency": "/government/organisations/environment-agency",
-          "The Rt Hon Sir Eric Pickles MP": "/government/people/eric-pickles",
-        },
+    assert_has_metadata(
+      published: "3 May 2016",
+      from: {
+        "Environment Agency": "/government/organisations/environment-agency",
+        "The Rt Hon Sir Eric Pickles MP": "/government/people/eric-pickles",
       },
     )
 
diff --git a/test/integration/specialist_document_test.rb b/test/integration/specialist_document_test.rb
index d4b1e809b..f40cd8fe5 100644
--- a/test/integration/specialist_document_test.rb
+++ b/test/integration/specialist_document_test.rb
@@ -47,10 +47,10 @@ class SpecialistDocumentTest < ActionDispatch::IntegrationTest
   test "renders from in publisher metadata" do
     setup_and_visit_content_item("aaib-reports")
 
-    assert_has_publisher_metadata_other(
-      "From": {
+    assert_has_metadata(
+      from: {
         "Air Accidents Investigation Branch":
-          "/government/organisations/air-accidents-investigation-branch",
+        "/government/organisations/air-accidents-investigation-branch",
       },
     )
   end
diff --git a/test/integration/speech_test.rb b/test/integration/speech_test.rb
index 7afea7195..2ba2ef41d 100644
--- a/test/integration/speech_test.rb
+++ b/test/integration/speech_test.rb
@@ -20,14 +20,12 @@ class SpeechTest < ActionDispatch::IntegrationTest
   test "renders metadata and document footer, including speaker" do
     setup_and_visit_content_item("speech")
 
-    assert_has_publisher_metadata(
-      published: "Published 8 March 2016",
-      metadata: {
-        "From": {
-          "Department of Energy & Climate Change and The Rt Hon Andrea Leadsom MP": nil,
-          "Department of Energy": "/government/organisations/department-of-energy-climate-change",
-          "The Rt Hon Andrea Leadsom MP": "/government/people/andrea-leadsom",
-        },
+    assert_has_metadata(
+      published: "8 March 2016",
+      from: {
+        "Department of Energy & Climate Change and The Rt Hon Andrea Leadsom MP": nil,
+        "Department of Energy": "/government/organisations/department-of-energy-climate-change",
+        "The Rt Hon Andrea Leadsom MP": "/government/people/andrea-leadsom",
       },
     )
 
diff --git a/test/integration/statistical_data_set_test.rb b/test/integration/statistical_data_set_test.rb
index 029fad0e7..76de5e76e 100644
--- a/test/integration/statistical_data_set_test.rb
+++ b/test/integration/statistical_data_set_test.rb
@@ -11,11 +11,9 @@ class StatisticalDataSetTest < ActionDispatch::IntegrationTest
 
   test "renders metadata and document footer" do
     setup_and_visit_content_item("statistical_data_set")
-    assert_has_publisher_metadata(
-      published: "Published 13 December 2012",
-      metadata: {
-        "From:": { "Department for Transport": "/government/organisations/department-for-transport" },
-      },
+    assert_has_metadata(
+      published: "13 December 2012",
+      from: { "Department for Transport": "/government/organisations/department-for-transport" },
     )
     assert_footer_has_published_dates("Published 13 December 2012")
   end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 34c86c8c7..4753e3b94 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -80,11 +80,11 @@ def assert_has_contents_list(contents)
     end
   end
 
-  def assert_has_published_dates(published = nil, last_updated = nil, history_link = false, element_index = 0)
+  def assert_has_published_dates(first_published = nil, last_updated = nil, history_link = false)
     text = []
-    text << published if published
+    text << first_published if first_published
     text << last_updated if last_updated
-    within(all(".app-c-published-dates")[element_index]) do
+    within ".app-c-published-dates:last-of-type" do
       assert page.has_text?(text.join("\n")), "Published dates #{text.join("\n")} not found"
       if history_link
         assert page.has_link?("see all updates", href: "#history"), "Updates link not found"
@@ -92,21 +92,30 @@ def assert_has_published_dates(published = nil, last_updated = nil, history_link
     end
   end
 
-  def assert_has_publisher_metadata_other(metadata)
-    within(".gem-c-metadata") do
-      assert_has_metadata(
-        metadata, ".gem-c-metadata__term", ".gem-c-metadata__definition"
-      )
+  def assert_has_publisher_metadata_other(any_args)
+    assert_has_metadata(any_args)
+  end
+
+  def assert_has_metadata(any_args)
+    within ".gem-c-metadata" do
+      any_args.each do |_key, value|
+        value = { value => nil } if value.is_a?(String)
+        value.each do |text, href|
+          if href
+            assert page.has_link?(text, href: href), "Metadata text '#{text} with link of #{href}' not found"
+          else
+            assert page.has_text?(text), "Metadata value '#{text}' not found"
+          end
+        end
+      end
     end
   end
 
-  def assert_has_metadata(metadata, term_selector, definition_selector)
+  def assert_has_metadata_local(metadata, term_selector, definition_selector)
     metadata.each do |key, value|
       assert page.has_css?(term_selector, text: key),
              "Metadata term '#{key}' not found"
-
       value = { value => nil } if value.is_a?(String)
-
       value.each do |text, href|
         within(definition_selector, text: text) do
           if href
@@ -120,22 +129,22 @@ def assert_has_metadata(metadata, term_selector, definition_selector)
   end
 
   def assert_has_publisher_metadata(options)
-    within(".gem-c-metadata") do
-      assert_has_published_dates(options[:published], options[:last_updated], options[:history_link])
+    within(".app-c-publisher-metadata") do
+      assert_has_published_dates(options[:first_published], options[:last_updated], options[:history_link])
       assert_has_publisher_metadata_other(options[:metadata])
     end
   end
 
   def assert_has_important_metadata(metadata)
     within(".app-c-important-metadata") do
-      assert_has_metadata(
+      assert_has_metadata_local(
         metadata, ".app-c-important-metadata__term", ".app-c-important-metadata__definition"
       )
     end
   end
 
-  def assert_footer_has_published_dates(published = nil, last_updated = nil, history_link = false)
-    assert_has_published_dates(published, last_updated, history_link, 1)
+  def assert_footer_has_published_dates(first_published = nil, last_updated = nil, history_link = false)
+    assert_has_published_dates(first_published, last_updated, history_link)
   end
 
   def setup_and_visit_content_item(name, parameter_string = "")