From 9288a47b9701bed26b8259c3c01a3aaf0145ca33 Mon Sep 17 00:00:00 2001 From: CEdwardsBlasikiewicz Date: Fri, 10 May 2024 11:31:15 +1000 Subject: [PATCH 1/6] update display of "Guide to..." to only show on collection-level items. --- .../arclight/document_component.html.erb | 6 +++- .../breadcrumbs_hierarchy_component.html.erb | 34 +++++++++++++++++++ .../breadcrumbs_hierarchy_component.rb | 4 +++ app/controllers/catalog_controller.rb | 2 +- app/presenters/show_presenter.rb | 7 +++- 5 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 app/components/breadcrumbs_hierarchy_component.html.erb create mode 100644 app/components/breadcrumbs_hierarchy_component.rb diff --git a/app/components/arclight/document_component.html.erb b/app/components/arclight/document_component.html.erb index 0e2616d6..22eac7fc 100644 --- a/app/components/arclight/document_component.html.erb +++ b/app/components/arclight/document_component.html.erb @@ -8,7 +8,11 @@
<%= content_tag :h1 do %> - <%= t('collection_prefix') + document.normalized_title %> + <% if document.collection? %> + <%= t('collection_prefix') + document.normalized_title %> + <% else %> + <%= document.normalized_title %> + <% end %> <% end %> <%= render 'arclight/requests', document: document %> <%= render Arclight::BookmarkComponent.new document: document, action: bookmark_config %> diff --git a/app/components/breadcrumbs_hierarchy_component.html.erb b/app/components/breadcrumbs_hierarchy_component.html.erb new file mode 100644 index 00000000..c005f55b --- /dev/null +++ b/app/components/breadcrumbs_hierarchy_component.html.erb @@ -0,0 +1,34 @@ +
    +
  1. + <%= link_to t('arclight.routes.home'), root_path %> +
    2. +
  2. + + <%= repository %> +
      + <% if collection %> +
    1. + + <%= link_to "#{I18n.t('collection_prefix')} #{collection.label}", solr_document_path(collection.global_id) %> + +
        + <% parents_under_collection.each do |parent| %> +
      1. + <%= link_to parent.label, solr_document_path(parent.global_id) %> +
        2. + <% end %> + +
      2. + <%= @presenter.heading %> +
        3. +
      +
      2. + <% else # this is a collection %> +
    2. + + <%= @presenter.heading %> +
      3. + <% end %> +
    +
    3. +
