geoblacklight 5.3.0 → 6.0.0.pre.alpha.1

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe GeoblacklightHelper, type: :helper do
+RSpec.describe GeoblacklightHelper, type: :helper do
   include BlacklightHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TranslationHelper
@@ -11,9 +11,7 @@ describe GeoblacklightHelper, type: :helper do
     it "supports in use cases" do
       {
         "Paper map" => "paper-map",
-        "Michigan State University" => "michigan-state-university",
-        "CD ROM" => "cd-rom",
-        "Lewis & Clark" => "lewis-clark"
+        "CD ROM" => "cd-rom"
       }.each_key do |key|
         html = Capybara.string(geoblacklight_icon(key))
         expect(html).to have_xpath "//*[local-name() = 'svg']"
@@ -23,10 +21,6 @@ describe GeoblacklightHelper, type: :helper do
       html = Capybara.string(geoblacklight_icon(nil))
       expect(html).to have_css ".icon-missing"
     end
-    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
 
   describe "#geoblacklight_basemap" do
@@ -43,7 +37,7 @@ describe GeoblacklightHelper, type: :helper do
 
   describe "#snippit" do
     let(:document) { SolrDocument.new(document_attributes) }
-    let(:references_field) { Settings.FIELDS.REFERENCES }
+    let(:references_field) { Geoblacklight.configuration.fields.references }
     context "as a String" do
       let(:document_attributes) do
         {
@@ -89,12 +83,6 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  describe "#leaflet_options" do
-    it "returns a hash of options for leaflet" do
-      expect(leaflet_options[:LAYERS][:INDEX].keys).to eq([:DEFAULT, :UNAVAILABLE, :SELECTED])
-    end
-  end
-
   describe "#render_value_as_truncate_abstract" do
     context "with multiple values" do
       let(:document) { SolrDocument.new(value: %w[short description]) }
@@ -125,7 +113,8 @@ describe GeoblacklightHelper, type: :helper do
       end
 
       it "renders the partial with metadata content" do
-        expect(helper).to receive(:render).with(partial: "catalog/metadata/markup", locals: {content: "<data></data>"})
+        expect(helper).to receive(:render).with(partial: "catalog/metadata/markup",
+          locals: {content: "<data></data>"})
         helper.render_transformed_metadata(metadata)
       end
     end
@@ -158,40 +147,6 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  describe "#relations_icon" do
-    context "when configured to use the geometry type" do
-      before do
-        allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(true)
-      end
-
-      it "renders a goemetry type as the icon" do
-        html = Capybara.string(helper.relations_icon({Settings.FIELDS.GEOM_TYPE => "polygon"}, "leaf"))
-        expect(html.title.strip).to eq "Polygon"
-      end
-
-      it "has the svg_tooltip class so that the Bootstrap tooltip is applied" do
-        html = Capybara.string(helper.relations_icon({Settings.FIELDS.GEOM_TYPE => "polygon"}, "leaf"))
-        expect(html).to have_css(".blacklight-icons.svg_tooltip")
-      end
-    end
-
-    context "when not confiugred to use the geometry type" do
-      before do
-        allow(Settings).to receive(:USE_GEOM_FOR_RELATIONS_ICON).and_return(false)
-      end
-
-      it "renders the provided icon" do
-        html = Capybara.string(helper.relations_icon({Settings.FIELDS.GEOM_TYPE => "polygon"}, "leaf"))
-        expect(html.title.strip).to eq "Leaf"
-      end
-
-      it "does not have the svg_tooltip class" do
-        html = Capybara.string(helper.relations_icon({Settings.FIELDS.GEOM_TYPE => "polygon"}, "leaf"))
-        expect(html).not_to have_css(".blacklight-icons.svg_tooltip")
-      end
-    end
-  end
-
   describe "#results_js_map_selector" do
     context "viewing bookmarks" do
       let(:controller_name) { "bookmarks" }

data/spec/javascripts/geoblacklight_spec.js

@@ -1,11 +1,11 @@
-describe('GeoBlacklight', function() {
-  describe('loads and makes available libraries', function() {
-    it('Leaflet is defined', function() {
-      expect(L).toBeDefined();
-    });
+describe("GeoBlacklight", function () {
+  describe("loads and makes available libraries", function () {
+    it("Leaflet is defined", function () {
+      expect(L).toBeDefined()
+    })
 
-    it('History.js is defined', function() {
-      expect(History).toBeDefined();
-    });
-  });
-});
+    it("History.js is defined", function () {
+      expect(History).toBeDefined()
+    })
+  })
+})

data/spec/javascripts/metadata_download_button_spec.js

@@ -1,16 +1,17 @@
-const MetadataDownloadButton = require('../../app/assets/javascripts/geoblacklight/modules/metadata_download_button');
+const MetadataDownloadButton = require("../../app/assets/javascripts/geoblacklight/modules/metadata_download_button")
 
-describe('MetadataDownloadButton', function() {
-  describe('initialize', function() {
+describe("MetadataDownloadButton", function () {
+  describe("initialize", function () {
     beforeEach(() => {
-      document.body.innerHTML = '<button id="foo" data-ref-endpoint="http://testdomain" data-ref-download="#bar">test element</button><a href="http://testdomain" id="bar">another test element</a>';
-    });
+      document.body.innerHTML =
+        '<button id="foo" data-ref-endpoint="http://testdomain" data-ref-download="#bar">test element</button><a href="http://testdomain" id="bar">another test element</a>'
+    })
 
-    it('creates a new instance and sets the download button @href value', function() {
-      var button = new MetadataDownloadButton('#foo');
-      expect(button.$el.attr('id')).toBe('foo');
-      expect(button.$download.attr('id')).toBe('bar');
-      expect(button.$download.attr('href')).toBe('http://testdomain');
-    });
-  });
-});
+    it("creates a new instance and sets the download button @href value", function () {
+      var button = new MetadataDownloadButton("#foo")
+      expect(button.$el.attr("id")).toBe("foo")
+      expect(button.$download.attr("id")).toBe("bar")
+      expect(button.$download.attr("href")).toBe("http://testdomain")
+    })
+  })
+})

