geoblacklight 5.3.0 → 6.0.0.pre.alpha.2

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

@@ -0,0 +1,177 @@
+require "spec_helper"
+
+RSpec.describe Geoblacklight::Configuration::SettingsBuilder do
+  describe ".build" do
+    subject(:config) { described_class.build }
+
+    it { is_expected.to be_a(Geoblacklight::Configuration) }
+
+    it "reads values from the real Settings (lowercase) constant" do
+      expect(config.institution).to eq(Settings.institution)
+    end
+  end
+
+  describe "#build" do
+    subject(:config) { described_class.new(settings: settings).build }
+
+    describe "reading lowercase keys" do
+      let(:settings) do
+        {
+          institution: "MIT",
+          fields: {title: "my_title_s"},
+          download_formats: {vector: ["GeoJSON"]},
+          leaflet: {selected_color: "#abc123", sidebar: true}
+        }
+      end
+
+      it "resolves top-level lowercase keys" do
+        expect(config.institution).to eq("MIT")
+      end
+
+      it "resolves nested lowercase keys" do
+        expect(config.fields.title).to eq("my_title_s")
+        expect(config.vector_download_formats).to eq(["GeoJSON"])
+        expect(config.leaflet_options.selected_color).to eq("#abc123")
+        expect(config.leaflet_options.sidebar).to be true
+      end
+    end
+
+    describe "reading uppercase keys (backwards compatibility)" do
+      let(:settings) do
+        {
+          INSTITUTION: "Stanford",
+          FIELDS: {TITLE: "dct_title_s"}
+        }
+      end
+
+      before { allow(Geoblacklight::Deprecation).to receive(:warn) }
+
+      it "resolves uppercase keys even though the builder asks case-insensitively" do
+        expect(config.institution).to eq("Stanford")
+        expect(config.fields.title).to eq("dct_title_s")
+      end
+    end
+
+    describe "deprecation warnings" do
+      before { allow(Geoblacklight::Deprecation).to receive(:warn) }
+
+      it "warns when an uppercase key is resolved" do
+        described_class.new(settings: {INSTITUTION: "MIT"}).build
+        expect(Geoblacklight::Deprecation).to have_received(:warn).with(a_string_matching(/INSTITUTION/i))
+      end
+
+      it "warns about nested uppercase keys" do
+        described_class.new(settings: {fields: {TITLE: "dct_title_s"}}).build
+        expect(Geoblacklight::Deprecation).to have_received(:warn).with(a_string_matching(/TITLE/i))
+      end
+
+      it "does not warn when keys are lowercase" do
+        described_class.new(settings: {institution: "MIT", fields: {title: "x"}}).build
+        expect(Geoblacklight::Deprecation).not_to have_received(:warn)
+      end
+
+      it "does not warn when a lowercase key shadows an uppercase one" do
+        described_class.new(settings: {institution: "lower", INSTITUTION: "UPPER"}).build
+        expect(Geoblacklight::Deprecation).not_to have_received(:warn)
+      end
+    end
+
+    describe "when both cases are present" do
+      let(:settings) { {institution: "lower", INSTITUTION: "UPPER"} }
+      it "prefers the lowercase value" do
+        expect(config.institution).to eq("lower")
+      end
+    end
+
+    describe "missing keys" do
+      let(:settings) { {} }
+      it "fall back to the Configuration defaults" do
+        expect(config.institution).to eq("Stanford")
+      end
+    end
+  end
+end
+
+RSpec.describe Geoblacklight::Configuration::CaseInsensitiveSettings do
+  subject(:wrapper) { described_class.new(settings) }
+
+  describe "method access" do
+    let(:settings) { {ARCgis_BASE_URL: "https://example.com"} }
+
+    it "resolves keys case-insensitively" do
+      expect(wrapper.arcgis_base_url).to eq("https://example.com")
+      expect(wrapper.ARCGIS_BASE_URL).to eq("https://example.com")
+      expect(wrapper.Arcgis_Base_Url).to eq("https://example.com")
+    end
+
+    it "returns nil for unknown keys" do
+      expect(wrapper.does_not_exist).to be_nil
+    end
+  end
+
+  describe "[] access" do
+    let(:settings) { {INSTITUTION: "MIT"} }
+
+    it "resolves via bracket access" do
+      expect(wrapper[:institution]).to eq("MIT")
+      expect(wrapper[:INSTITUTION]).to eq("MIT")
+    end
+  end
+
+  describe "nested access" do
+    let(:settings) { {FIELDS: {TITLE: "dct_title_s"}} }
+
+    it "wraps nested hashes so chained access resolves" do
+      expect(wrapper.fields.title).to eq("dct_title_s")
+      expect(wrapper.FIELDS.TITLE).to eq("dct_title_s")
+    end
+  end
+
+  describe "lowercase preference" do
+    let(:settings) { {institution: "lower", INSTITUTION: "UPPER"} }
+
+    it "returns the lowercase value when both forms exist" do
+      expect(wrapper.institution).to eq("lower")
+    end
+  end
+
+  describe "to_h" do
+    let(:settings) { {FOO: "bar"} }
+
+    it "returns the underlying hash" do
+      expect(wrapper.to_h).to eq({FOO: "bar"})
+    end
+  end
+
+  describe "deprecation warnings" do
+    it "warns when an uppercase key is used" do
+      deprecation = double("deprecation")
+      expect(deprecation).to receive(:warn).with(a_string_matching(/INSTITUTION/i))
+      described_class.new({INSTITUTION: "MIT"}, deprecation: deprecation).institution
+    end
+
+    it "warns about nested uppercase keys" do
+      deprecation = double("deprecation")
+      allow(deprecation).to receive(:warn)
+      described_class.new({FIELDS: {TITLE: "x"}}, deprecation: deprecation).fields.title
+      expect(deprecation).to have_received(:warn).with(a_string_matching(/FIELDS/i))
+      expect(deprecation).to have_received(:warn).with(a_string_matching(/TITLE/i))
+    end
+
+    it "does not warn when the resolved key is lowercase" do
+      deprecation = double("deprecation")
+      expect(deprecation).not_to receive(:warn)
+      described_class.new({institution: "MIT"}, deprecation: deprecation).institution
+    end
+
+    it "does not warn when a lowercase key shadows an uppercase one" do
+      deprecation = double("deprecation")
+      expect(deprecation).not_to receive(:warn)
+      described_class.new({institution: "lower", INSTITUTION: "UPPER"}, deprecation: deprecation).institution
+    end
+
+    it "does not warn by default (no deprecation configured)" do
+      expect { described_class.new({INSTITUTION: "MIT"}).institution }.not_to raise_error
+    end
+  end
+end

