geoblacklight 5.4.0 → 6.0.0.pre.alpha.1

data/lib/geoblacklight.rb

@@ -1,32 +1,22 @@
 # frozen_string_literal: true
 
 require "active_support/dependencies"
-require "active_support/deprecation"
-require "geoblacklight/engine"
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/generators")
 loader.collapse("#{__dir__}/geoblacklight/download")
 loader.collapse("#{__dir__}/geoblacklight/wms_layer")
 loader.setup
+require "geoblacklight/engine"
 
 module Geoblacklight
   def self.logger
     ::Rails.logger
   end
 
-  # Deprecator for GeoBlacklight's own deprecations. Anything deprecated here is
-  # slated for removal in GeoBlacklight 6.0.
-  #
-  # Downstream applications can configure its behavior the same way they would any
-  # other Rails deprecator, e.g. in config/application.rb:
-  #
-  #   config.active_support.deprecation = :raise
-  #
-  # or directly:
-  #
-  #   Geoblacklight.deprecation.behavior = :silence
-  def self.deprecation
-    @deprecation ||= ActiveSupport::Deprecation.new("6.0", "GeoBlacklight")
+  mattr_accessor :configuration_builder, default: Geoblacklight::Configuration::LegacySettingsBuilder
+
+  def self.configuration
+    @configuration ||= configuration_builder.build
   end
 end

data/lib/tasks/geoblacklight.rake

@@ -54,23 +54,14 @@ namespace :geoblacklight do
   namespace :downloads do
     desc "Delete all cached downloads"
     task delete: :environment do
-      Geoblacklight.deprecation.warn(
-        "The geoblacklight:downloads:delete rake task is deprecated; GeoBlacklight 6 removes the generated download subsystem: downloads are direct links only, rendered by Geoblacklight::Document::DownloadLinksComponent"
-      )
       FileUtils.rm_rf Dir.glob(Rails.root.join("tmp", "cache", "downloads", "*"))
     end
     desc "Create download directory"
     task mkdir: :environment do
-      Geoblacklight.deprecation.warn(
-        "The geoblacklight:downloads:mkdir rake task is deprecated; GeoBlacklight 6 removes the generated download subsystem: downloads are direct links only, rendered by Geoblacklight::Document::DownloadLinksComponent"
-      )
       FileUtils.mkdir_p(Rails.root.join("tmp", "cache", "downloads"), verbose: true)
     end
     desc "Precaches a download"
     task :precache, %i[doc_id download_type timeout] => [:environment] do |_t, args|
-      Geoblacklight.deprecation.warn(
-        "The geoblacklight:downloads:precache rake task is deprecated; GeoBlacklight 6 removes the generated download subsystem: downloads are direct links only, rendered by Geoblacklight::Document::DownloadLinksComponent"
-      )
       unless args[:doc_id] && args[:download_type] && args[:timeout]
         raise "Please supply required arguments [document_id, download_type and timeout]"
       end

data/package.json

@@ -1,37 +1,16 @@
 {
-  "name": "@geoblacklight/frontend",
-  "type": "module",
-  "version": "5.4.0",
+  "name": "geoblacklight",
+  "version": "1.0.0",
+  "main": "index.js",
+  "repository": "https://github.com/geoblacklight/geoblacklight.git",
+  "author": "Justin Coyne <jcoyne@justincoyne.com>",
   "license": "Apache-2.0",
-  "publishConfig": {
-    "access": "public"
+  "devDependencies": {
+    "prettier": "^3.8.3"
   },
   "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "watch": "vite build --watch"
-  },
-  "files": [
-    "app/assets",
-    "app/javascript"
-  ],
-  "module": "app/assets/javascripts/geoblacklight/geoblacklight.js",
-  "main": "app/assets/javascripts/geoblacklight/geoblacklight.umd.cjs",
-  "dependencies": {
-    "@github/auto-complete-element": "^3.6.2",
-    "@hotwired/stimulus": "^3.2.2",
-    "@popperjs/core": "^2.11.8",
-    "blacklight-frontend": "8",
-    "bootstrap": "^5.3.3",
-    "esri-leaflet": "^3.0.12",
-    "leaflet": "^1.9.4",
-    "leaflet.fullscreen": "^5.3.0",
-    "ol": "10.7.0",
-    "ol-pmtiles": "^2.0.2"
+    "lint": "prettier --check \"**/*.{js,json,yml,yaml}\"",
+    "format": "prettier --write \"**/*.{js,json,yml,yaml}\""
   },
-  "devDependencies": {
-    "jsdom": "^27.3.0",
-    "rollup-plugin-includepaths": "^0.2.4",
-    "vite": "^7.2.2"
-  }
+  "private": true
 }

