geoblacklight 4.4.1 → 5.0.0.pre.alpha.11

data/spec/fixtures/solr_documents/esri-tiled_map_layer.json

@@ -1,48 +1,69 @@
 {
-  "dct_title_s": "Soil Survey Geographic (SSURGO)",
-  "dct_alternative_sm": [
-    "esri-tiled_map_layer"
-  ],
+  "dct_title_s": "Minnesota Land Cover Classification and Impervious Surface Area by Landsat and Lidar (2013 Update)",
   "dct_description_sm": [
-    "ArcGIS tiled map layer. ",
-    "This map shows the Soil Survey Geographic (SSURGO) by the United States Department of Agriculture's Natural Resources Conservation Service. It also shows data that was developed by the National Cooperative Soil Survey and supersedes the State Soil Geographic (STATSGO) dataset published in 1994. SSURGO digitizing duplicates the original soil survey maps. This level of mapping is designed for use by landowners, townships, and county natural resource planning and management. The user should be knowledgeable of soils data and their characteristics. The smallest scale map shows the Global Soil Regions map by the United States Department of Agriculture’s Natural Resources Conservation Service."
+    "This is a 15-meter raster dataset of a land cover and impervious surface classification for 2013, level two classification. The classification was created using a combination of multitemporal Landsat 8 data and LiDAR data with Object-based image analysis. By using objects instead of pixels we were able to utilize multispectral data along with spatial and contextual information of objects such as shape, size, texture and LiDAR-derived metrics to distinguish different land cover types. While OBIA has become the standard procedure for classification of high resolution imagery we found that it works equally well with Landsat imagery. For the objects classified as urban or developed, a regression model relating the Landsat greenness variable to percent impervious was developed to estimate and map the percent impervious surface area at the pixel level."
   ],
   "dct_language_sm": [
     "eng"
   ],
-  "dct_publisher_sm": [
-    "United States Department of Agriculture, Natural Resources Conservation Service"
+  "dct_creator_sm": [
+    "Bauer, Marvin E.",
+    "Knight, Joe F.",
+    "Rampi, Lian P."
   ],
-  "schema_provider_s": "NYU",
+  "schema_provider_s": "University of Minnesota",
   "gbl_resourceClass_sm": [
-    "Maps"
+    "Datasets"
   ],
   "gbl_resourceType_sm": [
-    "Raster data"
+    "Vector data",
+    "Raster data",
+    "LiDAR"
+  ],
+  "dcat_theme_sm": [
+    "Imagery"
   ],
   "dcat_keyword_sm": [
-    "GBL Fixture records"
+    "Lidar",
+    "Landsat Satellites",
+    "Land cover",
+    "2022-creator-sprint"
   ],
   "dct_temporal_sm": [
-    "2010"
+    "2013"
   ],
+  "dct_issued_s": "2016-08-03",
   "gbl_indexYear_im": [
-    2010
+    2013
   ],
   "gbl_dateRange_drsim": [
-    "[2010 TO 2010]"
+    "[2013 TO 2013]"
+  ],
+  "dct_spatial_sm": [
+    "Minnesota"
+  ],
+  "locn_geometry": "POLYGON((-97.23 49.37, -89.53 49.37, -89.53 43.5, -97.23 43.5, -97.23 49.37))",
+  "dcat_bbox": "ENVELOPE(-97.23,-89.53,49.37,43.5)",
+  "dcat_centroid": "46.435,-93.38",
+  "pcdm_memberOf_sm": [
+    "dc8c18df-7d64-4ff4-a754-d18d0891187d"
+  ],
+  "dct_isPartOf_sm": [
+    "05d-03"
+  ],
+  "dct_rights_sm": [
+    "https://conservancy.umn.edu/pages/drum/policies/#terms-of-use"
+  ],
+  "dct_license_sm": [
+    "http://creativecommons.org/publicdomain/zero/1.0/"
   ],
-  "locn_geometry": "ENVELOPE(-129.4956,-64.4393,48.6336,21.8079)",
-  "dcat_bbox": "ENVELOPE(-129.4956,-64.4393,48.6336,21.8079)",
-  "dcat_centroid": "35.22075,-96.96745",
   "dct_accessRights_s": "Public",
   "dct_format_s": "GeoTIFF",
-  "gbl_wxsIdentifier_s": "test-soil-survey_map",
-  "dct_references_s": "{\"urn:x-esri:serviceType:ArcGIS#TiledMapLayer\":\"http://services.arcgisonline.com/arcgis/rest/services/Specialty/Soil_Survey_Map/MapServer\"}",
-  "id": "nyu-test-soil-survey-map",
+  "dct_references_s": "{\"http://lccn.loc.gov/sh85035852\":\"https://conservancy.umn.edu/bitstream/handle/11299/181555/Classification%20scheme%20for%20Level%201%20and%202%20land%20cover%20classes%202013.pdf\",\"http://schema.org/downloadUrl\":[{\"label\":\"Original GeoTIFF\",\"url\":\"https://conservancy.umn.edu/bitstream/handle/11299/181555/Statewide_FinalMap_2013_2014_v2.zip\"}],\"http://www.opengis.net/cat/csw/csdgm\":\"https://conservancy.umn.edu/bitstream/handle/11299/181555/Statewide_LandCoverMetadata_MN_2013_v2.xml\",\"http://www.w3.org/1999/xhtml\":\"https://conservancy.umn.edu/bitstream/handle/11299/181555/Statewide_LandCover_Metadata_MN_2013_v2.html\",\"http://schema.org/url\":\"http://doi.org/10.13020/D6JP4S\",\"urn:x-esri:serviceType:ArcGIS#TiledMapLayer\":\"https://tiles.arcgis.com/tiles/8df8p0NlLFEShl0r/arcgis/rest/services/mn_landcover_impervious_2013v2_tiles/MapServer\"}",
+  "id": "31567cf1-bad8-4bc5-8d57-44b96c207ecc",
   "dct_identifier_sm": [
-    "test-soil-survey-map"
+    "http://doi.org/10.13020/D6JP4S",
+    "http://hdl.handle.net/11299/181555"
   ],
-  "gbl_mdModified_dt": "2021-06-01T22:14:15Z",
   "gbl_mdVersion_s": "Aardvark"
-}
+}