data/spec/lib/geoblacklight/configuration_spec.rb

@@ -0,0 +1,48 @@
+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
+
+    it "uses LayerConfig instances for index configurations" do
+      expect(leaflet_options.layers.index[:DEFAULT]).to be_a(Geoblacklight::Configuration::LayerConfig)
+      expect(leaflet_options.layers.index[:DEFAULT].weight).to eq(1)
+      expect(leaflet_options.layers.index[:DEFAULT].radius).to eq(4)
+      expect(leaflet_options.layers.index[:DEFAULT].color).to eq("#7FCDBB")
+      expect(leaflet_options.layers.index[:DEFAULT].sr_color_name).to eq("Green")
+    end
+
+    it "serializes layers options correctly with LayerConfig defaults" do
+      layers_hash = leaflet_options.to_h[:layers]
+      expect(layers_hash).to eq(
+        "detect_retina" => true,
+        "index" => {
+          DEFAULT: {
+            color: "#7FCDBB",
+            weight: 1,
+            radius: 4,
+            sr_color_name: "Green"
+          },
+          UNAVAILABLE: {
+            color: "#EDF8B1",
+            weight: 1,
+            radius: 4,
+            sr_color_name: "Yellow"
+          },
+          SELECTED: {
+            color: "#2C7FB8",
+            weight: 1,
+            radius: 4,
+            sr_color_name: "Blue"
+          }
+        }
+      )
+    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) }
@@ -14,13 +14,13 @@ describe Geoblacklight::Relation::RelationResponse do
 
   describe "#method_missing" do
     it "returns a hash of ancestor documents" do
-      expect(relation_resp.SOURCE_ANCESTORS).to include("numFound")
-      expect(relation_resp.SOURCE_ANCESTORS).to include("docs")
+      expect(relation_resp.source_ancestors).to include("numFound")
+      expect(relation_resp.source_ancestors).to include("docs")
     end
 
     it "returns a hash of descendant documents" do
-      expect(relation_resp.SOURCE_DESCENDANTS).to include("numFound")
-      expect(relation_resp.SOURCE_DESCENDANTS).to include("docs")
+      expect(relation_resp.source_descendants).to include("numFound")
+      expect(relation_resp.source_descendants).to include("docs")
     end
 
     it "raises no method error" do
@@ -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) }