data/spec/lib/geoblacklight/bounding_box_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::BoundingBox do
+RSpec.describe Geoblacklight::BoundingBox do
   describe "#initialize" do
     it "handles multiple input types as arguments" do
       expect(described_class.new("1", "1", "1", "1")).to be_an described_class

data/spec/lib/geoblacklight/configuration/default_settings_builder_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+RSpec.describe Geoblacklight::Configuration::DefaultSettingsBuilder do
+  describe ".build" do
+    it "returns a Geoblacklight::Configuration object" do
+      expect(described_class.build).to be_a(Geoblacklight::Configuration)
+    end
+  end
+end

data/spec/lib/geoblacklight/configuration_spec.rb

@@ -0,0 +1,13 @@
+require "spec_helper"
+
+RSpec.describe Geoblacklight::Configuration do
+  subject(:config) { Geoblacklight::Configuration.new }
+
+  describe "#leaflet_options" do
+    subject(:leaflet_options) { config.leaflet_options }
+
+    it "returns a hash of options for leaflet" do
+      expect(leaflet_options.layers.index.keys).to eq(%i[DEFAULT UNAVAILABLE SELECTED])
+    end
+  end
+end

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

@@ -2,8 +2,8 @@
 
 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)") }
+RSpec.describe Geoblacklight::CsvDownload do
+  let(:document) { SolrDocument.new(Geoblacklight.configuration.fields.id => "test", :solr_wfs_url => "http://www.example.com/wfs", Geoblacklight.configuration.fields.wxs_identifier => "stanford-test", Geoblacklight.configuration.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

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

@@ -2,8 +2,8 @@
 
 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.GEOMETRY => "ENVELOPE(-180, 180, 90, -90)") }
+RSpec.describe Geoblacklight::GeojsonDownload do
+  let(:document) { SolrDocument.new(Geoblacklight.configuration.fields.id => "test", :solr_wfs_url => "http://www.example.com/wfs", Geoblacklight.configuration.fields.wxs_identifier => "stanford-test", Geoblacklight.configuration.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,8 +2,11 @@
 
 require "spec_helper"
 
-describe Geoblacklight::GeotiffDownload do
-  let(:document) { SolrDocument.new(Settings.FIELDS.ID => "test", Settings.FIELDS.WXS_IDENTIFIER => "stanford-test", Settings.FIELDS.GEOMETRY => "ENVELOPE(-180, 180, 90, -90)") }
+RSpec.describe Geoblacklight::GeotiffDownload do
+  let(:document) do
+    SolrDocument.new(Geoblacklight.configuration.fields.id => "test", Geoblacklight.configuration.fields.wxs_identifier => "stanford-test",
+      Geoblacklight.configuration.fields.geometry => "ENVELOPE(-180, 180, 90, -90)")
+  end
   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,8 +2,8 @@
 
 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.GEOMETRY => "ENVELOPE(-180, 180, 90, -90)") }