data/schema/geoblacklight-schema-aardvark.json

@@ -47,15 +47,7 @@
       "type": "array",
       "items": {
         "type": "string",
-        "enum": [
-          "Datasets",
-          "Maps",
-          "Imagery",
-          "Collections",
-          "Websites",
-          "Web services",
-          "Other"
-        ]
+        "enum": ["Datasets", "Maps", "Imagery", "Collections", "Websites", "Web services", "Other"]
       }
     },
     "gbl_resourceType_sm": {

data/schema/readme.md

@@ -1,8 +1,7 @@
 #about the schema directory
 
-This directory contains two [JSON schema vocabulary](http://json-schema.org) files. These are provided for documentation and testing purposes.
+This directory contains a [JSON schema vocabulary](http://json-schema.org) file. It is provided for documentation and testing purposes.
 
-* geoblacklight-schema-1.0.json : This document is formatted in the [GeoBlacklight 1.0 Metadata version schema](https://opengeometadata.org/docs/gbl-1.0), compatible with Geoblacklight versions 2.0 to 3.7.
-* geoblacklight-schema-aardvark.json : This document is formatted in the [OpenGeoMetadata, version Aardvark schema](https://opengeometadata.org/docs/ogm-aardvark), compatible with Geoblacklight version 4.0.
+* geoblacklight-schema-aardvark.json : This document is formatted in the [OpenGeoMetadata, version Aardvark schema](https://opengeometadata.org/docs/ogm-aardvark), compatible with Geoblacklight version 4.0+.
 
-For more information on the metadata schemas for GeoBlacklight, see [opengeometadata.org](https://opengeometadata.org)
+For more information on the metadata schema for GeoBlacklight, see [opengeometadata.org](https://opengeometadata.org)

data/solr/conf/_rest_managed.json

@@ -1,3 +1,4 @@
 {
-  "initArgs":{},
-  "managedList":[]}
+  "initArgs": {},
+  "managedList": []
+}

data/solr/conf/schema.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="geoblacklight-schema" version="4.0">
+<schema name="geoblacklight-schema" version="1.6">
   <uniqueKey>id</uniqueKey>
   <fields>
     <field name="_version_" type="long"   stored="true" indexed="true"/>

data/solr/conf/solrconfig.xml

@@ -117,9 +117,9 @@
       <str name="q.alt">*:*</str>
       <str name="qf">
         text^1
-        dct_description_tmi^2
+        dct_description_ti^2
         dct_creator_tmi^3
-        dct_publisher_tmi^3
+        dct_publisher_ti^3
         dct_isPartOf_tmi^4
         dct_subject_tmi^5
         dct_spatial_tmi^5
@@ -127,16 +127,16 @@
         dct_title_ti^6
         dct_accessRights_ti^7
         dct_provider_ti^8
-        gbl_resourceClass_tmi^9
-        gbl_resourceType_tmi^9
-        dct_identifier_tmi^10
+        gbl_resourceClass_ti^9
+        gbl_resourceType_ti^9
+        dct_identifier_ti^10
         id_ti^10
       </str>
       <str name="pf"><!-- phrase boost within result set -->
         text^1
-        dct_description_tmi^2
+        dct_description_ti^2
         dct_creator_tmi^3
-        dct_publisher_tmi^3
+        dct_publisher_ti^3
         dct_isPartOf_tmi^4
         dct_subject_tmi^5
         dct_spatial_tmi^5
@@ -144,9 +144,9 @@
         dct_title_ti^6
         dct_accessRights_ti^7
         dct_provider_ti^8
-        gbl_resourceClass_tmi^9
-        gbl_resourceType_tmi^9
-        dct_identifier_tmi^10
+        gbl_resourceClass_ti^9
+        gbl_resourceType_ti^9
+        dct_identifier_ti^10
         id_ti^10
       </str>
       <bool name="facet">true</bool>

data/spec/components/geoblacklight/arcgis_component_spec.rb

@@ -4,19 +4,19 @@ require "spec_helper"
 
 RSpec.describe Geoblacklight::ArcgisComponent, type: :component do
   let(:component) { described_class.new(document: document, action: nil) }
-  subject(:rendered) do
-    render_inline_to_capybara_node(component)
-  end
   let(:document) { instance_double(SolrDocument, id: 123, arcgis_urls: ["https://www.stanford.edu"]) }
 
   it "shows link" do
-    expect(rendered).to have_css("a[href='#{Settings.ARCGIS_BASE_URL}?urls=https%3A%2F%2Fwww.stanford.edu']", text: "Open in ArcGIS Online")
+    render_inline(component)
+    expect(page).to have_css(
+      "a[href='#{Geoblacklight.configuration.arcgis_base_url}?urls=https%3A%2F%2Fwww.stanford.edu']", text: "Open in ArcGIS Online"
+    )
   end
 
   describe "#arcgis_link" do
     context "single url" do
       it "creates a single url param" do
-        expect(component.arcgis_link).to eq "#{Settings.ARCGIS_BASE_URL}?urls=https%3A%2F%2Fwww.stanford.edu"
+        expect(component.arcgis_link).to eq "#{Geoblacklight.configuration.arcgis_base_url}?urls=https%3A%2F%2Fwww.stanford.edu"
       end
     end
 
@@ -24,7 +24,7 @@ RSpec.describe Geoblacklight::ArcgisComponent, type: :component do
       let(:document) { instance_double(SolrDocument, id: 123, arcgis_urls: ["http://example.com/foo/MapServer", "http://example.com/foo/FeatureServer"]) }
 
       it "appends the url params" do
-        expect(component.arcgis_link).to eq "#{Settings.ARCGIS_BASE_URL}?urls=http%3A%2F%2Fexample.com%2Ffoo%2FMapServer&urls=http%3A%2F%2Fexample.com%2Ffoo%2FFeatureServer"
+        expect(component.arcgis_link).to eq "#{Geoblacklight.configuration.arcgis_base_url}?urls=http%3A%2F%2Fexample.com%2Ffoo%2FMapServer&urls=http%3A%2F%2Fexample.com%2Ffoo%2FFeatureServer"
       end
     end
   end

data/spec/components/geoblacklight/attribute_table_component_spec.rb

@@ -9,19 +9,17 @@ RSpec.describe Geoblacklight::AttributeTableComponent, type: :component do
     allow_any_instance_of(GeoblacklightHelper).to receive(:document_available?).and_return(true)
   end
 
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(document:))
-  end
-
   it "displays attribute table body element" do
-    expect(rendered).to have_selector(".attribute-table-body")
+    render_inline(described_class.new(document:))
+    expect(page).to have_selector(".attribute-table-body")
   end
 
   context "when the document is not inspectable" do
     before { allow(document).to receive(:inspectable?).and_return(false) }
 
     it "does not render the attribute table" do
-      expect(rendered).not_to have_selector(".attribute-table-body")
+      render_inline(described_class.new(document:))
+      expect(page).not_to have_selector(".attribute-table-body")
     end
   end
 
@@ -31,7 +29,8 @@ RSpec.describe Geoblacklight::AttributeTableComponent, type: :component do
     end
 
     it "does not render the attribute table" do
-      expect(rendered).not_to have_selector(".attribute-table-body")
+      render_inline(described_class.new(document:))
+      expect(page).not_to have_selector(".attribute-table-body")
     end
   end
 end

data/spec/components/geoblacklight/citation_component_spec.rb

@@ -5,13 +5,16 @@ require "spec_helper"
 RSpec.describe Geoblacklight::Document::CitationComponent, type: :component do
   describe "#geoblacklight_citation" do
     let(:document) { SolrDocument.new(fixture) }
-    let(:rendered) { render_inline_to_capybara_node(described_class.new(document: document)) }
+
+    before do
+      render_inline(described_class.new(document: document))
+    end
 
     context "when the identifier is a URL" do
       let(:fixture) { JSON.parse(read_fixture("solr_documents/restricted-line.json")) }
 
       it "creates a citation with the identifier link" do
-        expect(rendered)
+        expect(page)
           .to have_text "United States. National Oceanic and Atmospheric Administration. Circuit Rider Productions. (2002). 10 Meter Contours: Russian River Basin, California. [Shapefile]. Circuit Rider Productions. http://purl.stanford.edu/cg357zz032"
       end
     end
@@ -20,7 +23,7 @@ RSpec.describe Geoblacklight::Document::CitationComponent, type: :component do
       let(:fixture) { JSON.parse(read_fixture("solr_documents/tilejson.json")) }
 
       it "creates a citation with the schema.org references link" do
-        expect(rendered)
+        expect(page)
           .to have_text "Great Britain. War Office. General Staff. Geographical Section. (1908). The Balkans [and] Turkey : G.S.G.S. no. 2097 / War Office. General Staff. Geographical Section (TileJSON Fixture). [London] : War Office. General Staff. Geographical Section. General Staff, 1908-25.. https://catalog.princeton.edu/catalog/99125413918506421"
       end
     end
@@ -29,7 +32,7 @@ RSpec.describe Geoblacklight::Document::CitationComponent, type: :component do
       let(:fixture) { JSON.parse(read_fixture("solr_documents/no_spatial.json")) }
 
       it "creates a citation with the solr document link" do
-        expect(rendered)
+        expect(page)
           .to have_text "ASTER Global Emissivity Dataset 1-kilometer V003 - AG1KM. http://test.host/catalog/aster-global-emissivity-dataset-1-kilometer-v003-ag1kmcad20"
       end
     end

data/spec/components/geoblacklight/display_note_component_spec.rb

@@ -3,25 +3,25 @@
 require "spec_helper"
 
 RSpec.describe Geoblacklight::DisplayNoteComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(**kwargs))
+  before do
+    render_inline(described_class.new(**kwargs))
   end
 
   describe "prefixed" do
     let(:kwargs) { {display_note: "Warning: Full force applied."} }
     it "prefixed, includes display note and icon" do
-      expect(rendered).to have_selector("div.gbl-display-note.alert.alert-warning")
-      expect(rendered).to have_selector("span.blacklight-icons > svg")
-      expect(rendered).to have_text("Warning: Full force applied.")
+      expect(page).to have_selector("div.gbl-display-note.alert.alert-warning")
+      expect(page).to have_selector("span.blacklight-icons > svg")
+      expect(page).to have_text("Warning: Full force applied.")
     end
   end
 
   describe "non-prefixed" do
     let(:kwargs) { {display_note: "Simple note."} }
     it "non-prefixed, includes only default display note" do
-      expect(rendered).to have_selector("div.gbl-display-note.alert.alert-secondary")
-      expect(rendered).to_not have_selector("span.blacklight-icons > svg")
-      expect(rendered).to have_text("Simple note.")
+      expect(page).to have_selector("div.gbl-display-note.alert.alert-secondary")
+      expect(page).to_not have_selector("span.blacklight-icons > svg")
+      expect(page).to have_text("Simple note.")
     end
   end
 end

data/spec/components/geoblacklight/document_component_spec.rb

@@ -6,7 +6,6 @@ RSpec.describe Geoblacklight::DocumentComponent, type: :component do
   subject(:component) { described_class.new(document: document, show: true) }
 
   let(:view_context) { vc_test_controller.view_context }
-  let(:rendered) { render_inline_to_capybara_node(component) }
   let(:document) { view_context.document_presenter(presented_document) }
   let(:presented_document) { SolrDocument.new(JSON.parse(read_fixture(fixture))) }
   let(:fixture) { "solr_documents/actual-polygon1.json" }
@@ -23,22 +22,23 @@ RSpec.describe Geoblacklight::DocumentComponent, type: :component do
     vc_test_controller.action_name = "show"
     allow(vc_test_controller).to receive_messages(view_context: view_context, current_or_guest_user: User.new, blacklight_config: blacklight_config)
     allow(view_context).to receive_messages(search_session: {}, current_search_session: nil, current_bookmarks: [])
+    render_inline(component)
   end
 
   it "does not render any display notes" do
-    expect(rendered).not_to have_css(".gbl-display-note")
+    expect(page).not_to have_css(".gbl-display-note")
   end
 
   it "does not render index map content" do
-    expect(rendered).not_to have_css(".index-map-legend")
-    expect(rendered).not_to have_css(".viewer-information")
+    expect(page).not_to have_css(".index-map-legend")
+    expect(page).not_to have_css(".viewer-information")
   end
 
   context "when the document has display notes" do
     let(:fixture) { "solr_documents/display-note.json" }
 
     it "renders the display notes" do
-      expect(rendered).to have_css(".gbl-display-note")
+      expect(page).to have_css(".gbl-display-note")
     end
   end
 
@@ -46,11 +46,11 @@ RSpec.describe Geoblacklight::DocumentComponent, type: :component do
     let(:fixture) { "solr_documents/index-map-stanford.json" }
 
     it "renders the index map legend" do
-      expect(rendered).to have_css(".index-map-legend")
+      expect(page).to have_css(".index-map-legend")
     end
 
     it "renders the index map inspection area" do
-      expect(rendered).to have_css(".viewer-information")
+      expect(page).to have_css(".viewer-information")
     end
   end
 
@@ -58,11 +58,11 @@ RSpec.describe Geoblacklight::DocumentComponent, type: :component do
     let(:fixture) { "solr_documents/b1g_iiif_manifest.json" }
 
     it "displays the IIIF help text" do
-      expect(rendered).to have_text(I18n.t("geoblacklight.help_text.viewer_protocol.iiif.title"))
+      expect(page).to have_text(I18n.t("geoblacklight.help_text.viewer_protocol.iiif.title"))
     end
 
     it "uses the IIIF tag for the container" do
-      expect(rendered).to have_css("div#mirador")
+      expect(page).to have_css("div#mirador")
     end
   end
 
@@ -70,11 +70,11 @@ RSpec.describe Geoblacklight::DocumentComponent, type: :component do
     let(:fixture) { "solr_documents/public_pmtiles_princeton.json" }
 
     it "displays the PM Tiles help text" do
-      expect(rendered).to have_text(I18n.t("geoblacklight.help_text.viewer_protocol.pmtiles.title"))
+      expect(page).to have_text(I18n.t("geoblacklight.help_text.viewer_protocol.pmtiles.title"))
     end
 
     it "uses the Open Layers tag for the container" do
-      expect(rendered).to have_css("div#openlayers-viewer")
+      expect(page).to have_css("div#openlayers-viewer")
     end
   end
 
@@ -82,11 +82,11 @@ RSpec.describe Geoblacklight::DocumentComponent, type: :component do
     let(:fixture) { "solr_documents/actual-polygon1.json" }
 
     it "displays wms help text" do
-      expect(rendered).to have_text(I18n.t("geoblacklight.help_text.viewer_protocol.wms.title"))
+      expect(page).to have_text(I18n.t("geoblacklight.help_text.viewer_protocol.wms.title"))
     end
 
     it "uses the Leaflet tag for the container" do
-      expect(rendered).to have_css("div#leaflet-viewer")
+      expect(page).to have_css("div#leaflet-viewer")
     end
   end
 end

data/spec/components/geoblacklight/download_links_component_spec.rb

@@ -3,9 +3,6 @@
 require "spec_helper"
 
 RSpec.describe Geoblacklight::DownloadLinksComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(component)
-  end
   let(:downloadable) { true }
   let(:document) { instance_double(SolrDocument, id: 123, downloadable?: downloadable) }
   let(:component) { described_class.new(document: document) }
@@ -22,8 +19,9 @@ RSpec.describe Geoblacklight::DownloadLinksComponent, type: :component do
     end
 
     it "shows download link" do
-      expect(rendered).to have_text("Download")
-      expect(rendered).to have_text("Export Shapefile")
+      render_inline(component)
+      expect(page).to have_text("Download")
+      expect(page).to have_text("Export Shapefile")
     end
   end
 
@@ -36,8 +34,9 @@ RSpec.describe Geoblacklight::DownloadLinksComponent, type: :component do
       end
 
       it "does not render anything" do
-        expect(rendered).not_to have_text("Download")
-        expect(rendered).not_to have_text("Export Shapefile")
+        render_inline(component)
+        expect(page).not_to have_text("Download")
+        expect(page).not_to have_text("Export Shapefile")
       end
     end
 
@@ -45,8 +44,9 @@ RSpec.describe Geoblacklight::DownloadLinksComponent, type: :component do
       let(:downloadable) { false }
 
       it "does not render anything" do
-        expect(rendered).not_to have_text("Download")
-        expect(rendered).not_to have_text("Export Shapefile")
+        render_inline(component)
+        expect(page).not_to have_text("Download")
+        expect(page).not_to have_text("Export Shapefile")
       end
     end
   end
@@ -57,12 +57,13 @@ RSpec.describe Geoblacklight::DownloadLinksComponent, type: :component do
     let(:url) { "http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip" }
 
     it "generates a link to download the original file" do
-      expect(component.download_link_file(label, id, url)).to eq '<a contentUrl="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip" data-download="trigger" data-download-type="direct" data-download-id="test-id" href="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip">Test Link Text</a>'
+      expect(component.download_link_file(label, id,
+        url)).to eq '<a contentUrl="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip" data-download="trigger" data-download-type="direct" data-download-id="test-id" href="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip">Test Link Text</a>'
     end
   end
 
   describe "#download_link_iiif" do
-    let(:references_field) { Settings.FIELDS.REFERENCES }
+    let(:references_field) { Geoblacklight.configuration.fields.references }
     let(:document_attributes) do
       {
         references_field => {
@@ -83,7 +84,7 @@ RSpec.describe Geoblacklight::DownloadLinksComponent, type: :component do
   end
 
   describe "#iiif_jpg_url" do
-    let(:references_field) { Settings.FIELDS.REFERENCES }
+    let(:references_field) { Geoblacklight.configuration.fields.references }
     let(:document_attributes) do
       {
         references_field => {
@@ -111,8 +112,10 @@ RSpec.describe Geoblacklight::DownloadLinksComponent, type: :component do
     it "generates a link to download the JPG file from the IIIF server" do
       # Stub I18n to ensure the link can be customized via `export_` labels.
       allow(component).to receive(:t).with("geoblacklight.download.export_shapefile_link").and_return("Shapefile Export Customization")
-      allow(component).to receive(:t).with("geoblacklight.download.export_link", {download_format: "Shapefile Export Customization"}).and_return("Export Shapefile Export Customization")
-      expect(component.download_link_generated(download_type, document)).to eq '<a data-download-path="/download/test-id?type=SHAPEFILE" data-download="trigger" data-action="downloads#download:once" data-download-type="SHAPEFILE" data-download-id="test-id" href="">Export Shapefile Export Customization</a>'
+      allow(component).to receive(:t).with("geoblacklight.download.export_link",
+        {download_format: "Shapefile Export Customization"}).and_return("Export Shapefile Export Customization")
+      expect(component.download_link_generated(download_type,
+        document)).to eq '<a data-download-path="/download/test-id?type=SHAPEFILE" data-download="trigger" data-action="downloads#download:once" data-download-type="SHAPEFILE" data-download-id="test-id" href="">Export Shapefile Export Customization</a>'
     end
   end
 end

data/spec/components/geoblacklight/header_icons_component_spec.rb

@@ -3,8 +3,8 @@
 require "spec_helper"
 
 RSpec.describe Geoblacklight::HeaderIconsComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(document: document))
+  before do
+    render_inline(described_class.new(document: document))
   end
 
   let(:document) { SolrDocument.new(document_attributes) }
@@ -14,17 +14,12 @@ RSpec.describe Geoblacklight::HeaderIconsComponent, type: :component do
     {
       "gbl_resourceClass_sm" => resource_class,
       "gbl_resourceType_sm" => resource_type,
-      "schema_provider_s" => "Stanford",
       "dct_accessRights_s" => "Public"
     }
   end
 
-  it "renders the provider icon" do
-    expect(rendered).to have_css(".blacklight-icons-stanford")
-  end
-
   it "renders the access rights icon" do
-    expect(rendered).to have_css(".blacklight-icons-public")
+    expect(page).to have_css(".blacklight-icons-public")
   end
 
   context "when there are no resource types with icons" do
@@ -32,7 +27,7 @@ RSpec.describe Geoblacklight::HeaderIconsComponent, type: :component do
     let(:resource_type) { ["Census data", "Statistical maps"] }
 
     it "renders the resource class icon" do
-      expect(rendered).to have_css(".blacklight-icons-datasets")
+      expect(page).to have_css(".blacklight-icons-datasets")
     end
   end
 
@@ -41,7 +36,7 @@ RSpec.describe Geoblacklight::HeaderIconsComponent, type: :component do
     let(:resource_type) { ["Raster data"] }
 
     it "renders the resource type icon" do
-      expect(rendered).to have_css(".blacklight-icons-raster")
+      expect(page).to have_css(".blacklight-icons-raster")
     end
   end
 
@@ -50,7 +45,7 @@ RSpec.describe Geoblacklight::HeaderIconsComponent, type: :component do
     let(:resource_type) { ["Nautical charts", "Raster data"] }
 
     it "renders the resource type that has an icon" do
-      expect(rendered).to have_css(".blacklight-icons-raster")
+      expect(page).to have_css(".blacklight-icons-raster")
     end
   end
 end

data/spec/components/geoblacklight/homepage_feature_facet_component_spec.rb

@@ -3,38 +3,30 @@
 require "spec_helper"
 
 RSpec.describe Geoblacklight::HomepageFeatureFacetComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(**kargs))
-  end
-
   # Build a search
-  let(:context) { {whatever: :value} }
-  let(:service) { Blacklight::SearchService.new(config: blacklight_config, user_params: user_params, **context) }
-  let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
-  let(:user_params) { {} }
-  let(:blacklight_config) { Blacklight::Configuration.new }
-  let(:copy_of_catalog_config) { ::CatalogController.blacklight_config.deep_copy }
-  let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config.except(:adapter)) }
+  let(:service) { Blacklight::SearchService.new(config: blacklight_config, search_state:) }
+  let(:search_state) { Blacklight::SearchState.new({}, blacklight_config) }
+  let(:blacklight_config) { ::CatalogController.blacklight_config.deep_copy }
+  let(:facet_field) { Geoblacklight.configuration.fields.provider }
+  let(:facet_config) { blacklight_config.facet_fields[facet_field] }
+  let(:facet_field_presenter) { Blacklight::FacetFieldPresenter.new(facet_config, nil, vc_test_controller.view_context, nil) }
+  let(:response) { service.search_results }
+  let(:items) { response.aggregations[facet_field].items }
 
-  describe "homepage" do
-    before do
-      (@response, @document_list) = service.search_results
-    end
-
-    let(:kargs) do
-      {
-        icon: "home",
-        label: "geoblacklight.home.institution",
-        facet_field: Settings.FIELDS.PROVIDER,
-        response: @response
-      }
-    end
+  subject(:instance) do
+    described_class.new(
+      icon: "home",
+      label: "geoblacklight.home.institution",
+      facet_field_presenter: facet_field_presenter,
+      items: items
+    )
+  end
 
-    it "includes facet links" do
-      expect(rendered).to have_selector("div.category-block")
-      expect(rendered).to have_selector("div.category-icon")
-      expect(rendered).to have_selector("a.home-facet-link")
-      expect(rendered).to have_selector("a.more_facets_link")
-    end
+  it "includes facet links" do
+    render_inline(instance)
+    expect(page).to have_selector("div.category-block")
+    expect(page).to have_selector("div.category-icon")
+    expect(page).to have_selector("a.home-facet-link")
+    expect(page).to have_selector("a.more_facets_link")
   end
 end