geoblacklight 4.0.0.pre.alpha.1 → 4.0.0.pre.rc1

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -5,17 +5,6 @@ describe GeoblacklightHelper, type: :helper do
   include BlacklightHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TranslationHelper
-  describe '#render_facet_links' do
-    let(:subject_field) { Settings.FIELDS.SUBJECT }
-    it 'contains unique links' do
-      expect(self).to receive(:search_catalog_path).exactly(3).times.and_return("http://example.com/catalog?f[#{subject_field}][]=category")
-      html = Capybara.string(render_facet_links(subject_field, %w[Test Test Earth Science]))
-      expect(html).to have_css 'a', count: 3
-      expect(html).to have_css 'a', text: 'Test', count: 1
-      expect(html).to have_css 'a', text: 'Earth', count: 1
-      expect(html).to have_css 'a', text: 'Science', count: 1
-    end
-  end
 
   describe '#geoblacklight_icon' do
     it 'supports in use cases' do
@@ -59,8 +48,7 @@ describe GeoblacklightHelper, type: :helper 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
-      puts download_link_file(label, id, url)
-      expect(download_link_file(label, id, url)).to eq '<a contentUrl="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip" class="btn btn-default download download-original" 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(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
 
@@ -74,7 +62,7 @@ describe GeoblacklightHelper, type: :helper do
     end
 
     it 'generates a link to the HGL route' do
-      expect(download_link_hgl(text, document)).to eq '<a class="btn btn-default download download-original" data-blacklight-modal="trigger" data-download="trigger" data-download-type="harvard-hgl" data-download-id="test-id" href="/download/hgl/test-id">Test Link Text</a>'
+      expect(download_link_hgl(text, document)).to eq '<a data-blacklight-modal="trigger" data-download="trigger" data-download-type="harvard-hgl" data-download-id="test-id" href="/download/hgl/test-id">Test Link Text</a>'
     end
   end
 
@@ -95,7 +83,7 @@ describe GeoblacklightHelper, type: :helper do
 
     it 'generates a link to download the JPG file from the IIIF server' do
       assign(:document, document)
-      expect(helper.download_link_iiif).to eq '<a contentUrl="https://example.edu/image/full/full/0/default.jpg" class="btn btn-default download download-generated" data-download="trigger" href="https://example.edu/image/full/full/0/default.jpg">Original JPG</a>'
+      expect(helper.download_link_iiif).to eq '<a contentUrl="https://example.edu/image/full/full/0/default.jpg" data-download="trigger" href="https://example.edu/image/full/full/0/default.jpg">Original JPG</a>'
     end
   end
 
@@ -109,7 +97,10 @@ describe GeoblacklightHelper, type: :helper do
     end
 
     it 'generates a link to download the JPG file from the IIIF server' do
-      expect(download_link_generated(download_type, document)).to eq '<a class="btn btn-default download download-generated" data-download-path="/download/test-id?type=SHAPEFILE" data-download="trigger" data-download-type="SHAPEFILE" data-download-id="test-id" href="">Export</a>'
+      # Stub I18n to ensure the link can be customized via `export_` labels.
+      allow(helper).to receive(:t).and_call_original
+      allow(helper).to receive(:t).with('geoblacklight.download.export_shapefile_link').and_return('Shapefile Export Customization')
+      expect(helper.download_link_generated(download_type, document)).to eq '<a data-download-path="/download/test-id?type=SHAPEFILE" data-download="trigger" data-download-type="SHAPEFILE" data-download-id="test-id" href="">Export Shapefile Export Customization</a>'
     end
   end
 
@@ -149,8 +140,8 @@ describe GeoblacklightHelper, type: :helper do
       let(:document_attributes) do
         {
           value: 'This is a really long string that should get truncated when it gets rendered'\
-          'in the index view to give a brief description of the contents of a particular document'\
-          'indexed into Solr'
+                 'in the index view to give a brief description of the contents of a particular document'\
+                 'indexed into Solr'
         }
       end
       it 'truncates longer strings to 150 characters' do
