geoblacklight 5.3.0 → 6.0.0.pre.alpha.1

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

data/spec/components/geoblacklight/iiif_drag_drop_component_spec.rb

@@ -8,7 +8,6 @@ RSpec.describe Geoblacklight::IiifDragDropComponent, type: :component do
     let(:item_viewer) { instance_double(Geoblacklight::ItemViewer, iiif_manifest: reference) }
     let(:document) { instance_double(SolrDocument, id: 123, item_viewer: item_viewer) }
     let(:component) { described_class.new(document: document) }
-    let(:rendered) { render_inline_to_capybara_node(component) }
 
     context "does not have viewer_endpoint url" do
       let(:endpoint) { nil }
@@ -21,9 +20,10 @@ RSpec.describe Geoblacklight::IiifDragDropComponent, type: :component do
     context "has viewer_endpoint url" do
       let(:endpoint) { "https://url.com/manifest.json" }
       it "renders iiif drag and drop icon" do
+        render_inline(component)
         expect(component.render?).to be true
-        expect(rendered).to have_selector(:css, ".blacklight-icons-iiif-drag-drop")
-        expect(rendered).to have_selector(:css, "a[href='https://url.com/manifest.json?manifest=https://url.com/manifest.json']")
+        expect(page).to have_selector(:css, ".blacklight-icons-iiif-drag-drop")
+        expect(page).to have_selector(:css, "a[href='https://url.com/manifest.json?manifest=https://url.com/manifest.json']")
       end
     end
   end

data/spec/components/geoblacklight/index_map_legend_component_spec.rb

@@ -5,28 +5,14 @@ require "spec_helper"
 RSpec.describe Geoblacklight::IndexMapLegendComponent, type: :component do
   let(:document) { instance_double(SolrDocument) }
 
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(document:))
-  end
-
   context "when the document has an index map" do
     before do
       allow(document).to receive_message_chain(:item_viewer, :index_map).and_return(true)
     end
 
-    it "shows available map text" do
-      expect(rendered).to have_text("Green tile indicates")
-      expect(rendered).to have_selector(:css, ".index-map-legend-default")
-    end
-
-    it "shows unavailable map text" do
-      expect(rendered).to have_text("Yellow tile indicates")
-      expect(rendered).to have_selector(:css, ".index-map-legend-unavailable")
-    end
-
-    it "shows selected map text" do
-      expect(rendered).to have_text("Blue tile indicates")
-      expect(rendered).to have_selector(:css, ".index-map-legend-selected")
+    it "renders the legend" do
+      render_inline(described_class.new(document:))
+      expect(page.text.strip).to include "Green tile indicates Map held by collection"
     end
   end
 
@@ -36,7 +22,8 @@ RSpec.describe Geoblacklight::IndexMapLegendComponent, type: :component do
     end
 
     it "does not render" do
-      expect(rendered.text.strip).to be_empty
+      render_inline(described_class.new(document:))
+      expect(page.text.strip).to be_empty
     end
   end
 end

data/spec/components/geoblacklight/item_map_viewer_component_spec.rb

@@ -3,8 +3,8 @@
 require "spec_helper"
 
 RSpec.describe Geoblacklight::ItemMapViewerComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(document:))
+  before do
+    render_inline(described_class.new(document: document))
   end
 
   context "IIIF viewer" do
@@ -12,7 +12,7 @@ RSpec.describe Geoblacklight::ItemMapViewerComponent, type: :component do
     let(:document) { SolrDocument.new(fixture) }
 
     it "uses the IIIF tag" do
-      expect(rendered).to have_css("div#mirador")
+      expect(page).to have_css("div#mirador")
     end
   end
 
@@ -21,7 +21,7 @@ RSpec.describe Geoblacklight::ItemMapViewerComponent, type: :component do
     let(:document) { SolrDocument.new(fixture) }
 
     it "uses the open layers tag" do
-      expect(rendered).to have_css("div#openlayers-viewer")
+      expect(page).to have_css("div#openlayers-viewer")
     end
   end
 
@@ -30,7 +30,7 @@ RSpec.describe Geoblacklight::ItemMapViewerComponent, type: :component do
     let(:document) { SolrDocument.new(fixture) }
 
     it "uses the IIIF tag" do
-      expect(rendered).to have_css("div#leaflet-viewer")
+      expect(page).to have_css("div#leaflet-viewer")
     end
   end
 end