diff --git a/app/components/breadcrumbs_hierarchy_component.rb b/app/components/breadcrumbs_hierarchy_component.rb new file mode 100644 index 00000000..dac4a559 --- /dev/null +++ b/app/components/breadcrumbs_hierarchy_component.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +class BreadcrumbsHierarchyComponent < Arclight::BreadcrumbsHierarchyComponent +end \ No newline at end of file diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 2d3590d3..1c555c75 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -96,7 +96,7 @@ class CatalogController < ApplicationController # config.show.title_field = 'title_display' config.show.document_component = Arclight::DocumentComponent config.show.sidebar_component = Arclight::SidebarComponent - config.show.breadcrumb_component = Arclight::BreadcrumbsHierarchyComponent + config.show.breadcrumb_component = BreadcrumbsHierarchyComponent config.show.embed_component = Arclight::EmbedComponent config.show.access_component = Arclight::AccessComponent config.show.online_status_component = Arclight::OnlineStatusIndicatorComponent diff --git a/app/presenters/show_presenter.rb b/app/presenters/show_presenter.rb index 3f879f6e..c5ed9289 100644 --- a/app/presenters/show_presenter.rb +++ b/app/presenters/show_presenter.rb @@ -2,6 +2,11 @@ class ShowPresenter < Arclight::ShowPresenter def heading - I18n.t("collection_prefix") + document.normalized_title + if document.collection? + I18n.t("collection_prefix") + document.normalized_title + else + document.normalized_title + end + end end From d7342ce2f33750bc5b26b03ab1f436709e606e7e Mon Sep 17 00:00:00 2001 From: CEdwardsBlasikiewicz Date: Fri, 10 May 2024 15:10:42 +1000 Subject: [PATCH 2/6] update display of "Guide to..." to only show on collection-level items. --- .../breadcrumbs_hierarchy_component.rb | 2 +- app/presenters/show_presenter.rb | 1 - .../arclight/breadcrumb_component_spec.rb | 74 +++++++++++++++++ spec/features/document_component_spec.rb | 67 +++++++++++----- spec/files/solr/367300335367601811.json | 80 +++++++++++++++++++ 5 files changed, 200 insertions(+), 24 deletions(-) create mode 100644 spec/components/arclight/breadcrumb_component_spec.rb create mode 100644 spec/files/solr/367300335367601811.json diff --git a/app/components/breadcrumbs_hierarchy_component.rb b/app/components/breadcrumbs_hierarchy_component.rb index dac4a559..5f1a6f45 100644 --- a/app/components/breadcrumbs_hierarchy_component.rb +++ b/app/components/breadcrumbs_hierarchy_component.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true class BreadcrumbsHierarchyComponent < Arclight::BreadcrumbsHierarchyComponent -end \ No newline at end of file +end diff --git a/app/presenters/show_presenter.rb b/app/presenters/show_presenter.rb index c5ed9289..401692a0 100644 --- a/app/presenters/show_presenter.rb +++ b/app/presenters/show_presenter.rb @@ -7,6 +7,5 @@ def heading else document.normalized_title end - end end diff --git a/spec/components/arclight/breadcrumb_component_spec.rb b/spec/components/arclight/breadcrumb_component_spec.rb new file mode 100644 index 00000000..5947f689 --- /dev/null +++ b/spec/components/arclight/breadcrumb_component_spec.rb @@ -0,0 +1,74 @@ +# frozen_string_literal: true + +require "rails_helper" + +RSpec.describe Arclight::BreadcrumbComponent, type: :component do + let(:document) do + SolrDocument.new( + parent_ids_ssim: %w[abc123 abc123_def abc123_ghi], + parent_unittitles_ssm: %w[ABC123 DEF GHI], + ead_ssi: "abc123", + repository_ssm: "my repository", + _root_: "abc123" + ) + end + + let(:render) do + component.render_in(vc_test_controller.view_context) + end + + let(:rendered) do + Capybara::Node::Simple.new(render) + end + + let(:component) { described_class.new(document: document) } + + context "with a count" do + it "renders only that many breadcrumb links" do + expect(rendered).to have_css "li", text: "my repository" + expect(rendered).to have_link "ABC123", href: "/catalog/abc123" + expect(rendered).not_to have_link "DEF", href: "/catalog/abc123_def" + expect(rendered).not_to have_link "GHI", href: "/catalog/abc123_ghi" + end + + it "renders an ellipsis if there are more links than the count" do + expect(render).to end_with ">…" + end + end + + context "with an offset" do + let(:attr) { {offset: 2} } + + it "skips some breadcrumb links" do + expect(rendered).not_to have_css "li", text: "my repository" + expect(rendered).not_to have_link "ABC123", href: "/catalog/abc123" + expect(rendered).to have_link "DEF", href: "/catalog/abc123_def" + expect(rendered).to have_link "GHI", href: "/catalog/abc123_ghi" + end + end + + it "renders breadcrumb links" do + expect(rendered).to have_css "li", text: "my repository" + expect(rendered).to have_link "DEF", href: "/catalog/abc123_def" + expect(rendered).to have_link "GHI", href: "/catalog/abc123_ghi" + end + + context "with legacy parent_ssm data" do + let(:legacy_document) do + SolrDocument.new( + parent_ssim: %w[abc123 def ghi], + parent_unittitles_ssm: %w[ABC123 DEF GHI], + ead_ssi: "abc123", + repository_ssm: "my repository", + _root_: "abc123" + ) + end + + let(:component) { described_class.new(document: legacy_document, **attr) } + + it "renders breadcrumb links" do + expect(rendered).to have_link "DEF", href: "/catalog/abc123def" + expect(rendered).to have_link "GHI", href: "/catalog/abc123ghi" + end + end +end diff --git a/spec/features/document_component_spec.rb b/spec/features/document_component_spec.rb index 627fce78..31ccb1b4 100644 --- a/spec/features/document_component_spec.rb +++ b/spec/features/document_component_spec.rb @@ -1,34 +1,57 @@ require "rails_helper" RSpec.describe "Document components" do - before do - solr_response = IO.read("spec/files/solr/280011976.json") - - WebMock.stub_request(:get, /solr:8983/) - .with( - headers: { - "Accept" => "*/*", - "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3" - } - ) - .to_return(status: 200, body: solr_response, headers: {}) + context "at the collection level" do + before do + solr_response = IO.read("spec/files/solr/280011976.json") + + WebMock.stub_request(:get, /solr:8983/) + .with( + headers: { + "Accept" => "*/*", + "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3" + } + ) + .to_return(status: 200, body: solr_response, headers: {}) + end + + it "has correct tab title, including the collection prefix" do + visit solr_document_path(id: "280011976") + + expect(page).to have_title(I18n.t("collection_prefix") + "19th century currency items, c1868-1895 - Finding Aids") + end + + it "has correct title, including the collection prefix" do + visit solr_document_path(id: "280011976") + + expect(page).to have_css("div.title-container h1", text: I18n.t("collection_prefix") + "19th century currency items, c1868-1895") + end end - it "has correct tab title, including the collection prefix" do - visit solr_document_path(id: "280011976") + context "at the item level" do + before do + solr_response = IO.read("spec/files/solr/367300335367601811.json") - expect(page).to have_title(I18n.t("collection_prefix") + "19th century currency items, c1868-1895 - Finding Aids") - end + WebMock.stub_request(:get, /solr:8983/) + .with( + headers: { + "Accept" => "*/*", + "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3" + } + ) + .to_return(status: 200, body: solr_response, headers: {}) + end - it "has correct breadcrumbs, including the collection prefix" do - visit solr_document_path(id: "280011976") + it "has correct tab title, excluding the collection prefix" do + visit solr_document_path(id: "367300335367601811") - expect(page).to have_css("span.breadcrumb-text", text: I18n.t("collection_prefix") + "19th century currency items, c1868-1895") - end + expect(page).to have_title("Diaries, 1929, 1934; loose diary pages, 1916, 1929, 1930, 1935 and undated") + end - it "has correct title, including the collection prefix" do - visit solr_document_path(id: "280011976") + it "has correct title, excluding the collection prefix" do + visit solr_document_path(id: "367300335367601811") - expect(page).to have_css("div.title-container h1", text: I18n.t("collection_prefix") + "19th century currency items, c1868-1895") + expect(page).to have_css("div.title-container h1", text: "Diaries, 1929, 1934; loose diary pages, 1916, 1929, 1930, 1935 and undated") + end end end diff --git a/spec/files/solr/367300335367601811.json b/spec/files/solr/367300335367601811.json new file mode 100644 index 00000000..f1c1e646 --- /dev/null +++ b/spec/files/solr/367300335367601811.json @@ -0,0 +1,80 @@ +{ + "responseHeader":{ + "zkConnected":true, + "status":0, + "QTime":1, + "params":{ + "q":"id:367300335367601811", + "fl":"*", + "_forwardedCount":"1", + "wt":"json"}}, + "response":{"numFound":1,"start":0,"numFoundExact":true,"docs":[ + { + "id":"367300335367601811", + "fav_obj_id_ssi":"nla.obj-367710222", + "ref_ssi":"367601811", + "ref_ssm":["367601811"], + "component_level_isim":[2], + "sort_isi":2, + "bibid_ssi":"538326", + "folio_instance_id_ssi":"2ff67ac1-fd2b-515c-ba93-248652d934c0", + "parent_ssi":"367601771", + "aspace_id_ssi":"aspace_8cf2270ccfec1a6513579cb137066c2f", + "title_ssm":["Diaries, 1929, 1934; loose diary pages, 1916, 1929, 1930, 1935 and undated"], + "title_tesim":["Diaries, 1929, 1934; loose diary pages, 1916, 1929, 1930, 1935 and undated"], + "normalized_title_ssm":["Diaries, 1929, 1934; loose diary pages, 1916, 1929, 1930, 1935 and undated"], + "text":["Diaries, 1929, 1934; loose diary pages, 1916, 1929, 1930, 1935 and undated", + "1", + "Braga, J.M. (José Maria)", + "History"], + "parent_ssim":["367300335", + "367601771"], + "parent_levels_ssm":["collection", + "Series"], + "parent_unittitles_ssm":["Papers of J.M. Braga, 1862-2000 (bulk 1920-1971)", + "Diaries and notebooks, 1916-c.1972"], + "parent_unittitles_tesim":["Papers of J.M. Braga, 1862-2000 (bulk 1920-1971)", + "Diaries and notebooks, 1916-c.1972"], + "collection_ssim":["Papers of J.M. Braga, 1862-2000 (bulk 1920-1971)"], + "unitid_ssm":["1"], + "ead_unitid_ssm":["367300335"], + "repository_ssim":["National Library of Australia"], + "collection_creator_ssm":["Braga, J.M. (José Maria)"], + "has_online_content_ssim":["false"], + "child_component_count_isi":0, + "level_ssim":["File"], + "level_ssm":["File"], + "parent_access_restrict_tesm":["Available for research."], + "parent_access_terms_tesm":["Copying and publishing of unpublished manuscript material is subject to copyright restrictions. For such material, written permission to publish must be obtained from the copyright holder(s). Copying of unpublished material for research purposes is permissible 50 years after the death of the creator of the material."], + "names_ssim":["Braga, J.M. (José Maria)"], + "access_subjects_ssim":["History"], + "access_subjects_ssm":["History"], + "acqinfo_ssim":["The bulk of the Braga Collection (including manuscripts, pictures, maps, newspapers, serials, periodicals, monographs and ephemera) was purchased from J.M. Braga in 1966. The component held in the Manuscript Collection at MS 4300 appears to have been formally accessioned as the J.M. Braga Papers in 1975. Several small additions have been made since the original instalment of papers was received. Most of these additions were transfers to the Manuscripts Collection from other collection areas, including a file of newspaper cuttings in May 1975, a set of microfilm reels in 1984, a file of manuscript material in 1985, lists of the Braga Collection in 1994, and two files of assorted printed material and other papers in 2009. As well, several small additions have been made by members of the Braga family. In 1992, various Braga family members donated a copy of the eulogy and order of service for Augusta Braga's memorial service, and in 2002 Angela Braga donated photographs of medals and decorations awarded to J.P. Braga, together with photocopies of early writings of J.M. Braga and eulogies for J.M. Braga and his grandson Michael Braga."], + "_nest_path_":"/child#0/child#0", + "_nest_parent_":"367300335367601771", + "_root_":"367300335", + "_version_":1796736391573405696, + "timestamp":"2024-04-19T04:35:49.969Z"}] + }, + "facet_counts":{ + "facet_queries":{}, + "facet_fields":{ + "level_ssim":[ + "File",1], + "creator_ssim":[], + "date_range_ssim":[], + "names_ssim":[ + "Braga, J.M. (José Maria)",1], + "geogname_ssim":[], + "access_subjects_ssim":[ + "History",1], + "repository_ssim":[ + "National Library of Australia",1], + "collection_ssim":[ + "Papers of J.M. Braga, 1862-2000 (bulk 1920-1971)",1]}, + "facet_ranges":{}, + "facet_intervals":{}, + "facet_heatmaps":{}}, + "spellcheck":{ + "suggestions":[], + "correctlySpelled":true}} \ No newline at end of file From 3bb54aa1c578460b5228d24c3eb542220d3fd7bc Mon Sep 17 00:00:00 2001 From: Yetrina Battad Date: Fri, 10 May 2024 18:11:14 +1000 Subject: [PATCH 3/6] test: fix specs for BreadcrumbsHierarchyComponent --- .../breadcrumbs_hierarchy_component.html.erb | 10 +-- .../arclight/breadcrumb_component_spec.rb | 74 ---------------- .../breadcrumbs_hierarchy_component_spec.rb | 88 +++++++++++++++++++ spec/features/document_component_spec.rb | 29 +----- 4 files changed, 94 insertions(+), 107 deletions(-) delete mode 100644 spec/components/arclight/breadcrumb_component_spec.rb create mode 100644 spec/components/arclight/breadcrumbs_hierarchy_component_spec.rb diff --git a/app/components/breadcrumbs_hierarchy_component.html.erb b/app/components/breadcrumbs_hierarchy_component.html.erb index c005f55b..845a29fb 100644 --- a/app/components/breadcrumbs_hierarchy_component.html.erb +++ b/app/components/breadcrumbs_hierarchy_component.html.erb @@ -1,15 +1,15 @@
  1. - <%= link_to t('arclight.routes.home'), root_path %> + <%= link_to t("arclight.routes.home"), root_path %>
  2. - + <%= repository %>
      <% if collection %>
    1. - - <%= link_to "#{I18n.t('collection_prefix')} #{collection.label}", solr_document_path(collection.global_id) %> + + <%= link_to "#{t("collection_prefix")}#{collection.label}", solr_document_path(collection.global_id) %>
        <% parents_under_collection.each do |parent| %> @@ -25,7 +25,7 @@ <% else # this is a collection %>
      1. - + <%= @presenter.heading %>
        2. <% end %> diff --git a/spec/components/arclight/breadcrumb_component_spec.rb b/spec/components/arclight/breadcrumb_component_spec.rb deleted file mode 100644 index 5947f689..00000000 --- a/spec/components/arclight/breadcrumb_component_spec.rb +++ /dev/null @@ -1,74 +0,0 @@ -# frozen_string_literal: true - -require "rails_helper" - -RSpec.describe Arclight::BreadcrumbComponent, type: :component do - let(:document) do - SolrDocument.new( - parent_ids_ssim: %w[abc123 abc123_def abc123_ghi], - parent_unittitles_ssm: %w[ABC123 DEF GHI], - ead_ssi: "abc123", - repository_ssm: "my repository", - _root_: "abc123" - ) - end - - let(:render) do - component.render_in(vc_test_controller.view_context) - end - - let(:rendered) do - Capybara::Node::Simple.new(render) - end - - let(:component) { described_class.new(document: document) } - - context "with a count" do - it "renders only that many breadcrumb links" do - expect(rendered).to have_css "li", text: "my repository" - expect(rendered).to have_link "ABC123", href: "/catalog/abc123" - expect(rendered).not_to have_link "DEF", href: "/catalog/abc123_def" - expect(rendered).not_to have_link "GHI", href: "/catalog/abc123_ghi" - end - - it "renders an ellipsis if there are more links than the count" do - expect(render).to end_with ">…
      " - end - end - - context "with an offset" do - let(:attr) { {offset: 2} } - - it "skips some breadcrumb links" do - expect(rendered).not_to have_css "li", text: "my repository" - expect(rendered).not_to have_link "ABC123", href: "/catalog/abc123" - expect(rendered).to have_link "DEF", href: "/catalog/abc123_def" - expect(rendered).to have_link "GHI", href: "/catalog/abc123_ghi" - end - end - - it "renders breadcrumb links" do - expect(rendered).to have_css "li", text: "my repository" - expect(rendered).to have_link "DEF", href: "/catalog/abc123_def" - expect(rendered).to have_link "GHI", href: "/catalog/abc123_ghi" - end - - context "with legacy parent_ssm data" do - let(:legacy_document) do - SolrDocument.new( - parent_ssim: %w[abc123 def ghi], - parent_unittitles_ssm: %w[ABC123 DEF GHI], - ead_ssi: "abc123", - repository_ssm: "my repository", - _root_: "abc123" - ) - end - - let(:component) { described_class.new(document: legacy_document, **attr) } - - it "renders breadcrumb links" do - expect(rendered).to have_link "DEF", href: "/catalog/abc123def" - expect(rendered).to have_link "GHI", href: "/catalog/abc123ghi" - end - end -end diff --git a/spec/components/arclight/breadcrumbs_hierarchy_component_spec.rb b/spec/components/arclight/breadcrumbs_hierarchy_component_spec.rb new file mode 100644 index 00000000..66e0000e --- /dev/null +++ b/spec/components/arclight/breadcrumbs_hierarchy_component_spec.rb @@ -0,0 +1,88 @@ +# frozen_string_literal: true + +require "rails_helper" + +RSpec.describe BreadcrumbsHierarchyComponent, type: :component do + let(:document) do + SolrDocument.new( + ead_ssi: "abc123", + repository_ssm: "National Library of Australia", + _root_: "abc123", + normalized_title_ssm: "ABC123", + level_ssm: "collection" + ) + end + let(:view_context) { ActionView::Base.new(nil, {}, nil) } + let(:config) { Blacklight::Configuration.new } + let(:show_presenter) { ShowPresenter.new(document, view_context, config) } + + context "when viewing collection" do + it "renders collection title with prefix" do + render_inline(described_class.new(presenter: show_presenter)) + + expect(page).to have_css "li", text: "National Library of Australia" + expect(page).to have_css "li", text: "Guide to the ABC123" + end + end + + context "when viewing series" do + let(:document) do + SolrDocument.new( + parent_ssim: %w[abc123 abc123_def], + parent_unittitles_ssm: %w[ABC123 DEF], + parent_levels_ssm: %w[collection Series], + ead_ssi: "abc123", + repository_ssm: "National Library of Australia", + _root_: "abc123", + normalized_title_ssm: "GHI", + level_ssm: "Subseries" + ) + end + + it "renders series titles without prefix" do + render_inline(described_class.new(presenter: show_presenter)) + + expect(page).to have_css "li", text: "National Library of Australia" + expect(page).to have_link "Guide to the ABC123", href: "/finding-aids/catalog/abc123" + + expect(page).to have_link "DEF", href: "/finding-aids/catalog/abc123abc123_def" + expect(page).not_to have_link "Guide to the DEF", href: "/finding-aids/catalog/abc123abc123_def" + + expect(page).to have_css "li", text: "GHI" + expect(page).not_to have_link "GHI", href: "/finding-aids/catalog/abc123abc123_ghi" + expect(page).not_to have_link "Guide to the GHI", href: "/finding-aids/catalog/abc123abc123_ghi" + end + end + + context "when viewing file" do + let(:document) do + SolrDocument.new( + parent_ssim: %w[abc123 abc123_def abc123_ghi], + parent_unittitles_ssm: %w[ABC123 DEF GHI], + parent_levels_ssm: %w[collection Series Subseries], + ead_ssi: "abc123", + repository_ssm: "National Library of Australia", + _root_: "abc123", + normalized_title_ssm: "JKL", + level_ssm: "file" + ) + end + + it "renders file titles without prefix" do + render_inline(described_class.new(presenter: show_presenter)) + + expect(page).to have_css "li", text: "National Library of Australia" + expect(page).to have_link "Guide to the ABC123", href: "/finding-aids/catalog/abc123" + + expect(page).to have_link "DEF", href: "/finding-aids/catalog/abc123abc123_def" + expect(page).not_to have_link "Guide to the DEF", href: "/finding-aids/catalog/abc123abc123_def" + + expect(page).to have_link "GHI", href: "/finding-aids/catalog/abc123abc123_ghi" + expect(page).not_to have_link "Guide to the GHI", href: "/finding-aids/catalog/abc123abc123_ghi" + + expect(page).to have_css "li", text: "JKL" + expect(page).not_to have_css "li", text: "Guide to the JKL" + expect(page).not_to have_link "JKL" + end + end +end diff --git a/spec/features/document_component_spec.rb b/spec/features/document_component_spec.rb index 31ccb1b4..595f73a4 100644 --- a/spec/features/document_component_spec.rb +++ b/spec/features/document_component_spec.rb @@ -1,7 +1,7 @@ require "rails_helper" RSpec.describe "Document components" do - context "at the collection level" do + context "when at the collection level" do before do solr_response = IO.read("spec/files/solr/280011976.json") @@ -27,31 +27,4 @@ expect(page).to have_css("div.title-container h1", text: I18n.t("collection_prefix") + "19th century currency items, c1868-1895") end end - - context "at the item level" do - before do - solr_response = IO.read("spec/files/solr/367300335367601811.json") - - WebMock.stub_request(:get, /solr:8983/) - .with( - headers: { - "Accept" => "*/*", - "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3" - } - ) - .to_return(status: 200, body: solr_response, headers: {}) - end - - it "has correct tab title, excluding the collection prefix" do - visit solr_document_path(id: "367300335367601811") - - expect(page).to have_title("Diaries, 1929, 1934; loose diary pages, 1916, 1929, 1930, 1935 and undated") - end - - it "has correct title, excluding the collection prefix" do - visit solr_document_path(id: "367300335367601811") - - expect(page).to have_css("div.title-container h1", text: "Diaries, 1929, 1934; loose diary pages, 1916, 1929, 1930, 1935 and undated") - end - end end From 28e210fad7134263fff54c79aeab2f623b175a4a Mon Sep 17 00:00:00 2001 From: Yetrina Battad Date: Mon, 13 May 2024 09:12:15 +1000 Subject: [PATCH 4/6] test: tighten up expectations --- .../arclight/breadcrumbs_hierarchy_component_spec.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/components/arclight/breadcrumbs_hierarchy_component_spec.rb b/spec/components/arclight/breadcrumbs_hierarchy_component_spec.rb index 66e0000e..25abbec4 100644 --- a/spec/components/arclight/breadcrumbs_hierarchy_component_spec.rb +++ b/spec/components/arclight/breadcrumbs_hierarchy_component_spec.rb @@ -22,6 +22,7 @@ expect(page).to have_css "li", text: "National Library of Australia" expect(page).to have_css "li", text: "Guide to the ABC123" + expect(page).not_to have_link "Guide to the ABC123" end end @@ -49,8 +50,8 @@ expect(page).not_to have_link "Guide to the DEF", href: "/finding-aids/catalog/abc123abc123_def" expect(page).to have_css "li", text: "GHI" - expect(page).not_to have_link "GHI", href: "/finding-aids/catalog/abc123abc123_ghi" - expect(page).not_to have_link "Guide to the GHI", href: "/finding-aids/catalog/abc123abc123_ghi" + expect(page).not_to have_link "GHI" + expect(page).not_to have_link "Guide to the GHI" end end @@ -81,7 +82,7 @@ expect(page).not_to have_link "Guide to the GHI", href: "/finding-aids/catalog/abc123abc123_ghi" expect(page).to have_css "li", text: "JKL" - expect(page).not_to have_css "li", text: "Guide to the JKL" + expect(page).not_to have_link "Guide to the JKL" expect(page).not_to have_link "JKL" end end From b94e4fc090f3050b7af2af55594233f31a2a20ff Mon Sep 17 00:00:00 2001 From: Yetrina Battad Date: Mon, 13 May 2024 09:19:52 +1000 Subject: [PATCH 5/6] chore: update nla-blacklight_common in Gemfile.lock --- Gemfile.lock | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8519bbce..79e7789f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,7 +105,7 @@ GEM addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) aes_key_wrap (1.1.0) - annotaterb (4.6.0) + annotaterb (4.7.1) anyway_config (2.5.4) ruby-next-core (>= 0.14.0) arclight (1.0.1) @@ -123,6 +123,7 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) + bigdecimal (3.1.8) bindata (2.5.0) bindex (0.8.1) binding_of_caller (1.0.0) @@ -186,7 +187,7 @@ GEM rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) - devise (4.9.3) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -244,13 +245,13 @@ GEM domain_name (~> 0.5) http-form_data (2.3.0) httpclient (2.8.3) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.6.0) irb (1.10.0) rdoc reline (>= 0.3.8) - jbuilder (2.11.5) + jbuilder (2.12.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) jsbundling-rails (1.3.0) @@ -306,30 +307,31 @@ GEM marcel (1.0.4) matrix (0.4.2) memory_profiler (1.0.1) - method_source (1.0.0) + method_source (1.1.0) mini_histogram (0.3.1) mini_mime (1.1.5) minitar (0.9) - minitest (5.22.2) + minitest (5.22.3) msgpack (1.7.2) multi_json (1.15.0) - multi_xml (0.6.0) + multi_xml (0.7.1) + bigdecimal (~> 3.1) mysql2 (0.5.5) net-http (0.4.1) uri - net-imap (0.4.10) + net-imap (0.4.11) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol - nio4r (2.7.0) - nokogiri (1.16.2-arm64-darwin) + nio4r (2.7.3) + nokogiri (1.16.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.4-x86_64-linux) racc (~> 1.4) oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) @@ -350,7 +352,7 @@ GEM omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) omniauth (~> 2.0) - omniauth-rails_csrf_protection (1.0.1) + omniauth-rails_csrf_protection (1.0.2) actionpack (>= 4.2) omniauth (~> 2.0) orm_adapter (0.5.0) @@ -366,7 +368,7 @@ GEM puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) - rack (2.2.8.1) + rack (2.2.9) rack-mini-profiler (3.1.1) rack (>= 1.2.0) rack-protection (3.2.0) @@ -407,7 +409,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) rdoc (6.6.0) psych (>= 4.0.0) redis (5.0.8) @@ -425,7 +427,7 @@ GEM retriable (3.1.2) rexml (3.2.6) rouge (4.2.0) - rsolr (2.5.0) + rsolr (2.6.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) rspec-core (3.12.2) @@ -558,8 +560,8 @@ GEM unf_ext (0.0.9.1) unicode-display_width (2.5.0) uri (0.13.0) - version_gem (1.1.3) - view_component (3.11.0) + version_gem (1.1.4) + view_component (3.12.1) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) From 242d7dffa041d540903892e7a86ae8c8df02211f Mon Sep 17 00:00:00 2001 From: Yetrina Battad Date: Mon, 13 May 2024 10:05:19 +1000 Subject: [PATCH 6/6] chore: update nla-blacklight_common dependency --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 5621de55..6d28b858 100644 --- a/Gemfile +++ b/Gemfile @@ -89,7 +89,7 @@ gem "blacklight-locale_picker" gem "zk", "~> 1.10" gem "nokogiri", ">= 1.13.9" -gem "nla-blacklight_common", git: "https://github.com/nla/nla-blacklight_common", tag: "0.2.0" +gem "nla-blacklight_common", git: "https://github.com/nla/nla-blacklight_common", branch: "main" gem "blacklight_range_limit", git: "https://github.com/nla/blacklight_range_limit", branch: "main" # For local development, comment out above ⤴️ and uncomment below ⤵️ # gem "nla-blacklight_common", path: "../nla-blacklight_common" diff --git a/Gemfile.lock b/Gemfile.lock index 79e7789f..3f45dfa2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,10 +10,10 @@ GIT GIT remote: https://github.com/nla/nla-blacklight_common - revision: 91916c3dda4306a9279759a1a23f043e311228a3 - tag: 0.2.0 + revision: 90eea4c1e63bd82d324d80643efa4542dfdd2edc + branch: main specs: - nla-blacklight_common (0.2.0) + nla-blacklight_common (0.2.1) activerecord-session_store (~> 2.0) annotaterb blacklight (>= 8.0.0, < 9)