@@ -164,8 +155,8 @@ describe GeoblacklightHelper, type: :helper do
       let(:document_attributes) do
         {
           value: ['This is a really long string that should get truncated when it gets rendered'\
-          'in the index view to give a brief description of the contents of a particular document'\
-          'indexed into Solr']
+                  'in the index view to give a brief description of the contents of a particular document'\
+                  'indexed into Solr']
         }
       end
       it 'truncates longer strings to 150 characters' do
@@ -190,20 +181,6 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  context 'when CartoHelper methods are within scope' do
-    include CartoHelper
-
-    before do
-      allow(helper).to receive(:application_name).and_return('GeoBlacklight')
-    end
-
-    describe '#carto_link' do
-      it 'aliases CartoHelper#carto_link' do
-        expect(helper.carto_link('http://demo.org/wfs/layer.json')).to eq(helper.carto_link('http://demo.org/wfs/layer.json'))
-      end
-    end
-  end
-
   describe '#render_web_services' do
     let(:reference) { instance_double(Geoblacklight::Reference, type: 'wms') }
     it 'with a reference to a defined partial' do
@@ -227,7 +204,7 @@ describe GeoblacklightHelper, type: :helper do
 
   describe '#leaflet_options' do
     it 'returns a hash of options for leaflet' do
-      expect(leaflet_options[:VIEWERS][:WMS][:CONTROLS]).to eq(['Opacity'])
+      expect(leaflet_options[:VIEWERS][:WMS][:CONTROLS]).to eq(%w[Opacity Fullscreen])
     end
   end
 

data/spec/lib/geoblacklight/document_presenter_spec.rb

@@ -7,7 +7,7 @@ describe Geoblacklight::DocumentPresenter do
   let(:request_context) { double(document_index_view_type: 'list') }
   let(:blacklight_config) do
     Blacklight::Configuration.new.configure do |config|
-      config.add_index_field 'layer_id_s'
+      config.add_index_field 'gbl_wxsIdentifier_s'
       config.add_index_field 'index_display'
       config.add_index_field 'period'
       config.add_index_field 'multi_display'