data/spec/components/geoblacklight/login_link_component_spec.rb

@@ -3,9 +3,6 @@
 require "spec_helper"
 
 RSpec.describe Geoblacklight::LoginLinkComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(document: document))
-  end
   let(:document) { instance_double(SolrDocument, id: 123) }
 
   context "when rendering is required" do
@@ -16,7 +13,8 @@ RSpec.describe Geoblacklight::LoginLinkComponent, type: :component do
     end
 
     it "shows download link" do
-      expect(rendered).to have_text(I18n.t("geoblacklight.tools.login_to_view"))
+      render_inline(described_class.new(document: document))
+      expect(page).to have_text(I18n.t("geoblacklight.tools.login_to_view"))
     end
   end
 
@@ -27,7 +25,8 @@ RSpec.describe Geoblacklight::LoginLinkComponent, type: :component do
     end
 
     it "does not render anything" do
-      expect(rendered).not_to have_text(I18n.t("geoblacklight.tools.login_to_view"))
+      render_inline(described_class.new(document: document))
+      expect(page).not_to have_text(I18n.t("geoblacklight.tools.login_to_view"))
     end
   end
 end

data/spec/components/geoblacklight/search_result_component_spec.rb

@@ -12,7 +12,6 @@ RSpec.describe Geoblacklight::SearchResultComponent, type: :component do
       config.add_index_field "multi_display"
     end
   end
-  let(:solr_fields) { Settings.FIELDS }
   let(:presenter) do
     Blacklight::DocumentPresenter.new(document, request_context, blacklight_config)
   end
@@ -26,21 +25,18 @@ RSpec.describe Geoblacklight::SearchResultComponent, type: :component do
       multi_display: %w[blue blah]
     )
   end
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(document: presenter))
-  end
-
   before do
     allow(request_context).to receive(:snippit)
     allow_any_instance_of(BlacklightHelper).to receive(:link_to_document)
     allow_any_instance_of(GeoblacklightHelper).to receive(:blacklight_config).and_return(blacklight_config)
+    render_inline(described_class.new(document: presenter))
   end
 
   describe "#index_fields_display" do
     let(:multi_valued_text) { document["multi_display"].join(" and ") }
     let(:combined_fields) { document["gbl_wxsIdentifier_s"] + ". " + document["period"] }
 
-    subject(:index_fields_display) { rendered.find("[itemprop=description]").text }
+    subject(:index_fields_display) { page.find("[itemprop=description]").text }
 
     context "with multi-valued field" do
       it "each value is separated by comma" do

data/spec/components/geoblacklight/static_map_component_spec.rb

@@ -11,10 +11,10 @@ RSpec.describe Geoblacklight::StaticMapComponent, type: :component do
 
   before do
     allow(document).to receive(:viewer_protocol).and_return("map")
-    allow(Settings).to receive(:SIDEBAR_STATIC_MAP).and_return(["map"])
+    allow(Geoblacklight.configuration).to receive(:sidebar_static_map).and_return(["map"])
   end
 
-  context "when the protocol matches the SIDEBAR_STATIC_MAP setting" do
+  context "when the protocol matches the sidebar_static_map setting" do
     it "renders the static map" do
       expect(rendered.css("#static-map")).to be_present
     end

data/spec/components/geoblacklight/viewer_help_text_component_spec.rb

@@ -6,13 +6,10 @@ RSpec.describe Geoblacklight::ViewerHelpTextComponent, type: :component do
   let(:feature) { "viewer_protocol" }
   let(:key) { "wms" }
 
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(feature, key))
-  end
-
   context "when the help text exists for an existing viewer protocol" do
     it "shows correct help text title for wms" do
-      expect(rendered).to have_text(I18n.t("geoblacklight.help_text.viewer_protocol.wms.title"))
+      render_inline(described_class.new(feature, key))
+      expect(page).to have_text(I18n.t("geoblacklight.help_text.viewer_protocol.wms.title"))
     end
   end
 
@@ -22,7 +19,8 @@ RSpec.describe Geoblacklight::ViewerHelpTextComponent, type: :component do
     end
 
     it "shows missing help text class" do
-      expect(render_inline_to_capybara_node(described_class.new(feature, key))).to have_css(".translation-missing")
+      render_inline(described_class.new(feature, key))
+      expect(page).to have_css(".translation-missing")
     end
   end
 end