geoblacklight 4.0.0.pre.alpha.2 → 4.0.0.pre.rc2

data/spec/fixtures/solr_documents/tms.json

@@ -1,45 +1,42 @@
 {
-  "dct_title_s": "Quaternary Fault and Fold Database of the United States",
+  "dct_title_s": "Agricultural Districts, Columbia County NY, 2009 (TMS)",
   "dct_alternative_sm": [
     "tms"
   ],
   "dct_description_sm": [
-    "Quaternary Fault and Fold Database of the United States"
+    "These GIS files represent geographic boundaries for lands that are under the protection of NYS Agricultural District Law, administered by the New York State Department of Agriculture and Markets. The boundaries are derived from New York State Agricultural District, 1:24,000-scale, maps produced at county agencies. The district boundaries correspond to tax parcel data. District boundaries are joined into a file representing all of the Agricultural Districts within an entire county. Note that 2003 legislation allows lands to be added to districts on an annual basis. Electronic data provided here may predate those additions. Tax parcel detail and secondary rights-of-way are not included in this dataset. Rights-of-way for state and federal highways, railroads and utilities are only included when they are delineated on the original 1:24,000 scale maps. The data files are in ArcGIS shapefile format.  A Geographic Information System (ArcGIS) file intended to represent the lands within agricultural district. Please note that boundaries may be generalizations; precise information can be obtained from the county or town tax parcel information."
   ],
   "dct_language_sm": [
     "eng"
   ],
-  "dct_publisher_sm": [
-    "Geological Survey (U.S.)"
-  ],
-  "schema_provider_s": "Stanford",
+  "schema_provider_s": "Cornell",
   "gbl_resourceClass_sm": [
     "Datasets"
   ],
   "gbl_resourceType_sm": [
-    "Polyline data"
+    "Polygon"
   ],
   "dct_subject_sm": [
-    "Earthquakes",
-    "Faults"
+    "New York State Agricultural District boundaries",
+    "Agriculture and Markets",
+    "Agricultural Districts Mapping Program"
   ],
   "dcat_keyword_sm": [
     "GBL Fixture records"
   ],
   "dct_temporal_sm": [
-    "2020"
+    "2009"
   ],
-  "dct_issued_s": "1905-07-12",
+  "dct_issued_s": "2009-02-13",
   "dct_spatial_sm": [
-    "Earth (Planet)",
-    "North America"
+    "Columbia County NY"
   ],
-  "locn_geometry": "ENVELOPE(-156.02,-70.8,65.59,18.93)",
-  "dcat_centroid_ss": "42.260000000000005,-113.41",
+  "locn_geometry": "ENVELOPE(-73.918247, -73.367, 42.507614, 41.978298)",
+  "dcat_bbox": "ENVELOPE(-73.918247, -73.367, 42.507614, 41.978298)",
   "dct_accessRights_s": "Public",
   "dct_format_s": "Shapefile",
-  "dct_references_s": "{\"http://schema.org/url\":\"https://www.usgs.gov/natural-hazards/earthquake-hazards/faults\",\"https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification\":\"https://earthquake.usgs.gov/basemap/tiles/faults/{z}/{x}/{y}.png\",\"http://schema.org/downloadUrl\":\"https://earthquake.usgs.gov/static/lfs/nshm/qfaults/Qfaults_GIS.zip\"}",
-  "id": "6f47b103-9955-4bbe-a364-387039623106",
-  "gbl_mdModified_dt": "2021-06-11T18:44:16Z",
+  "dct_references_s": "{\"https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification\":\"https://cugir.library.cornell.edu/geoserver/gwc/service/tms/1.0.0/cugir%3Acugir007957@EPSG%3A3857@png/{z}/{x}/{y}.png\",\"http://schema.org/downloadUrl\":\"https://cugir-data.s3.amazonaws.com/00/79/57/cugir-007957.zip\"}",
+  "id": "cugir-007957",
+  "gbl_mdModified_dt": "2019-05-24T23:12:06.151Z",
   "gbl_mdVersion_s": "Aardvark"
 }

data/spec/fixtures/solr_documents/umn_metro_result1.json

@@ -25,7 +25,7 @@
     "Polygon data"
   ],
   "dcat_theme_sm": [
-    "Planning and Cadastral"
+    "Property"
   ],
   "dcat_keyword_sm": [
     "GBL Fixture records"
@@ -35,7 +35,8 @@
   ],
   "dct_issued_s": "2015-10-01",
   "gbl_indexYear_im": [
-    "2014"
+    "2014",
+    "2030"
   ],
   "gbl_dateRange_drsim": [
     "[2014 TO 2014]"
@@ -44,7 +45,8 @@
     "Minnesota"
   ],
   "locn_geometry": "ENVELOPE(-94.012,-92.732,45.415,44.471)",