@@ -21,7 +21,7 @@ describe Geoblacklight::DocumentPresenter do
   let(:document) do
     SolrDocument.new(
       id: 1,
-      layer_id_s: 'druid:abc123',
+      gbl_wxsIdentifier_s: 'druid:abc123',
       non_index_field: 'do not render',
       period: 'Ends with period.',
       multi_display: %w[blue blah]
@@ -31,7 +31,7 @@ describe Geoblacklight::DocumentPresenter do
   describe '#index_fields_display' do
     let(:rendered_index_text) { subject.index_fields_display }
     let(:multi_valued_text) { document['multi_display'].join(' and ') }
-    let(:combined_fields) { document['layer_id_s'] + '. ' + document['period'] }
+    let(:combined_fields) { document['gbl_wxsIdentifier_s'] + '. ' + document['period'] }
 
     context 'with multi-valued field' do
       it 'each value is separated by comma' do

data/spec/lib/geoblacklight/download/geojson_download_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::GeojsonDownload do
-  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.GEOMETRY => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a GeojsonDownload object with specific options' do

data/spec/lib/geoblacklight/download/geotiff_download_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::GeotiffDownload do
-  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.GEOMETRY => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a GeotiffDownload object with specific options' do

data/spec/lib/geoblacklight/download/kmz_download_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::KmzDownload do
-  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.GEOMETRY => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a KmzDownload object with specific options' do

data/spec/lib/geoblacklight/download/shapefile_download_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::ShapefileDownload do
-  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.GEOMETRY => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a ShapefileDownload object with specific options' do

data/spec/lib/geoblacklight/download_spec.rb

@@ -171,8 +171,8 @@ describe Geoblacklight::Download do
 
     it 'creates a download url with params' do
       expect(download.url_with_params).to eq 'http://www.example.com/wms/?ser' \
-        'vice=wfs&version=2.0.0&request=GetFeature&srsName=EPSG%3A4326&output' \
-        'format=SHAPE-ZIP&typeName='
+                                             'vice=wfs&version=2.0.0&request=GetFeature&srsName=EPSG%3A4326&output' \
+                                             'format=SHAPE-ZIP&typeName='
     end
   end
 end

data/spec/lib/geoblacklight/metadata/base_spec.rb

@@ -27,6 +27,24 @@ describe Geoblacklight::Metadata::Base do
       end
     end
 
+    context "when there's a redirect" do
+      before do
+        allow(Faraday).to receive(:new).and_call_original
+        WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
+        stub_request(:get, 'http://purl.stanford.edu/cg357zz0321.mods').to_return(status: 301, headers: { location: 'https://purl.stanford.edu/cg357zz0321.mods' })
+        stub_request(:get, 'https://purl.stanford.edu/cg357zz0321.mods').to_return(status: 200, headers: { 'content-type' => 'application/xml' }, body: '<test>data</test>')
+      end
+
+      after do
+        WebMock.allow_net_connect!(net_http_connect_on_start: true)
+      end
+
+      it 'follows the redirect' do
+        expect(metadata.document).to be_a Nokogiri::XML::Document
+        expect(metadata.document.text).to eq 'data'
+      end
+    end
+
     context 'when attempts to connect to an endpoint URL fail' do
       subject { metadata.document }
 
@@ -119,7 +137,7 @@ describe Geoblacklight::Metadata::Base do
       allow(response).to receive(:body).and_return('<?xml version="1.0" encoding="utf-8" ?><!DOCTYPE metadata SYSTEM "http://www.fgdc.gov/metadata/fgdc-std-001-1998.dtd"><metadata></metadata>')
     end
 
-    it 'retrieves the metadata and transforms it into  the HTML' do
+    it 'retrieves the metadata and transforms it into the HTML' do
       allow(geocombine_metadata).to receive(:to_html).and_return(html)
       allow(connection).to receive(:get).and_return(response)
 

data/spec/lib/geoblacklight/references_spec.rb

@@ -135,7 +135,7 @@ describe Geoblacklight::References do
       let(:settings_klass) { class_double('Settings').as_stubbed_const }
       before do
         allow(settings_klass).to receive(:METADATA_SHOWN).and_return %w[iso19139 mods]
-        allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FORMAT: 'dc_format_s')
+        allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FORMAT: 'dct_format_s')
       end
       it 'is ordered by the configuration' do
         expect(complex_shapefile.shown_metadata_refs.first.type.to_s).to eq 'iso19139'

data/spec/lib/geoblacklight/relation/relation_response_spec.rb

@@ -41,6 +41,8 @@ describe Geoblacklight::Relation::RelationResponse do
 
   describe '#query_type' do
     it 'fails for a bad query type request' do
