diff --git a/app/controllers/homepage_controller.rb b/app/controllers/homepage_controller.rb index 009228e145..93bc536eff 100644 --- a/app/controllers/homepage_controller.rb +++ b/app/controllers/homepage_controller.rb @@ -18,10 +18,6 @@ def search_component end helper_method :search_component - def publication_class - HomepagePresenter - end - def show_search_autocomplete? true unless ENV["GOVUK_DISABLE_SEARCH_AUTOCOMPLETE"] end diff --git a/app/models/content_item.rb b/app/models/content_item.rb index 202ef8e6be..8fd1851c31 100644 --- a/app/models/content_item.rb +++ b/app/models/content_item.rb @@ -3,9 +3,9 @@ class ContentItem include Withdrawable - attr_reader :attachments, :content_store_response, :content_store_hash, :body, :image, - :description, :document_type, :schema_name, :title, :base_path, :locale, - :public_updated_at + attr_reader :attachments, :base_path, :body, :content_store_hash, + :content_store_response, :description, :document_type, :image, + :links, :locale, :public_updated_at, :schema_name, :title # SCAFFOLDING: remove the override_content_store_hash parameter when full landing page # content items including block details are available from content-store @@ -22,6 +22,7 @@ def initialize(content_store_response, override_content_store_hash: nil) @base_path = content_store_hash["base_path"] @locale = content_store_hash["locale"] @public_updated_at = content_store_hash["public_updated_at"] + @links = content_store_hash["links"] @attachments = get_attachments(content_store_hash.dig("details", "attachments")) diff --git a/app/models/homepage.rb b/app/models/homepage.rb new file mode 100644 index 0000000000..6a47d63f64 --- /dev/null +++ b/app/models/homepage.rb @@ -0,0 +1,11 @@ +class Homepage < ContentItem + def popular_links + @popular_links ||= popular_links_data&.collect(&:with_indifferent_access) + end + +private + + def popular_links_data + @popular_links_data ||= links.dig("popular_links", 0, "details", "link_items") + end +end diff --git a/app/presenters/homepage_presenter.rb b/app/presenters/homepage_presenter.rb deleted file mode 100644 index 840bfd5bb1..0000000000 --- a/app/presenters/homepage_presenter.rb +++ /dev/null @@ -1,27 +0,0 @@ -class HomepagePresenter < ContentItemPresenter - PASS_THROUGH_KEYS = %i[ - links - ].freeze - - PASS_THROUGH_KEYS.each do |key| - define_method key do - content_item[key.to_s] - end - end - - def link_items - @link_items ||= links.dig("popular_links", 0, "details", "link_items") - end - - def hardcoded_popular_links - @hardcoded_popular_links ||= I18n.t("homepage.index.popular_links") - end - - def popular_links_data - link_items || hardcoded_popular_links - end - - def popular_links - @popular_links ||= popular_links_data.collect(&:with_indifferent_access) - end -end diff --git a/app/views/homepage/_popular_links.html.erb b/app/views/homepage/_popular_links.html.erb index 128e82439f..c93db948d6 100644 --- a/app/views/homepage/_popular_links.html.erb +++ b/app/views/homepage/_popular_links.html.erb @@ -1,7 +1,6 @@ <% add_view_stylesheet("popular_links") %> -
@@ -12,7 +11,7 @@ text: t("homepage.index.popular_links_heading"), } %>
    - <% publication.popular_links.each_with_index do | item, index | %> + <% content_item.popular_links.each_with_index do | item, index | %>
  • <%= render "govuk_publishing_components/components/action_link", { text: item[:title], @@ -25,7 +24,7 @@ 'index_section': locals[:index_section], 'index_link': index + 1, 'index_section_count': locals[:index_section_count], - 'index_total': t("homepage.index.popular_links").length, + 'index_total': content_item.popular_links.length, 'section': "#{t("homepage.index.popular_links_heading", locale: :en)}" } } diff --git a/config/locales/ar.yml b/config/locales/ar.yml index ac15c263a6..d0d7b2df92 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -865,7 +865,6 @@ ar: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/az.yml b/config/locales/az.yml index 2aa33a4e82..169995b5e3 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -569,7 +569,6 @@ az: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/be.yml b/config/locales/be.yml index d13e40196c..58c5231715 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -717,7 +717,6 @@ be: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 0c6fa691f7..5ec4085d81 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -569,7 +569,6 @@ bg: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 5b6f090cc2..2f8712ace5 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -569,7 +569,6 @@ bn: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index b7dc4f6d6d..09c55c13b4 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -643,7 +643,6 @@ cs: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/cy.yml b/config/locales/cy.yml index efb2168abd..404512bd93 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -870,7 +870,6 @@ cy: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/da.yml b/config/locales/da.yml index ffb0259267..634b54286e 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -569,7 +569,6 @@ da: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/de.yml b/config/locales/de.yml index c3006b4b18..3b1b543aa5 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -569,7 +569,6 @@ de: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/dr.yml b/config/locales/dr.yml index 5a63ff6f3f..72e6e97346 100644 --- a/config/locales/dr.yml +++ b/config/locales/dr.yml @@ -569,7 +569,6 @@ dr: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/el.yml b/config/locales/el.yml index 2f842fa96e..504dd8e39b 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -569,7 +569,6 @@ el: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/en.yml b/config/locales/en.yml index fcbaefd273..107679b359 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -660,19 +660,6 @@ en: other_agencies: Other agencies and public bodies other_agencies_count: 400+ popular: Popular on GOV.UK - popular_links: - - title: 'HMRC account: sign in or set up' - url: "/log-in-register-hmrc-online-services" - - title: 'Universal Credit account: sign in' - url: "/sign-in-universal-credit" - - title: 'Personal tax account: sign in or set up' - url: "/personal-tax-account" - - title: 'Self Assessment tax return: sign in' - url: "/log-in-file-self-assessment-tax-return" - - title: 'Childcare account: sign in' - url: "/sign-in-childcare-account" - - title: Check your State Pension forecast - url: "/check-state-pension" popular_links_heading: Popular on GOV.UK promotion_slots: - text: Search and apply for jobs in England, Scotland and Wales. diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml index 81c3a168ec..114f999651 100644 --- a/config/locales/es-419.yml +++ b/config/locales/es-419.yml @@ -569,7 +569,6 @@ es-419: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/es.yml b/config/locales/es.yml index 5640f39c16..1e9fd7b746 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -569,7 +569,6 @@ es: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/et.yml b/config/locales/et.yml index a220513ea1..5bec4c4da1 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -569,7 +569,6 @@ et: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 6e07625d06..d75709f892 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -569,7 +569,6 @@ fa: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 4e3458b1d3..20088b9958 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -569,7 +569,6 @@ fi: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 9dabb38f15..a072a55eb7 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -569,7 +569,6 @@ fr: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index b0d7366456..a11a46d9da 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -717,7 +717,6 @@ gd: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/gu.yml b/config/locales/gu.yml index 9c0f453a67..af9eb8e941 100644 --- a/config/locales/gu.yml +++ b/config/locales/gu.yml @@ -569,7 +569,6 @@ gu: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/he.yml b/config/locales/he.yml index 9ea9140c96..2814e567e6 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -569,7 +569,6 @@ he: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 093215b439..024f28f48a 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -569,7 +569,6 @@ hi: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 85ceacae42..becaadc588 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -643,7 +643,6 @@ hr: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index a2b8cd41cd..6df89ac417 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -569,7 +569,6 @@ hu: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/hy.yml b/config/locales/hy.yml index ed49d6e561..77783de5f9 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -569,7 +569,6 @@ hy: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/id.yml b/config/locales/id.yml index 17b0d92c76..abd8554e98 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -495,7 +495,6 @@ id: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/is.yml b/config/locales/is.yml index 94d0d056c0..e659a4de74 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -569,7 +569,6 @@ is: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/it.yml b/config/locales/it.yml index 7dacfd8064..58db43add0 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -569,7 +569,6 @@ it: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 5207b11133..41107ccc97 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -495,7 +495,6 @@ ja: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 285a4d9df3..632492868a 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -569,7 +569,6 @@ ka: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 9748589baa..ae88854141 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -569,7 +569,6 @@ kk: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 8224885d31..680da1f0d9 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -495,7 +495,6 @@ ko: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 49e968f726..19612ca3d0 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -643,7 +643,6 @@ lt: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 6a3370746d..1930de00bb 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -569,7 +569,6 @@ lv: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index a3f1576635..869473cd34 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -495,7 +495,6 @@ ms: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/mt.yml b/config/locales/mt.yml index 6d8e6b4093..f7eb0e35c2 100644 --- a/config/locales/mt.yml +++ b/config/locales/mt.yml @@ -717,7 +717,6 @@ mt: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 2d08884294..161321745d 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -569,7 +569,6 @@ ne: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 995850ddb9..60c3296129 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -569,7 +569,6 @@ nl: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/no.yml b/config/locales/no.yml index 2858a8679b..6649503683 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -569,7 +569,6 @@ other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/pa-pk.yml b/config/locales/pa-pk.yml index f8f3847456..89b4156d81 100644 --- a/config/locales/pa-pk.yml +++ b/config/locales/pa-pk.yml @@ -569,7 +569,6 @@ pa-pk: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 3c72aa8d8a..e98e9f37cc 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -569,7 +569,6 @@ pa: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 97f6981457..eabfe1255b 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -717,7 +717,6 @@ pl: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ps.yml b/config/locales/ps.yml index adcd013438..0ed85dfac5 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -569,7 +569,6 @@ ps: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 77d5396b07..14f5cfde3a 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -569,7 +569,6 @@ pt: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 0f1341e8e1..f2ecc31eb8 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -643,7 +643,6 @@ ro: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 9e119609f8..55e3aa7992 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -717,7 +717,6 @@ ru: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/si.yml b/config/locales/si.yml index 56ef29b3b8..7e8d9f375a 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -569,7 +569,6 @@ si: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 79fdf619f0..cd520625de 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -643,7 +643,6 @@ sk: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 6704ad33ed..d9b197a242 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -717,7 +717,6 @@ sl: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/so.yml b/config/locales/so.yml index cf15cf5d76..5d4799df1b 100644 --- a/config/locales/so.yml +++ b/config/locales/so.yml @@ -569,7 +569,6 @@ so: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index e2e21a87dd..d7f7cc5364 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -569,7 +569,6 @@ sq: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 753baf8396..bea9b59b62 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -643,7 +643,6 @@ sr: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index fa02c240b4..4e3b3b91af 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -569,7 +569,6 @@ sv: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/sw.yml b/config/locales/sw.yml index f72b1383a2..de65aafc53 100644 --- a/config/locales/sw.yml +++ b/config/locales/sw.yml @@ -569,7 +569,6 @@ sw: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ta.yml b/config/locales/ta.yml index ae5fae3ee9..87f5789661 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -569,7 +569,6 @@ ta: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/th.yml b/config/locales/th.yml index 8d568fbcd7..8633f1ed7a 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -495,7 +495,6 @@ th: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/tk.yml b/config/locales/tk.yml index 68589b11ca..43b1a52716 100644 --- a/config/locales/tk.yml +++ b/config/locales/tk.yml @@ -569,7 +569,6 @@ tk: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 7016843848..f455a31e1b 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -569,7 +569,6 @@ tr: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index be46d6767a..598bfe9dd0 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -717,7 +717,6 @@ uk: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/ur.yml b/config/locales/ur.yml index 4cb6ce7447..78d8a1a130 100644 --- a/config/locales/ur.yml +++ b/config/locales/ur.yml @@ -569,7 +569,6 @@ ur: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/uz.yml b/config/locales/uz.yml index 20d90178d8..feebdf10f0 100644 --- a/config/locales/uz.yml +++ b/config/locales/uz.yml @@ -569,7 +569,6 @@ uz: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index d49302490b..92affeb551 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -495,7 +495,6 @@ vi: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/yi.yml b/config/locales/yi.yml index f522240d69..351a7b5ecc 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -569,7 +569,6 @@ yi: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index 2f966dcbb1..34902d91bc 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -495,7 +495,6 @@ zh-hk: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/zh-tw.yml b/config/locales/zh-tw.yml index 673b6ac825..248a54364d 100644 --- a/config/locales/zh-tw.yml +++ b/config/locales/zh-tw.yml @@ -495,7 +495,6 @@ zh-tw: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index d45a9cb22e..3b80803c66 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -495,7 +495,6 @@ zh: other_agencies: other_agencies_count: popular: - popular_links: popular_links_heading: promotion_slots: running_limited_company: diff --git a/spec/models/homepage_spec.rb b/spec/models/homepage_spec.rb new file mode 100644 index 0000000000..159766d12d --- /dev/null +++ b/spec/models/homepage_spec.rb @@ -0,0 +1,19 @@ +RSpec.describe Homepage do + before do + @content_store_response = GovukSchemas::Example.find("homepage", example_name: "homepage_with_popular_links_on_govuk") + end + + let(:subject) { described_class.new(@content_store_response) } + + describe "#popular_links" do + context "when popular links in the content item" do + it "returns popular links from the content item" do + expected_popular_links = @content_store_response + .dig("links", "popular_links", 0, "details", "link_items") + .collect(&:with_indifferent_access) + + expect(subject.popular_links).to eq(expected_popular_links) + end + end + end +end diff --git a/spec/requests/homepage_spec.rb b/spec/requests/homepage_spec.rb index bf050ccc15..5ef26648ad 100644 --- a/spec/requests/homepage_spec.rb +++ b/spec/requests/homepage_spec.rb @@ -1,8 +1,9 @@ RSpec.describe "Homepage" do include GovukAbTesting::RspecHelpers + include ContentStoreHelpers context "loading the homepage" do - before { stub_content_store_has_item("/", schema: "special_route", links: {}) } + before { stub_homepage_content_item } it "responds with success" do get "/" @@ -15,41 +16,5 @@ honours_content_store_ttl end - - context "with popular links in the content item" do - setup do - links = { - "popular_links" => [ - { - "details" => { - "link_items" => [ - { - "title" => "Some popular links title", - "url" => "/some/path", - }, - ], - }, - }, - ], - } - stub_content_store_has_item("/", schema: "special_route", links:) - end - - it "shows popular links" do - get "/" - - expect(response.body).to match("Some popular links title") - end - end - - context "with popular links not in the content item" do - it "shows popular links" do - get "/" - - I18n.t("homepage.index.popular_links").each do |item| - expect(response.body).to match(item[:title]) - end - end - end end end diff --git a/spec/support/content_store_helpers.rb b/spec/support/content_store_helpers.rb index 769624b106..3afb9bd762 100644 --- a/spec/support/content_store_helpers.rb +++ b/spec/support/content_store_helpers.rb @@ -48,4 +48,15 @@ def content_store_throws_exception_for(path, exception) def honours_content_store_ttl expect(response.headers["Cache-Control"]).to eq("max-age=#{15.minutes.to_i}, public") end + + def stub_homepage_content_item(links: []) + content_item = GovukSchemas::Example.find("homepage", example_name: "homepage_with_popular_links_on_govuk") + base_path = content_item.fetch("base_path") + + if links.any? + content_item["links"] = links + end + + stub_content_store_has_item(base_path, content_item) + end end diff --git a/spec/system/account_home_spec.rb b/spec/system/account_home_spec.rb index 9329967d30..54d717f519 100644 --- a/spec/system/account_home_spec.rb +++ b/spec/system/account_home_spec.rb @@ -1,7 +1,7 @@ RSpec.describe "AccountHome" do - before do - stub_content_store_has_item("/", schema: "special_route", links: {}) - end + include ContentStoreHelpers + + before { stub_homepage_content_item } context "/account/home" do it "redirects users to One Login's Your Services page" do diff --git a/spec/system/homepage_spec.rb b/spec/system/homepage_spec.rb index e7b52b2b91..3b1e39af1b 100644 --- a/spec/system/homepage_spec.rb +++ b/spec/system/homepage_spec.rb @@ -1,5 +1,25 @@ RSpec.describe "Homepage" do - before { stub_content_store_has_item("/", schema: "special_route", links: {}) } + include GovukAbTesting::RspecHelpers + include ContentStoreHelpers + + before do + links = { + "popular_links" => [ + { + "details" => { + "link_items" => [ + { + "title" => "Some popular links title", + "url" => "/some/path", + }, + ], + }, + }, + ], + } + + stub_homepage_content_item(links:) + end it "renders the homepage" do visit "/" @@ -10,6 +30,12 @@ expect(page).not_to have_css(".homepage-inverse-header__title") end + it "shows popular links" do + visit "/" + + expect(page).to have_content("Some popular links title") + end + describe "search autocomplete" do context "when autocomplete is enabled" do it "renders the search with autocomplete component with the correct source URL" do diff --git a/spec/system/sessions_spec.rb b/spec/system/sessions_spec.rb index 7c277e1a29..883c954bd9 100644 --- a/spec/system/sessions_spec.rb +++ b/spec/system/sessions_spec.rb @@ -5,11 +5,12 @@ include GdsApi::TestHelpers::AccountApi include GdsApi::TestHelpers::EmailAlertApi include GovukPersonalisation::TestHelpers::Features + include ContentStoreHelpers before do # We add a fake content item pointed at homepage, which allows us to check we've # been redirected - stub_content_store_has_item("/", schema: "special_route", links: {}) + stub_homepage_content_item end after { Rails.application.reload_routes! } diff --git a/spec/unit/presenters/homepage_presenter_spec.rb b/spec/unit/presenters/homepage_presenter_spec.rb deleted file mode 100644 index 770e2142a4..0000000000 --- a/spec/unit/presenters/homepage_presenter_spec.rb +++ /dev/null @@ -1,59 +0,0 @@ -RSpec.describe HomepagePresenter do - let(:content_item) do - { - "links" => { - "popular_links" => [ - { - "details" => { - "link_items" => [ - { - "title" => "Some title", - "url" => "/some/path", - }, - ], - }, - }, - ], - }, - } - end - - let(:subject) { described_class.new(content_item) } - - context "#links" do - it "returns links" do - expect(subject.links).to eq(content_item["links"]) - end - end - - context "#popular_links" do - context "when popular links in the content item" do - it "memoizes popular links" do - expected_popular_links = subject.popular_links - content_item["links"].delete("popular_links") - - expect(subject.popular_links).to eq(expected_popular_links) - end - - it "returns popular links from the content item" do - expected_popular_links = content_item - .dig("links", "popular_links", 0, "details", "link_items") - .collect(&:with_indifferent_access) - - expect(subject.popular_links).to eq(expected_popular_links) - end - end - - context "when popular links not in the content item" do - before do - content_item["links"].delete("popular_links") - end - - it "returns popular links from the locale file" do - expected_popular_links = I18n.t("homepage.index.popular_links") - .collect(&:with_indifferent_access) - expect(subject.popular_links).to eq(expected_popular_links) - end - end - end -end