data/spec/fixtures/solr_documents/harvard_raster.json

@@ -54,7 +54,7 @@
   "dct_accessRights_s": "Public",
   "dct_format_s": "GeoTIFF",
   "gbl_wxsIdentifier_s": "cite:G7064_S2_1834_K3",
-  "dct_references_s": "{\"http://schema.org/DownloadAction\":\"http://pelham.lib.harvard.edu:8080/HGL/HGLOpenDelivery\",\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://pelham.lib.harvard.edu:8090/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://pelham.lib.harvard.edu:8090/geoserver/wms\",\"http://www.opengis.net/cat/csw/csdgm\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml\"}",
+  "dct_references_s": "{\"http://www.opengis.net/def/serviceType/ogc/wcs\":\"http://pelham.lib.harvard.edu:8090/geoserver/wcs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://pelham.lib.harvard.edu:8090/geoserver/wms\",\"http://www.opengis.net/cat/csw/csdgm\":\"https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml\"}",
   "id": "harvard-g7064-s2-1834-k3",
   "dct_identifier_sm": [
     "urn:hul.harvard.edu:HARVARD.SDE2.G7064_S2_1834_K3"

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

@@ -37,6 +37,7 @@
   "dcat_centroid": "42.2063055,-75.775105",
   "dct_accessRights_s": "Public",
   "dct_format_s": "Shapefile",
+  "gbl_wxsIdentifier_s": "cugir007950",
   "dct_references_s": "{\"http://schema.org/downloadUrl\":[{\"url\":\"https://cugir-data.s3.amazonaws.com/00/79/50/cugir-007950.zip\",\"label\":\"Shapefile\"},{\"url\":\"https://cugir-data.s3.amazonaws.com/00/79/50/agBROO.pdf\",\"label\":\"PDF\"},{\"url\":\"https://cugir-data.s3.amazonaws.com/00/79/50/agBROO2011.kmz\",\"label\":\"KMZ\"}],\"http://www.opengis.net/cat/csw/csdgm\":\"https://cugir-data.s3.amazonaws.com/00/79/50/fgdc.xml\",\"http://www.w3.org/1999/xhtml\":\"https://cugir-data.s3.amazonaws.com/00/79/50/fgdc.html\",\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"https://cugir.library.cornell.edu/geoserver/cugir/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://cugir.library.cornell.edu/geoserver/cugir/wms\"}",
   "id": "cugir-007950",
   "gbl_mdModified_dt": "2021-06-11T18:39:49Z",

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -11,7 +11,7 @@ describe GeoblacklightHelper, type: :helper do
     it "supports in use cases" do
       {
         "Paper map" => "paper-map",
-        "Michigan State" => "michigan-state",
+        "Michigan State University" => "michigan-state-university",
         "CD ROM" => "cd-rom",
         "Lewis & Clark" => "lewis-clark"
       }.each_key do |key|
@@ -23,85 +23,9 @@ describe GeoblacklightHelper, type: :helper do
       html = Capybara.string(geoblacklight_icon(nil))
       expect(html).to have_css ".icon-missing"
     end
-  end
-
-  describe "#proper_case_format" do
-    it "returns a properly cased format" do
-      expect(proper_case_format("GEOJSON")).to eq "GeoJSON"
-    end
-  end
-
-  describe "#download_text" do
-    it "returns download text concatenated with proper case format" do
-      expect(download_text("GEOJSON")).to eq "Original GeoJSON"
-    end
-  end
-
-  describe "#download_text" do
-    it "returns download text concatenated with proper case format" do
-      expect(download_text("GEOJSON")).to eq "Original GeoJSON"
-    end
-  end
-
-  describe "#download_link_file" do
-    let(:label) { "Test Link Text" }
-    let(:id) { "test-id" }
-    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(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_hgl" do
-    let(:text) { "Test Link Text" }
-    let(:document) { instance_double(SolrDocument) }
-
-    before do
-      allow(document).to receive(:id).and_return("test-id")
-      allow(document).to receive(:to_s).and_return("test-id")
-    end
-
-    it "generates a link to the HGL route" do
-      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
-
-  describe "#download_link_iiif" do
-    let(:references_field) { Settings.FIELDS.REFERENCES }
-    let(:document_attributes) do
-      {
-        references_field => {
-          "http://iiif.io/api/image" => "https://example.edu/image/info.json"
-        }.to_json
-      }
-    end
-    let(:document) { SolrDocument.new(document_attributes) }
-
-    before do
-      allow_any_instance_of(Geoblacklight::Reference).to receive(:to_hash).and_return(iiif: "https://example.edu/image/info.json")
-    end
-
-    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" data-download="trigger" href="https://example.edu/image/full/full/0/default.jpg">Original JPG</a>'
-    end
-  end
-
-  describe "#download_link_generated" do
-    let(:download_type) { "SHAPEFILE" }
-    let(:document) { instance_double(SolrDocument) }
-
-    before do
-      allow(document).to receive(:id).and_return("test-id")
-      allow(document).to receive(:to_s).and_return("test-id")
-    end
-
-    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(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>'
+    it "works with settings icon mapping" do
+      html = Capybara.string(geoblacklight_icon("ohio-state"))
+      expect(html).to have_css ".blacklight-icons-the-ohio-state-university"
     end
   end
 
@@ -182,30 +106,9 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  describe "#render_web_services" do
-    let(:reference) { instance_double(Geoblacklight::Reference, type: "wms") }
-    it "with a reference to a defined partial" do
-      expect(helper).to receive(:render)
-        .with(partial: "web_services_wms", locals: {reference: reference})
-      helper.render_web_services(reference)
-    end
-    context "when the partial is missing" do
-      let(:reference) { instance_double(Geoblacklight::Reference, type: "iiif") }
-
-      it "with a reference to a missing partial" do
-        expect(helper).to receive(:render)
-          .with(partial: "web_services_iiif", locals: {reference: reference})
-          .and_raise ActionView::MissingTemplate.new({}, "", "", "", "")
-        expect(helper).to receive(:render)
-          .with(partial: "web_services_default", locals: {reference: reference})
-        helper.render_web_services(reference)
-      end
-    end
-  end
-
   describe "#leaflet_options" do
     it "returns a hash of options for leaflet" do
-      expect(leaflet_options[:VIEWERS][:WMS][:CONTROLS]).to eq(%w[Opacity Fullscreen])
+      expect(leaflet_options[:LAYERS][:INDEX].keys).to eq([:DEFAULT, :UNAVAILABLE, :SELECTED])
     end
   end
 
@@ -272,32 +175,6 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  describe "#show_help_text?" do
-    let(:feature) { "viewer_protocol" }
-    let(:translation_key) { "wms" }
-
-    it "confirms help text is available" do
-      expect(helper.show_help_text?(feature, translation_key)).to be true
-    end
-  end
-
-  describe "#render_help_text_entry" do
-    let(:feature) { "viewer_protocol" }
-    let(:translation_key) { "wms" }
-
-    context "valid entry" do
-      it "renders help text entry for the wms viewer protocol" do
-        expect(helper.render_help_text_entry(feature, translation_key)).to eq '<h3 class="help-text viewer_protocol h6"><a data-toggle="popover" data-title="Web Map Service (WMS)" data-content="A Web Map Service displays a geospatial dataset as map images.">Web Map Service (WMS)</a></h3>'
-      end
-    end
-
-    context "invalid entry" do
-      it "renders an empty span" do
-        expect(helper.render_help_text_entry("foo", "bar")).to eq '<span class="help-text translation-missing"></span>'
-      end
-    end
-  end
-
   describe "#relations_icon" do
     context "when configured to use the geometry type" do
       before do
@@ -336,7 +213,7 @@ describe GeoblacklightHelper, type: :helper do
     context "viewing bookmarks" do
       let(:controller_name) { "bookmarks" }
 
-      it "returns bookmarks data-map selector" do
+      it "returns bookmarks data-page selector" do
         expect(results_js_map_selector(controller_name)).to eq "bookmarks"
       end
     end
@@ -344,7 +221,7 @@ describe GeoblacklightHelper, type: :helper do
     context "viewing catalog results" do
       let(:controller_name) { "catalog" }
 
-      it "returns index data-map selector" do
+      it "returns index data-page selector" do
         expect(results_js_map_selector(controller_name)).to eq "index"
       end
     end
@@ -352,51 +229,9 @@ describe GeoblacklightHelper, type: :helper do
     context "calling outside of intended scope" do
       let(:controller_name) { "outside" }
 
-      it "returns default data-map value" do
+      it "returns default data-page value" do
         expect(results_js_map_selector(controller_name)).to eq "index"
       end
     end
   end
-
-  describe "#viewer_container" do
-    let(:document) { SolrDocument.new(document_attributes) }
-    let(:references_field) { Settings.FIELDS.REFERENCES }
-    let(:rights_field) { Settings.FIELDS.RIGHTS }
-
-    context "with pmtiles layer" do
-      let(:document_attributes) do
-        {
-          references_field => {
-            "https://github.com/protomaps/PMTiles" => "https://geodata.lib.princeton.edu/fe/d2/80/fed28076eaa04506b7956f10f61a2f77/display_vector.pmtiles"
-          }.to_json
-        }
-      end
-
-      it "renders an OpenLayers container" do
-        allow(helper).to receive(:geoblacklight_basemap).and_return("esri")
-        assign(:document, document)
-        node = Capybara.string(helper.viewer_container)
-        div = node.first("div")
-        expect(div[:id]).to eq "ol-map"
-      end
-    end
-
-    context "with iiif manifest layer" do
-      let(:document_attributes) do
-        {
-          references_field => {
-            "http://iiif.io/api/presentation#manifest" => "https://cdm16022.contentdm.oclc.org/iiif/info/p16022coll229/3210/manifest.json"
-          }.to_json
-        }
-      end
-
-      it "renders a Clover IIIF container" do
-        allow(helper).to receive(:geoblacklight_basemap).and_return("esri")
-        assign(:document, document)
-        node = Capybara.string(helper.viewer_container)
-        div = node.first("div")
-        expect(div[:id]).to eq "clover-viewer"
-      end
-    end
-  end
 end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Geoblacklight::CsvDownload 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.GEOMETRY => "ENVELOPE(-180, 180, 90, -90)") }
+  let(:download) { described_class.new(document) }
+  describe "#initialize" do
+    it "initializes as a CsvDownload object with specific options" do
+      expect(download).to be_an described_class
+      options = download.instance_variable_get(:@options)
+      expect(options[:content_type]).to eq "text/csv"
+      expect(options[:request_params][:typeName]).to eq "stanford-test"
+    end
+    it "merges custom options" do
+      download = described_class.new(document, timeout: 33)
+      options = download.instance_variable_get(:@options)
+      expect(options[:timeout]).to eq 33
+    end
+  end
+end

data/spec/lib/geoblacklight/reference_spec.rb

@@ -34,33 +34,31 @@ describe Geoblacklight::Reference do
     end
   end
 
-  describe "reference" do
-    context "key has one trailing slash" do
-      let(:iso19139_reference) do
-        described_class.new(["http://www.isotc211.org/schemas/2005/gmd/", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml"])
-      end
+  describe "#uri" do
+    subject { described_class.new(urls).send(:uri) }
 
-      it "removes the trailing slash" do
-        expect(iso19139_reference.send(:uri)).to eq "http://www.isotc211.org/schemas/2005/gmd"
+    context "when key has one trailing slash" do
+      let(:urls) do
+        ["http://www.isotc211.org/schemas/2005/gmd/", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml"]
       end
+
+      it { is_expected.to eq "http://www.isotc211.org/schemas/2005/gmd" }
     end
-    context "key does not have trailing slashes" do
-      let(:iso19139_reference) do
-        described_class.new(["http://www.isotc211.org/schemas/2005/gmd", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml"])
-      end
 
-      it "will return the key" do
-        expect(iso19139_reference.send(:uri)).to eq "http://www.isotc211.org/schemas/2005/gmd"
+    context "when key does not have trailing slashes" do
+      let(:urls) do
+        ["http://www.isotc211.org/schemas/2005/gmd", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.stanford.purl/master/cg/357/zz/0321/iso19139.xml"]
       end
+
+      it { is_expected.to eq "http://www.isotc211.org/schemas/2005/gmd" }
     end
-    context "key has trailing slashes" do
-      let(:fgdc_reference) do
-        described_class.new(["http://www.opengis.net/cat/csw/csdgm////", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml"])
-      end
 
-      it "removes the trailing slashes" do
-        expect(fgdc_reference.send(:uri)).to eq "http://www.opengis.net/cat/csw/csdgm"
+    context "when key has multiple trailing slashes" do
+      let(:urls) do
+        ["http://www.opengis.net/cat/csw/csdgm////", "https://raw.githubusercontent.com/OpenGeoMetadata/edu.harvard/master/217/121/227/77/fgdc.xml"]
       end
+
+      it { is_expected.to eq "http://www.opengis.net/cat/csw/csdgm" }
     end
   end
 end

data/spec/lib/geoblacklight/references_spec.rb

@@ -177,13 +177,13 @@ describe Geoblacklight::References do
     it "returns available downloads by format" do
       types = complex_shapefile.download_types
       expect(types.first[1]).to eq wfs: "http://hgl.harvard.edu:8080/geoserver/wfs"
-      expect(types.count).to eq 3
+      expect(types.count).to eq 4
       expect(direct_download_only.download_types).to be_nil
     end
     it "onlies return available downloads if no direct is present" do
       types = typical_ogp_shapefile.download_types
       expect(types.first[1]).to eq wfs: "http://hgl.harvard.edu:8080/geoserver/wfs"
-      expect(types.count).to eq 3
+      expect(types.count).to eq 4
     end
   end
   describe "#esri_webservices" do
@@ -209,22 +209,36 @@ describe Geoblacklight::References do
     end
   end
   describe "downloads_by_format" do
-    it "returns shapefile" do
-      expect(typical_ogp_shapefile.downloads_by_format.count).to eq 3
-    end
-    it "returns geotiff" do
-      expect(typical_ogp_geotiff.downloads_by_format.count).to eq 1
-      expect(typical_ogp_geotiff.downloads_by_format[:geotiff][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
-    end
-    it "returns arcgrid as geotiff" do
-      expect(typical_arcgrid.downloads_by_format.count).to eq 1
-      expect(typical_arcgrid.downloads_by_format[:geotiff][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
-    end
-    it "does not return shapefile if wms and wfs are not present" do
-      expect(no_service_shapefile.downloads_by_format).to be_nil
+    context "using default settings for vector download formats" do
+      it "returns shapefile" do
+        expect(typical_ogp_shapefile.downloads_by_format.count).to eq 4
+        expect(typical_ogp_shapefile.downloads_by_format[:csv][:wfs]).to eq "http://hgl.harvard.edu:8080/geoserver/wfs"
+        expect(typical_ogp_shapefile.downloads_by_format[:geojson][:wfs]).to eq "http://hgl.harvard.edu:8080/geoserver/wfs"
+        expect(typical_ogp_shapefile.downloads_by_format[:kmz][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
+        expect(typical_ogp_shapefile.downloads_by_format[:shapefile][:wfs]).to eq "http://hgl.harvard.edu:8080/geoserver/wfs"
+      end
+      it "returns geotiff" do
+        expect(typical_ogp_geotiff.downloads_by_format.count).to eq 1
+        expect(typical_ogp_geotiff.downloads_by_format[:geotiff][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
+      end
+      it "returns arcgrid as geotiff" do
+        expect(typical_arcgrid.downloads_by_format.count).to eq 1
+        expect(typical_arcgrid.downloads_by_format[:geotiff][:wms]).to eq "http://hgl.harvard.edu:8080/geoserver/wms"
+      end
+      it "does not return shapefile if wms and wfs are not present" do
+        expect(no_service_shapefile.downloads_by_format).to be_nil
+      end
+      it "does not return GeoTIFF if wms is not present" do
+        expect(direct_download_only.downloads_by_format).to be_nil
+      end
     end
-    it "does not return GeoTIFF if wms is not present" do
-      expect(direct_download_only.downloads_by_format).to be_nil
+    context "using custom settings which include incorrect settings" do
+      before do
+        allow(typical_ogp_shapefile).to receive(:format_list).and_return(["noformat"])
+      end
+      it "returns no formats for download" do
+        expect(typical_ogp_shapefile.downloads_by_format.count).to eq 0
+      end
     end
   end
 end

data/spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb

@@ -29,15 +29,17 @@ describe Geoblacklight::FeatureInfoResponse do
   describe "#format" do
     it "returns a formated response" do
       expect(response.format).not_to be_nil
-      expect(response.format[:values].length).to eq 2
-      expect(response.format[:values][0]).to eq %w[Header1 value1]
-      expect(response.format[:values][1]).to eq %w[Header2 value2]
+      expect(response.format[:features][0][:properties].keys.length).to eq 2
+      expect(response.format[:features][0][:isHTML]).to be true
+      expect(response.format[:features][0][:properties]["Header1"]).to eq "value1"
+      expect(response.format[:features][0][:properties]["Header2"]).to eq "value2"
     end
     it "returns a formated response when multiple features are retrieved" do
       expect(response_multiple_features.format).not_to be_nil
-      expect(response_multiple_features.format[:values].length).to eq 2
-      expect(response_multiple_features.format[:values][0]).to eq %w[Header1 value1]
-      expect(response_multiple_features.format[:values][1]).to eq %w[Header2 value2]
+      expect(response.format[:features][0][:properties].keys.length).to eq 2
+      expect(response.format[:features][0][:isHTML]).to be true
+      expect(response.format[:features][0][:properties]["Header1"]).to eq "value1"
+      expect(response.format[:features][0][:properties]["Header2"]).to eq "value2"
     end
   end
 

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -57,6 +57,20 @@ describe Geoblacklight::WmsLayer do
     end
   end
 
+  describe "#feature_info" do
+    let(:response) { instance_double(Geoblacklight::FeatureInfoResponse) }
+    let(:params) { rails_4_params }
+
+    before do
+      allow(Geoblacklight::FeatureInfoResponse).to receive(:new).and_return(response)
+      allow(response).to receive(:check)
+    end
+
+    it "returns the response from the FeatureInfoResponse object" do
+      expect(wms_layer.feature_info).to eq(response.check)
+    end
+  end
+
   describe "#request_response" do
     subject(:wms_layer) { described_class.new(params) }
     let(:params) { rails_4_params }

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

@@ -9,7 +9,7 @@ describe Geoblacklight::SolrDocument::Citation do
 
     it "creates a citation" do
       expect(document.geoblacklight_citation("http://example.com"))
-        .to eq "United States. National Oceanic and Atmospheric Administration. Circuit Rider Productions. (2002). 10 Meter Contours: Russian River Basin, California. [Shapefile]. Circuit Rider Productions. Retrieved from http://example.com"
+        .to eq "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/cg357zz0321"
     end
   end
 end

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

@@ -132,26 +132,6 @@ describe Geoblacklight::SolrDocument do
       expect(document.direct_download).to be_nil
     end
   end
-  describe "hgl_download" do
-    describe "with an hgl download" do
-      let(:document_attributes) do
-        {
-          references_field => {
-            "http://schema.org/DownloadAction" => "http://example.com/harvard"
-          }.to_json
-        }
-      end
-      it "returns an hgl download hash" do
-        expect(document.hgl_download[:hgl]).to eq("http://example.com/harvard")
-      end
-    end
-    describe "without an hgl download" do
-      let(:document_attributes) { {} }
-      it "returns nil" do
-        expect(document.direct_download).to be_nil
-      end
-    end
-  end
   describe "#oembed" do
     describe "with an oembed url" do
       let(:document_attributes) do
@@ -233,7 +213,7 @@ describe Geoblacklight::SolrDocument do
     end
     let(:document_attributes) { {} }
     it "returns leaflet protocol" do
-      expect(document.viewer_protocol).to eq "map"
+      expect(document.viewer_protocol).to be nil
     end
   end
   describe "viewer_endpoint" do

data/spec/spec_helper.rb

@@ -30,26 +30,12 @@ require "rails-controller-testing" if Rails::VERSION::MAJOR >= 5
 require "rspec/rails"
 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(:selenium) do |app|
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new(args: %w[headless disable-gpu disable-setuid-sandbox window-size=7680,4320])
-
-  http_client = Selenium::WebDriver::Remote::Http::Default.new
-  http_client.read_timeout = 120
-  http_client.open_timeout = 120
-  Capybara::Selenium::Driver.new(app,
-    browser: :chrome,
-    options: browser_options,
-    http_client: http_client)
-end
-
-Capybara.javascript_driver = :selenium
-Capybara.default_max_wait_time = 120
+Capybara.javascript_driver = :selenium_chrome_headless
 
 require "geoblacklight"
 
@@ -59,20 +45,8 @@ FactoryBot.definition_file_paths = [File.expand_path("../factories", __FILE__)]
 FactoryBot.find_definitions
 
 RSpec.configure do |config|
-  config.use_transactional_fixtures = false
+  config.use_transactional_fixtures = true
 
-  config.before do
-    DatabaseCleaner.strategy = if Capybara.current_driver == :rack_test
-      :transaction
-    else
-      :truncation
-    end
-    DatabaseCleaner.start
-  end
-
-  config.after do
-    DatabaseCleaner.clean
-  end
   if Rails::VERSION::MAJOR >= 5
     config.include ::Rails.application.routes.url_helpers
     config.include ::Rails.application.routes.mounted_helpers