+      # Cache the existing relationship values and add a test value
+      relationships = Settings.RELATIONSHIPS_SHOWN
       Settings.add_source!({
                              RELATIONSHIPS_SHOWN: {
                                BAD: {
@@ -54,6 +56,9 @@ describe Geoblacklight::Relation::RelationResponse do
       Settings.reload!
 
       expect { relation_resp.BAD }.to raise_error(ArgumentError)
+
+      # Restore relationship values
+      Settings.RELATIONSHIPS_SHOWN = relationships
     end
   end
 end

data/spec/lib/geoblacklight/view_helper_override_spec.rb

@@ -12,16 +12,6 @@ describe Geoblacklight::ViewHelperOverride do
                                     .extend(described_class)
   end
 
-  describe 'spatial_parameters?' do
-    it 'does not have spatial parameters' do
-      fake_controller.params = {}
-      expect(fake_controller.spatial_parameters?).to be_falsey
-    end
-    it 'has spatial parameters' do
-      fake_controller.params = { bbox: '123' }
-      expect(fake_controller.spatial_parameters?).to be_truthy
-    end
-  end
   describe 'render_search_to_s_bbox' do
     it 'returns an empty string for no bbox' do
       fake_controller.params = {}

data/spec/models/concerns/geoblacklight/bbox_filter_field_spec.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Geoblacklight::BboxFilterField do
+  let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, blacklight_config, controller) }
+
+  let(:params) { {} }
+  let(:blacklight_config) do
+    Blacklight::Configuration.new.configure do |config|
+      config.add_facet_field 'bbox', filter_class: described_class
+    end
+  end
+  let(:controller) { double }
+
+  describe '#add' do
+    context 'with a ordinary parameter' do
+      it 'adds the parameter to the facets' do
+        filter = search_state.filter('bbox')
+        new_state = filter.add('140.143709 -65.487905 160.793791 86.107541')
+
+        expect(new_state.params).to include bbox: '140.143709 -65.487905 160.793791 86.107541'
+      end
+    end
+
+    context 'with a bounding box' do
+      it 'adds the parameter to the bbox parameter' do
+        filter = search_state.filter('bbox')
+        new_state = filter.add(Geoblacklight::BoundingBox.from_rectangle('140.143709 -65.487905 160.793791 86.107541'))
+
+        expect(new_state.params).to include bbox: '140.143709 -65.487905 160.793791 86.107541'
+      end
+    end
+  end
+
+  context 'with some existing data' do
+    let(:params) { { bbox: '140.143709 -65.487905 160.793791 86.107541' } }
+
+    describe '#add' do
+      it 'replaces the existing range' do
+        filter = search_state.filter('bbox')
+        new_state = filter.add(Geoblacklight::BoundingBox.from_rectangle('100.143709 -70.487905 100.793791 96.107541'))
+
+        expect(new_state.params).to include bbox: '100.143709 -70.487905 100.793791 96.107541'
+      end
+    end
+
+    describe '#remove' do
+      it 'removes the existing bbox' do
+        filter = search_state.filter('bbox')
+        new_state = filter.remove(Geoblacklight::BoundingBox.from_rectangle('140.143709 -65.487905 160.793791 86.107541'))
+
+        expect(new_state.params[:bbox]).to be_nil
+      end
+    end
+
+    describe '#values' do
+      let(:params) { { bbox: '140.143709 -65.487905 160.793791 86.107541' } }
+
+      it 'converts the parameters to a Geoblacklight::BoundingBox' do
+        filter = search_state.filter('bbox')
+
+        expect(filter.values.first).to be_a(Geoblacklight::BoundingBox).and(have_attributes(to_param: '140.143709 -65.487905 160.793791 86.107541'))
+      end
+    end
+  end
+
+  context 'with a malformed bbox' do
+    let(:params) { { bbox: 'totally-not-a-bbox' } }
+
+    it 'excludes it from the values' do
+      filter = search_state.filter('bbox')
+
+      expect(filter.values).to be_empty
+    end
+  end
+end

data/spec/models/concerns/geoblacklight/bbox_filter_query_spec.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Geoblacklight::BboxFilterQuery do
+  # Subject
+  subject(:bbox_filter_query) { described_class.new(filter, solr_params) }
+
+  let(:solr_params) { {} }
+
+  # Search State
+  let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, {}) }
+
+  let(:params) do
+    { bbox: '-180 -80 120 80' }
+  end
+
+  let(:facet_config) do
+    Blacklight::Configuration::FacetField.new(
+      key: 'bbox',
+      filter_class: Geoblacklight::BboxFilterField
+    )
+  end
+
+  # Filter
+  let(:filter) { Geoblacklight::BboxFilterField.new(facet_config, search_state) }
+
+  describe '#initialize' do
+    it 'initializes as a BboxFilterQuery object' do
+      expect(bbox_filter_query).to be_a described_class
+    end
+  end
+
+  describe '#envelope_bounds' do
+    it 'returns an BoundingBox envelope' do
+      expect(bbox_filter_query.envelope_bounds).to eq('ENVELOPE(-180, 120, 80, -80)')
+    end
+  end
+
+  describe '#boost' do
+    context 'without an explicit boost' do
+      before do
+        facet_config.within_boost = nil
+      end
+
+      it 'returns an default boost value' do
+        expect(bbox_filter_query.boost).to eq('^10')
+      end
+    end
+
+    context 'with an explicit boost' do
+      before do
+        facet_config.within_boost = 99
+      end
+
+      it 'applies boost based on configured Settings.BBOX_WITHIN_BOOST' do
+        expect(bbox_filter_query.boost).to eq('^99')
+      end
+    end
+  end
+
+  describe '#relevancy_boost' do
+    it 'returns a relevancy_boost' do
+      expect(bbox_filter_query.relevancy_boost[:bq].to_s).to include('IsWithin')
+    end
+
+    context 'with overlap boost' do
+      before do
+        facet_config.overlap_boost = 2
+      end
+
+      it 'applies overlapRatio when Settings.OVERLAP_RATIO_BOOST is configured' do
+        expect(bbox_filter_query.relevancy_boost[:bf].to_s).to include('$overlap^2')
+      end
+    end
+
+    context 'without an overlap boost' do
+      before do
+        facet_config.overlap_boost = nil
+      end
+
+      it 'does not apply overlapRatio when Settings.OVERLAP_RATIO_BOOST not configured' do
+        expect(bbox_filter_query.relevancy_boost).not_to have_key(:overlap)
+      end
+    end
+
+    context 'when local boost parameter is present' do
+      before do
+        solr_params[:bf] = ['local_boost^5']
+        facet_config.overlap_boost = 2
+      end
+
+      it 'appends overlap and includes the local boost' do
+        expect(bbox_filter_query.relevancy_boost[:bf].to_s).to include('$overlap^2')
+        expect(bbox_filter_query.relevancy_boost[:bf].to_s).to include('local_boost^5')
+      end
+    end
+  end
+
+  describe '#intersects_filter' do
+    it 'returns an Intersects query' do
+      expect(bbox_filter_query.intersects_filter).to include('Intersects')
+    end
+  end
+end