+RSpec.describe Geoblacklight::KmzDownload do
+  let(:document) { SolrDocument.new(Geoblacklight.configuration.fields.id => "test", :solr_wfs_url => "http://www.example.com/wfs", Geoblacklight.configuration.fields.wxs_identifier => "stanford-test", Geoblacklight.configuration.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,8 +2,8 @@
 
 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.GEOMETRY => "ENVELOPE(-180, 180, 90, -90)") }
+RSpec.describe Geoblacklight::ShapefileDownload do
+  let(:document) { SolrDocument.new(Geoblacklight.configuration.fields.id => "test", :solr_wfs_url => "http://www.example.com/wfs", Geoblacklight.configuration.fields.wxs_identifier => "stanford-test", Geoblacklight.configuration.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

@@ -2,13 +2,16 @@
 
 require "spec_helper"
 
-describe Geoblacklight::Download do
+RSpec.describe Geoblacklight::Download do
   subject(:download) { described_class.new(document, options) }
 
   let(:faraday_connection) { instance_double(Faraday::Connection) }
   let(:faraday_response) { instance_double(Faraday::Response) }
-  let(:references_field) { Settings.FIELDS.REFERENCES }
-  let(:document) { SolrDocument.new(:"#{Settings.FIELDS.ID}" => "test", references_field => {"http://www.opengis.net/def/serviceType/ogc/wms" => "http://www.example.com/wms"}.to_json) }
+  let(:references_field) { Geoblacklight.configuration.fields.references }
+  let(:document) do
+    SolrDocument.new(:"#{Geoblacklight.configuration.fields.id}" => "test",
+      references_field => {"http://www.opengis.net/def/serviceType/ogc/wms" => "http://www.example.com/wms"}.to_json)
+  end
   let(:options) { {type: "shapefile", extension: "zip", service_type: "wms", content_type: "application/zip"} }
 
   describe "#initialize" do
@@ -31,15 +34,18 @@ describe Geoblacklight::Download do
       expect(download.file_name).to eq "test-shapefile.zip"
     end
   end
+
   describe "#file_path" do
     it "returns the path with name and extension" do
-      expect(download.class.file_path).to eq Rails.root.join("tmp", "cache", "downloads")
+      expect(download.class.file_path).to eq Rails.root.join("tmp", "cache", "downloads").to_s
     end
+
     it "is configurable" do
-      expect(Settings).to receive(:DOWNLOAD_PATH).and_return("configured/path")
+      expect(Geoblacklight.configuration).to receive(:download_path).and_return("configured/path")
       expect(download.class.file_path).to eq "configured/path"
     end
   end
+
   describe "#download_exists?" do
     it "returns false if file does not exist" do
       expect(File).to receive(:file?).and_return(false)
@@ -106,7 +112,10 @@ describe Geoblacklight::Download do
       it "creates the file in fs and delete it if the content headers are not correct" do
         allow(File).to receive(:delete).with("#{download.file_path_and_name}.tmp").and_return(nil)
 
-        expect { download.create_download_file }.to raise_error(Geoblacklight::Exceptions::ExternalDownloadFailed, "Wrong download type")
+        expect do
+          download.create_download_file
+        end.to raise_error(Geoblacklight::Exceptions::ExternalDownloadFailed,
+          "Wrong download type")
       end
     end
 

data/spec/lib/geoblacklight/geometry_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::Geometry do
+RSpec.describe Geoblacklight::Geometry do
   let(:wkt_geom) { "MULTIPOLYGON(((-180 81.66, -180 -12.93, -168.35 -12.93, -168.35 81.66, -180 81.66)), ((180 81.66, 25 81.66, 25 -12.93, 180 -12.93, 180 81.66)))" }
   let(:envelope_geom) { "ENVELOPE(25, -168.35, 81.66, -12.93)" }
   let(:invalid_geom) { "INVALID" }

data/spec/lib/geoblacklight/item_viewer_spec.rb

@@ -2,11 +2,11 @@
 
 require "spec_helper"
 
-describe Geoblacklight::ItemViewer do
+RSpec.describe Geoblacklight::ItemViewer do
   let(:document) { SolrDocument.new(document_attributes) }
   let(:document_attributes) { {} }
   let(:references) { document.references }
-  let(:references_field) { Settings.FIELDS.REFERENCES }
+  let(:references_field) { Geoblacklight.configuration.fields.references }
   let(:item_viewer) { described_class.new(references) }
   describe "viewer_preference" do
     describe "for no references" do

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::Metadata::Base do
+RSpec.describe Geoblacklight::Metadata::Base do
   subject(:metadata) { described_class.new(reference) }
 
   let(:connection) { instance_double(Faraday::Connection) }

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::Metadata::Html do
+RSpec.describe Geoblacklight::Metadata::Html do
   let(:url) { "https://s3.amazonaws.com/cugir-data/00/77/41/fgdc.html" }
   let(:metadata) do
     described_class.new(

data/spec/lib/geoblacklight/metadata_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::Metadata do
+RSpec.describe Geoblacklight::Metadata do
   describe ".instance" do
     let(:reference) { instance_double(Geoblacklight::Reference) }
     context "with an FGDC metadata reference" do

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::MetadataTransformer::Base do
+RSpec.describe Geoblacklight::MetadataTransformer::Base do
   describe ".new" do
     it "raises an error for empty XML" do
       expect { described_class.new(nil) }.to raise_error Geoblacklight::MetadataTransformer::EmptyMetadataError

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::MetadataTransformer::Fgdc do
+RSpec.describe Geoblacklight::MetadataTransformer::Fgdc do
   subject do
     described_class.new(metadata)
   end

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::MetadataTransformer::Iso19139 do
+RSpec.describe Geoblacklight::MetadataTransformer::Iso19139 do
   subject do
     described_class.new(metadata)
   end

data/spec/lib/geoblacklight/metadata_transformer_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::MetadataTransformer do
+RSpec.describe Geoblacklight::MetadataTransformer do
   let(:klass) { instance_double(Class) }
   before do
     allow(metadata).to receive(:blank?).and_return(false)

data/spec/lib/geoblacklight/reference_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::Reference do
+RSpec.describe Geoblacklight::Reference do
   let(:typical_reference) do
     described_class.new(["http://www.opengis.net/def/serviceType/ogc/wms", "http://hgl.harvard.edu:8080/geoserver/wms"])
   end

data/spec/lib/geoblacklight/references_spec.rb

@@ -2,9 +2,9 @@
 
 require "spec_helper"
 
-describe Geoblacklight::References do
-  let(:references_field) { Settings.FIELDS.REFERENCES }
-  let(:file_format_field) { Settings.FIELDS.FORMAT }
+RSpec.describe Geoblacklight::References do
+  let(:references_field) { Geoblacklight.configuration.fields.references }
+  let(:file_format_field) { Geoblacklight.configuration.fields.format }
   let(:typical_ogp_shapefile) do
     described_class.new(
       SolrDocument.new(
@@ -134,9 +134,11 @@ describe Geoblacklight::References do
     end
     context "with an overridden order for the formats" do
       before do
+        allow(Geoblacklight.configuration).to receive_messages(
+          metadata_shown: %w[iso19139 mods]
+        )
         stub_const("Settings", Module.new)
         allow(Settings).to receive_messages(
-          METADATA_SHOWN: %w[iso19139 mods],
           FIELDS: OpenStruct.new(FORMAT: "dct_format_s")
         )
       end

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

@@ -2,14 +2,20 @@
 
 require "spec_helper"
 
-describe Geoblacklight::Relation::Ancestors do
+RSpec.describe Geoblacklight::Relation::Ancestors do
   let(:repository) { Blacklight::Solr::Repository.new(CatalogController.blacklight_config) }
-  let(:ancestors) { described_class.new("nyu_2451_34502", Settings.FIELDS.SOURCE, repository) }
-  let(:empty_ancestors) { described_class.new("harvard-g7064-s2-1834-k3", Settings.FIELDS.SOURCE, repository) }
+  let(:ancestors) { described_class.new("nyu_2451_34502", Geoblacklight.configuration.fields.source, repository) }
+  let(:empty_ancestors) do
+    described_class.new("harvard-g7064-s2-1834-k3", Geoblacklight.configuration.fields.source, repository)
+  end
 
   describe "#create_search_params" do
     it "assembles the correct search params for finding ancestor documents" do
-      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=#{Settings.FIELDS.ID}}#{Settings.FIELDS.ID}:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE])
+      expect(ancestors.create_search_params).to eq(
+        fq: ["{!join from=#{Geoblacklight.configuration.fields.source} to=#{Geoblacklight.configuration.fields.id}}#{Geoblacklight.configuration.fields.id}:nyu_2451_34502"], fl: [
+          Geoblacklight.configuration.fields.title, Geoblacklight.configuration.fields.id, Geoblacklight.configuration.fields.resource_type
+        ]
+      )
     end
   end
 

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

@@ -2,14 +2,19 @@
 
 require "spec_helper"
 
-describe Geoblacklight::Relation::Descendants do
+RSpec.describe Geoblacklight::Relation::Descendants do
   let(:repository) { Blacklight::Solr::Repository.new(CatalogController.blacklight_config) }
-  let(:descendants) { described_class.new("nyu_2451_34636", Settings.FIELDS.SOURCE, repository) }
-  let(:empty_descendants) { described_class.new("harvard-g7064-s2-1834-k3", Settings.FIELDS.SOURCE, repository) }
+  let(:descendants) { described_class.new("nyu_2451_34636", Geoblacklight.configuration.fields.source, repository) }
+  let(:empty_descendants) do
+    described_class.new("harvard-g7064-s2-1834-k3", Geoblacklight.configuration.fields.source, repository)
+  end
 
   describe "#create_search_params" do
     it "assembles the correct search params for finding descendant documents" do
-      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE])
+      expect(descendants.create_search_params).to eq(fq: "#{Geoblacklight.configuration.fields.source}:nyu_2451_34636",
+        fl: [
+          Geoblacklight.configuration.fields.title, Geoblacklight.configuration.fields.id, Geoblacklight.configuration.fields.resource_type
+        ])
     end
   end
 

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::Relation::RelationResponse do
+RSpec.describe Geoblacklight::Relation::RelationResponse do
   let(:repository) { Blacklight::Solr::Repository.new(CatalogController.blacklight_config) }
   let(:relation_resp) { described_class.new("nyu_2451_34502", repository) }
   let(:empty_relation_resp) { described_class.new("harvard-g7064-s2-1834-k3", repository) }
@@ -30,7 +30,7 @@ describe Geoblacklight::Relation::RelationResponse do
 
   describe "#respond_to_missing?" do
     it "returns true for configured relationships" do
-      Settings.RELATIONSHIPS_SHOWN.each_key do |key|
+      Geoblacklight.configuration.relationships_shown.each_key do |key|
         expect(relation_resp).to respond_to(key)
       end
     end
@@ -43,23 +43,20 @@ 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: {
-            field: "dct_source_sm",
-            query_type: "bad_query_type",
-            icon: "pagelines-brands",
-            label: "geoblacklight.relations.source_ancestor"
-          }
-        }
-      })
-      Settings.reload!
+      relationships = Geoblacklight.configuration.relationships_shown
+      Geoblacklight.configuration.relationships_shown = {
+        BAD: Config::Options.new({
+          field: "dct_source_sm",
+          query_type: "bad_query_type",
+          icon: "pagelines-brands",
+          label: "geoblacklight.relations.source_ancestor"
+        })
+      }
 
       expect { relation_resp.BAD }.to raise_error(ArgumentError)
 
       # Restore relationship values
-      Settings.RELATIONSHIPS_SHOWN = relationships
+      Geoblacklight.configuration.relationships_shown = relationships
     end
   end
 end

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::FeatureInfoResponse do
+RSpec.describe Geoblacklight::FeatureInfoResponse do
   let(:response) { described_class.new(OpenStruct.new(body: "<html><body><table><th>Header1</th><th>Header2</th><td>value1</td><td>value2</td></body></html>", headers: {"content-type" => "all good"})) }
   let(:response_multiple_features) { described_class.new(OpenStruct.new(body: "<html><body><table><th>Header1</th><th>Header2</th><tr><td>value1</td><td>value2</td></tr><tr><td>value3</td><td>value4</td></tr></body></html>", headers: {"content-type" => "all good"})) }
   let(:error_response) { described_class.new(error: "bad stuff") }

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe Geoblacklight::WmsLayer do
+RSpec.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) }