-  "dcat_centroid_ss": "44.943,-93.372",
+  "dcat_bbox": "ENVELOPE(-94.012,-92.732,45.415,44.471)",
+  "dcat_centroid": "44.943,-93.372",
   "dct_accessRights_s": "Public",
   "dct_format_s": "Shapefile",
   "dct_references_s": "{\"http://schema.org/downloadUrl\":\"ftp://ftp.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_metc/plan_frmwrk2030dev_plan_ar2011/shp_plan_frmwrk2030dev_plan_ar2011.zip\",\"urn:x-esri:serviceType:ArcGIS#FeatureLayer\":\"https://arcgis.metc.state.mn.us/server/rest/services/GISLibrary/Framework2030PlanningAreas2011/FeatureServer/0\",\"http://schema.org/url\":\"https://gisdata.mn.gov/dataset/02236876-9c21-42f6-9870-d2562da8e44f\"}",

data/spec/fixtures/solr_documents/umn_state_result1.json

@@ -24,7 +24,7 @@
     "Raster data"
   ],
   "dcat_theme_sm": [
-    "Imagery and Base Maps"
+    "Imagery"
   ],
   "dcat_keyword_sm": [
     "GBL Fixture records"
@@ -43,7 +43,8 @@
     "Minnesota"
   ],
   "locn_geometry": "ENVELOPE(-97.612501,-88.842351,49.464145,42.906949)",
-  "dcat_centroid_ss": "46.185547,-93.227426",
+  "dcat_bbox": "ENVELOPE(-97.612501,-88.842351,49.464145,42.906949)",
+  "dcat_centroid": "46.185547,-93.227426",
   "dct_accessRights_s": "Public",
   "dct_format_s": "ArcGRID",
   "dct_references_s": "{\"http://schema.org/downloadUrl\":\"ftp://gdrs.dnr.state.mn.us/gdrs/data/pub/us_mn_state_dnr/fgdb_base_usgs_scanned_topo_100k_drg.zip\",\"http://schema.org/url\":\"https://gisdata.mn.gov/dataset/2eddde2f-c222-41ca-bd07-2fd74a21f4de\"}",

data/spec/fixtures/solr_documents/umn_state_result2.json

@@ -24,14 +24,11 @@
     "Raster data"
   ],
   "dcat_theme_sm": [
-    "Imagery and Base Maps"
+    "Imagery"
   ],
   "dcat_keyword_sm": [
     "GBL Fixture records"
   ],
-  "dct_isPartOf_sm": [
-    "Minnesota Geospatial Commons"
-  ],
   "dct_temporal_sm": [
     "1998"
   ],
@@ -46,7 +43,8 @@
     "Minnesota"
   ],
   "locn_geometry": "ENVELOPE(-97.991522,-87.177541,49.892443,42.891013)",
-  "dcat_centroid_ss": "46.391728,-92.5845315",
+  "dcat_bbox": "ENVELOPE(-97.991522,-87.177541,49.892443,42.891013)",
+  "dcat_centroid": "46.391728,-92.5845315",
   "dct_accessRights_s": "Public",
   "dct_format_s": "GeoTIFF",
   "dct_references_s": "{\"http://schema.org/downloadUrl\":\"ftp://ftp.gisdata.mn.gov/pub/gdrs/data/pub/us_mn_state_dnr/base_usgs_scanned_topo_250k_drg/fgdb_base_usgs_scanned_topo_250k_drg.zip\",\"http://schema.org/url\":\"https://gisdata.mn.gov/dataset/e9c71086-6b25-4950-8e1c-84c2794e3382\"}",

data/spec/fixtures/solr_documents/uva_slug_colon.json

@@ -34,7 +34,8 @@
     "[2015 TO 2018]"
   ],
   "locn_geometry": "ENVELOPE(-76.346,-76.176,36.971,36.82)",
-  "dcat_centroid_ss": "36.8955,-76.261",
+  "dcat_bbox": "ENVELOPE(-76.346,-76.176,36.971,36.82)",
+  "dcat_centroid": "36.8955,-76.261",
   "dct_accessRights_s": "Public",
   "dct_format_s": "Shapefile",
   "gbl_wxsIdentifier_s": "Norfolk:police_point",

data/spec/fixtures/solr_documents/wmts-multiple.json