data/spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb

@@ -2,7 +2,8 @@
 require 'spec_helper'
 
 describe Geoblacklight::SolrDocument::Inspection do
-  let(:subject) { SolrDocument.new }
+  subject { SolrDocument.new }
+
   describe '#inspectable?' do
     it 'returns true for wms viewer protocol' do
       expect(subject).to receive(:viewer_protocol).and_return('wms')

data/spec/models/concerns/geoblacklight/suppressed_records_search_behavior_spec.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Geoblacklight::SuppressedRecordsSearchBehavior do
+  subject(:searcher) { search_builder.with(user_params) }
+
+  let(:user_params) { {} }
+  let(:solr_params) { { q: 'water' } }
+  let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
+  let(:context) { CatalogController.new }
+  let(:search_builder_class) do
+    Class.new(Blacklight::SearchBuilder).tap do |klass|
+      include Blacklight::Solr::SearchBuilderBehavior
+      klass.include(described_class)
+    end
+  end
+  let(:search_builder) { search_builder_class.new(context) }
+
+  describe '#hide_suppressed_records' do
+    it 'hides/filters suppressed records' do
+      expect(searcher.hide_suppressed_records(solr_params)).to include('-gbl_suppressed_b: true')
+    end
+  end
+
+  context 'when document action call like CatalogController#web_services' do
+    it 'does not hide/filter suppressed records' do
+      solr_params[:q] = "{!lucene}#{Settings.FIELDS.ID}:"
+      expect(searcher.hide_suppressed_records(solr_params)).to be_nil
+    end
+  end
+end

data/spec/presenters/geoblacklight/bbox_item_presenter_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Geoblacklight::BboxItemPresenter, type: :presenter do
+  subject(:presenter) do
+    described_class.new(facet_item, facet_config, view_context, facet_field, search_state)
+  end
+
+  let(:facet_item) { instance_double(Blacklight::Solr::Response::Facets::FacetItem) }
+  let(:filter_field) { instance_double(Blacklight::SearchState::FilterField, include?: true) }
+  let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'key') }
+  let(:facet_field) { instance_double(Blacklight::Solr::Response::Facets::FacetField) }
+  let(:view_context) { controller.view_context }
+  let(:search_state) { instance_double(Blacklight::SearchState, filter: filter_field) }
+  let(:controller) { CatalogController.new }
+
+  describe '#label' do
+    context 'with a single value' do
+      let(:facet_item) { 'blah' }
+
+      it 'uses the normal logic for item values' do
+        expect(presenter.label).to eq 'blah'
+      end
+    end
+
+    context 'with a bbox' do
+      let(:facet_item) { Geoblacklight::BoundingBox.new(-160, -80, 120, 70) }
+
+      it 'translates the bbox into some nice, human-readable html' do
+        expect(Capybara.string(presenter.label))
+          .to have_text('-160 -80 120 70')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ SimpleCov.start 'rails' do
   add_filter 'lib/tasks/geoblacklight.rake'
   add_filter '/spec'
   add_filter '.internal_test_app/'
+  minimum_coverage 100
 end
 
 require 'factory_bot'
@@ -30,6 +31,10 @@ require 'capybara/rspec'
 require 'selenium-webdriver'
 require 'webdrivers'
 
+# Setup webmock for specific tests
+require 'webmock/rspec'
+WebMock.allow_net_connect!(net_http_connect_on_start: true)
+
 Capybara.register_driver(:headless_chrome) do |app|
   Capybara::Selenium::Driver.load_selenium
   browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
@@ -43,7 +48,7 @@ Capybara.register_driver(:headless_chrome) do |app|
   Capybara::Selenium::Driver.new(app,
                                  browser: :chrome,
                                  http_client: http_client,
-                                 options: browser_options)
+                                 capabilities: [browser_options])
 end
 
 Capybara.javascript_driver = :headless_chrome

data/spec/test_app_templates/Gemfile.extra

@@ -1,2 +1,3 @@
 gem 'sprockets', '< 4'
 gem 'view_component', '!= 2.26.0'
+gem 'faraday', ENV["FARADAY_VERSION"].to_s != "" ? ENV["FARADAY_VERSION"] : '>= 1.0'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -20,6 +20,10 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 
+  def install_webpacker
+    run 'bundle exec rails webpacker:install'
+  end
+
   def run_blacklight_generator
     say_status('warning', 'GENERATING BL', :yellow)
 
@@ -30,10 +34,6 @@ class TestAppGenerator < Rails::Generators::Base
     generate 'geoblacklight:install', '-f'
   end
 
-  def integrate_webpacker
-    generate 'geoblacklight:webpacker', '-f'
-  end
-
   def fixtures
     FileUtils.mkdir_p 'spec/fixtures/solr_documents'
     directory 'solr_documents', 'spec/fixtures/solr_documents'

data/spec/views/catalog/_show_downloads.html.erb_spec.rb

@@ -13,18 +13,18 @@ describe 'catalog/_show_downloads.html.erb', type: :view do
       allow(document).to receive(:iiif_download).and_return({})
       allow(document).to receive(:download_types).and_return(shapefile: {})
     end
-    it 'renders the button group with primary and generated partials' do
+
+    it 'renders the downloads collapse partial' do
       expect(view).to receive(:document_downloadable?).and_return(true)
 
-      stub_template 'catalog/_downloads_primary.html.erb' => 'stubbed_primary_downloads'
-      stub_template 'catalog/_downloads_generated.html.erb' => 'stubbed_generated_downloads'
+      stub_template 'catalog/_downloads_collapse.html.erb' => 'stubbed_downloads_collapse'
 
       render
 
-      expect(rendered).to have_content 'stubbed_primary_downloads'
-      expect(rendered).to have_content 'stubbed_generated_downloads'
+      expect(rendered).to have_content 'stubbed_downloads_collapse'
     end
   end
+
   context 'document is not downloadable' do
     let(:document) { instance_double(SolrDocument, restricted?: true, same_institution?: true) }
     before do

data/template.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 gem 'blacklight', '~> 7.0'
-gem 'geoblacklight', '~> 3.0'
-gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
+gem 'geoblacklight', '~> 4.0'
 gem 'sprockets', '< 4.0' # Use sprockets less than 4.0, let webpacker users set this up themselves
 
 # Hack for https://github.com/rails/rails/issues/35153
 # Adapted from https://github.com/projectblacklight/blacklight/pull/2065
 gemfile = File.expand_path('Gemfile')
-IO.write(gemfile, File.open(gemfile) do |f|
+File.write(gemfile, File.open(gemfile) do |f|
   text = f.read
   text.gsub(/^gem 'sqlite3'$/, 'gem "sqlite3", "~> 1.3.6"')
 end)
@@ -16,6 +15,5 @@ run 'bundle install'
 
 generate 'blacklight:install', '--devise'
 generate 'geoblacklight:install', '-f'
-generate 'geoblacklight:webpacker', '-f'
 
 rake 'db:migrate'