@@ -0,0 +1,41 @@
+{
+    "gbl_mdVersion_s": "Aardvark",
+    "dct_identifier_sm": [
+        "ark:/99999/fk4db9hn29"
+    ],
+    "id": "princeton-fk4db9hn29",
+    "dct_title_s": "Orthofoto 2016 Wien (WMTS)",
+    "locn_geometry": "ENVELOPE(16.133423, 16.626434, 48.3348, 48.106056)",
+    "dcat_bbox": "ENVELOPE(16.133423, 16.626434, 48.3348, 48.106056)",
+    "schema_provider_s": "Princeton",
+    "dct_accessRights_s": "Public",
+    "dct_description_sm": [
+        "The Vienna orthophoto from the year 2016 covers the entire city area with a pixel size of 15 centimeters. The aerial images were taken on 18th and 27th of March and 5th of April 2016."
+    ],
+    "dct_creator_sm": [
+        "Magistrat Wien - Magistratsabteilung 41 - Stadtvermessung"
+    ],
+    "dct_spatial_sm": [
+        "Vienna",
+        "Austria"
+    ],
+    "dct_temporal_sm": [
+        "2022"
+    ],
+    "gbl_indexYear_im": [
+        "2022"
+    ],
+    "gbl_mdModified_dt": "2022-02-04T22:13:37Z",
+    "gbl_wxsIdentifier_s": "lb2016",
+    "dct_references_s": "{\"http://www.opengis.net/def/serviceType/ogc/wmts\":\"https://maps.wien.gv.at/wmts/1.0.0/WMTSCapabilities.xml\"}",
+    "layer_geom_type_s": "Raster",
+    "gbl_resourceClass_sm": [
+        "Imagery"
+    ],
+    "gbl_resourceType_sm": [
+        "Aerial photographs",
+        "Raster data"
+    ],
+    "dct_format_s": "GeoTIFF",
+    "dct_issued_s": "2016-01-01T00:00:00Z"
+}

data/spec/fixtures/solr_documents/wmts-single-layer.json

@@ -0,0 +1,48 @@
+{
+    "gbl_mdVersion_s": "Aardvark",
+    "dct_identifier_sm": [
+      "ark:/99999/fk4544658v"
+    ],
+    "id": "princeton-fk4544658v-wmts",
+    "dct_title_s": "The Balkans [and] Turkey : G.S.G.S. no. 2097 / War Office. General Staff. Geographical Section (WMTS Fixture)",
+    "locn_geometry": "ENVELOPE(19.333333, 29.333333, 43.083333, 39.75)",
+    "dcat_bbox": "ENVELOPE(19.333333, 29.333333, 43.083333, 39.75)",
+    "schema_provider_s": "Princeton",
+    "dct_accessRights_s": "Public",
+    "dct_description_sm": [
+      "Relief shown by contours approximately 100 feet interval, spot heights, and shading. Title varies; some sheets are titled \"Turkey\". Shows international boundaries, railways, 2 categories of roads, telegraph lines, places of worship, ruins. Constantinople latest edition map has a glossary."
+    ],
+    "dct_creator_sm": [
+        "Great Britain. War Office. General Staff. Geographical Section"
+    ],
+    "dct_language_sm": [
+      "eng"
+    ],
+    "dct_publisher_sm": [
+      "[London] : War Office. General Staff. Geographical Section. General Staff, 1908-25."
+    ],
+    "dct_subject_sm": [
+        "Balkan Peninsula Maps",
+        "Turkey Maps",
+        "Topographic Maps"
+    ],
+    "dct_spatial_sm": [
+        "Balkan Peninsula",
+        "Turkey"
+    ],
+    "dct_issued_s": 1908,
+    "gbl_indexYear_im": [
+        "1908"
+    ],
+    "gbl_mdModified_dt": "2022-02-03T22:13:40Z",
+    "gbl_wxsIdentifier_s": "mosaic",
+    "dct_references_s": "{\"http://schema.org/url\":\"https://catalog.princeton.edu/catalog/99125413918506421\",\"http://schema.org/thumbnailUrl\":\"https://figgy-staging.princeton.edu/downloads/6b55d939-7188-4bce-9550-0ac535441f22/file/9042b887-da2e-4aa9-9ca5-d3ba77f440c4\",\"http://iiif.io/api/image\":\"https://iiif-cloud-staging.princeton.edu/iiif/2/05%2F71%2F04%2F0571046f9c7149a3b950899323f70788%2Fintermediate_file/info.json\",\"http://iiif.io/api/presentation#manifest\":\"https://figgy-staging.princeton.edu/concern/scanned_maps/2a91d82c-541c-426c-b787-cc62afe8f248/manifest\",\"http://www.opengis.net/def/serviceType/ogc/wmts\":\"https://map-tiles-staging.princeton.edu/mosaicjson/WMTSCapabilities.xml?id=2a91d82c541c426cb787cc62afe8f248\"}",
+    "gbl_resourceClass_sm": [
+        "Maps",
+        "Web services"
+    ],
+    "gbl_resourceType_sm": [
+        "Military maps",
+        "Topographic maps"
+    ]
+}

data/spec/fixtures/solr_documents/xyz.json

@@ -0,0 +1,46 @@
+{
+  "dct_identifier_sm": [
+    "6f47b103-9955-4bbe-a364-387039623106"
+  ],
+  "dct_title_s": "Quaternary Fault and Fold Database of the United States (XYZ)",
+  "dct_description_sm":[
+    "Quaternary Fault and Fold Database of the United States"
+  ],
+  "dct_accessRights_s": "Public",
+  "schema_provider_s": "Stanford",
+  "dct_references_s": "{\"http://schema.org/url\":\"https://www.usgs.gov/natural-hazards/earthquake-hazards/faults\",\"https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames\":\"https://earthquake.usgs.gov/basemap/tiles/faults/{z}/{x}/{y}.png\",\"http://schema.org/downloadUrl\":\"https://earthquake.usgs.gov/static/lfs/nshm/qfaults/Qfaults_GIS.zip\"}",
+  "id": "6f47b103-9955-4bbe-a364-387039623106-xyz",
+  "gbl_resourceClass_sm": [
+    "Datasets",
+    "Web services"
+  ],
+  "gbl_resourceType_sm": [
+    "Line data"
+  ],
+  "dct_format_s": "Shapefile",
+  "dct_language_sm": [
+    "eng"
+  ],
+  "dct_publisher_sm": [
+    "Geological Survey (U.S.)"
+  ],
+  "dct_subject_sm": [
+    "Earthquakes",
+    "Faults"
+  ],
+  "dct_issued_s": 2020,
+  "gbl_indexYear_im": [
+    "2020"
+  ],
+  "dct_temporal_sm": [
+    "2020"
+  ],
+  "dct_spatial_sm": [
+    "Earth (Planet)",
+    "North America"
+  ],
+  "locn_geometry": "ENVELOPE(-156.02, -70.80, 65.59, 18.93)",
+  "dcat_bbox": "ENVELOPE(-156.02, -70.80, 65.59, 18.93)",
+  "gbl_mdModified_dt": "2021-06-11T17:55:01Z",
+  "gbl_mdVersion_s": "Aardvark"
+}

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/metadata_transformer/fgdc_spec.rb

@@ -6,7 +6,7 @@ describe Geoblacklight::MetadataTransformer::Fgdc do
     described_class.new(metadata)
   end
   let(:fgdc_html) { File.read(Rails.root.join('spec', 'fixtures', 'metadata', 'fgdc.html')) }
-  let(:metadata) { instance_double('Geoblacklight::Metadata::Fgdc') }
+  let(:metadata) { instance_double(Geoblacklight::Metadata::Fgdc) }
 
   describe '#transform' do
     before do

data/spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb

@@ -6,7 +6,7 @@ describe Geoblacklight::MetadataTransformer::Iso19139 do
     described_class.new(metadata)
   end
   let(:iso_html) { File.read(Rails.root.join('spec', 'fixtures', 'metadata', 'iso.html')) }
-  let(:metadata) { instance_double('Geoblacklight::Metadata::Iso19139') }
+  let(:metadata) { instance_double(Geoblacklight::Metadata::Iso19139) }
 
   describe '#transform' do
     before do

data/spec/lib/geoblacklight/references_spec.rb

@@ -132,10 +132,12 @@ describe Geoblacklight::References do
       expect(complex_shapefile.shown_metadata_refs.last.type.to_s).to eq 'iso19139'
     end
     context 'with an overridden order for the formats' 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')
+        stub_const('Settings', Module.new)
+        allow(Settings).to receive_messages(
+          METADATA_SHOWN: %w[iso19139 mods],
+          FIELDS: 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/lib/geoblacklight/wms_layer_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Geoblacklight::WmsLayer do
   let(:wms_layer) { described_class.new(params) }
   let(:rails_4_params) { { 'URL' => 'http://www.example.com/', 'X' => '277' } }
-  let(:rails_5_params) { instance_double('ActionController::Parameters') }
+  let(:rails_5_params) { instance_double(ActionController::Parameters) }
 
   before do
     allow(rails_5_params).to receive(:to_h).and_return('URL' => 'http://www.example.com/', 'X' => '277')