RubyGems - geoblacklight - Versions diffs - 5.2.0 → 6.0.0.pre.alpha.1 - Mend

geoblacklight 5.2.0 → 6.0.0.pre.alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (455) hide show

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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) }

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

@@ -4,8 +4,8 @@ require "spec_helper"
 RSpec.describe Geoblacklight::BboxFilterQuery do
   # Subject
-  subject(:bbox_filter_query) { described_class.new(filter, solr_params) }
+  subject(:bbox_filter_query) { described_class.new(blacklight_config:) }
+  let(:result) { bbox_filter_query.call(filter, solr_params) }
   let(:solr_params) { {} }
   # Search State
@@ -32,6 +32,10 @@ RSpec.describe Geoblacklight::BboxFilterQuery do
   end
   describe "#envelope_bounds" do
+    before do
+      result
+    end
     it "returns an BoundingBox envelope" do
       expect(bbox_filter_query.envelope_bounds).to eq("ENVELOPE(-180, 120, 80, -80)")
     end
@@ -41,6 +45,7 @@ RSpec.describe Geoblacklight::BboxFilterQuery do
     context "without an explicit boost" do
       before do
         facet_config.within_boost = nil
+        result
       end
       it "returns an default boost value" do
@@ -51,17 +56,19 @@ RSpec.describe Geoblacklight::BboxFilterQuery do
     context "with an explicit boost" do
       before do
         facet_config.within_boost = 99
+        result
       end
-      it "applies boost based on configured Settings.BBOX_WITHIN_BOOST" do
+      it "applies boost based on configuration" do
         expect(bbox_filter_query.boost).to eq("^99")
       end
     end
   end
   describe "#relevancy_boost" do
+    let(:relevancy_boost) { result.last }
     it "returns a relevancy_boost" do
-      expect(bbox_filter_query.relevancy_boost[:bq].to_s).to include("IsWithin")
+      expect(relevancy_boost[:bq].to_s).to include("IsWithin")
     end
     context "with overlap boost" do
@@ -69,8 +76,8 @@ RSpec.describe Geoblacklight::BboxFilterQuery do
         facet_config.overlap_boost = 2
       end
-      it "applies overlapRatio when Settings.OVERLAP_RATIO_BOOST is configured" do
-        expect(bbox_filter_query.relevancy_boost[:bf].to_s).to include("$overlap^2")
+      it "applies overlapRatio" do
+        expect(relevancy_boost[:bf].to_s).to include("$overlap^2")
       end
     end
@@ -79,8 +86,8 @@ RSpec.describe Geoblacklight::BboxFilterQuery do
         facet_config.overlap_boost = nil
       end
-      it "does not apply overlapRatio when Settings.OVERLAP_RATIO_BOOST not configured" do
-        expect(bbox_filter_query.relevancy_boost).not_to have_key(:overlap)
+      it "does not apply overlapRatio" do
+        expect(relevancy_boost).not_to have_key(:overlap)
       end
     end
@@ -91,15 +98,17 @@ RSpec.describe Geoblacklight::BboxFilterQuery do
       end
       it "appends overlap and includes the local boost" do
-        expect(bbox_filter_query.relevancy_boost[:bf].to_s).to include("$overlap^2")
-        expect(bbox_filter_query.relevancy_boost[:bf].to_s).to include("local_boost^5")
+        expect(relevancy_boost[:bf].to_s).to include("$overlap^2")
+        expect(relevancy_boost[:bf].to_s).to include("local_boost^5")
       end
     end
   end
   describe "#intersects_filter" do
+    let(:intersects_filter) { result.first }
     it "returns an Intersects query" do
-      expect(bbox_filter_query.intersects_filter).to include("Intersects")
+      expect(intersects_filter).to include("Intersects")
     end
   end
 end

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

@@ -2,7 +2,7 @@
 require "spec_helper"
-describe Geoblacklight::SolrDocument::Citation do
+RSpec.describe Geoblacklight::SolrDocument::Citation do
   describe "#geoblacklight_citation" do
     let(:fixture) { JSON.parse(read_fixture("solr_documents/restricted-line.json")) }
     let(:document) { SolrDocument.new(fixture) }

data/spec/models/concerns/geoblacklight/solr_document/finder_spec.rb CHANGED Viewed

@@ -7,7 +7,7 @@ class MyDocument
   include Geoblacklight::SolrDocument::Finder
 end
-describe Geoblacklight::SolrDocument::Finder do
+RSpec.describe Geoblacklight::SolrDocument::Finder do
   let(:document_klass) { MyDocument }
   describe "#find" do

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

@@ -2,7 +2,7 @@
 require "spec_helper"
-describe Geoblacklight::SolrDocument::Inspection do
+RSpec.describe Geoblacklight::SolrDocument::Inspection do
   subject { SolrDocument.new }
   describe "#inspectable?" do

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

@@ -2,11 +2,11 @@
 require "spec_helper"
-describe Geoblacklight::SolrDocument do
+RSpec.describe Geoblacklight::SolrDocument do
   let(:document) { SolrDocument.new(document_attributes) }
-  let(:rights_field) { Settings.FIELDS.ACCESS_RIGHTS }
-  let(:provider_field) { Settings.FIELDS.PROVIDER }
-  let(:references_field) { Settings.FIELDS.REFERENCES }
+  let(:rights_field) { Geoblacklight.configuration.fields.access_rights }
+  let(:provider_field) { Geoblacklight.configuration.fields.provider }
+  let(:references_field) { Geoblacklight.configuration.fields.references }
   describe "#available?" do
     let(:document_attributes) { {} }
     describe "a public document" do
@@ -234,39 +234,4 @@ describe Geoblacklight::SolrDocument do
       expect(document.viewer_endpoint).to eq ""
     end
   end
-  describe "checked_endpoint" do
-    let(:document_attributes) { {} }
-    let(:reference) { Geoblacklight::Reference.new(["http://www.opengis.net/def/serviceType/ogc/wms", "http://www.example.com/wms"]) }
-    it "returns endpoint if available" do
-      expect_any_instance_of(Geoblacklight::References).to receive(:wms).and_return(reference)
-      expect(document.checked_endpoint("wms")).to eq "http://www.example.com/wms"
-    end
-    it "return nil if not available" do
-      expect_any_instance_of(Geoblacklight::References).to receive(:wms).and_return(nil)
-      expect(document.checked_endpoint("wms")).to be_nil
-    end
-  end
-  describe "method_missing" do
-    let(:document_attributes) { {} }
-    it "calls checked_endpoint with parsed method name if matches" do
-      expect(document).to receive(:checked_endpoint).with("wms").and_return(nil)
-      expect(document.wms_url).to be_nil
-    end
-    it "raises no method error" do
-      expect { document.wms_urlz }.to raise_error NoMethodError
-    end
-  end
-  describe "#respond_to_missing?" do
-    let(:document_attributes) { {} }
-    context "with a valid method" do
-      it "returns true" do
-        expect(document.respond_to?(:wms_url)).to be true
-      end
-    end
-    context "with a invalid method" do
-      it "returns true" do
-        expect(document.respond_to?(:wms_urlz)).to be false
-      end
-    end
-  end
 end

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

@@ -2,7 +2,7 @@
 require "spec_helper"
-describe Geoblacklight::SuppressedRecordsSearchBehavior do
+RSpec.describe Geoblacklight::SuppressedRecordsSearchBehavior do
   subject(:searcher) { search_builder.with(user_params) }
   let(:user_params) { {} }
@@ -25,7 +25,7 @@ describe Geoblacklight::SuppressedRecordsSearchBehavior do
   context "when document action call like CatalogController#web_services" do
     it "does not hide/filter suppressed records" do
-      solr_params[:q] = "{!lucene}#{Settings.FIELDS.ID}:"
+      solr_params[:q] = "{!lucene}#{Geoblacklight.configuration.fields.id}:"
       expect(searcher.hide_suppressed_records(solr_params)).to be_nil
     end
   end

data/spec/routing/catalog_routing_spec.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 require "spec_helper"
-describe "Catalog Routes", type: :routing do
+RSpec.describe "Catalog Routes", type: :routing do
   # Test paths for custom routes
   it "maps { :controller => 'catalog', :action => 'opensearch', :format => 'xml' } to /catalog/opensearch.xml" do
     expect(get: "/catalog/opensearch.xml").to route_to(controller: "catalog", action: "opensearch", format: "xml")

data/spec/spec_helper.rb CHANGED Viewed

@@ -11,6 +11,7 @@ if ENV.fetch("CIRCLE_ARTIFACTS", false)
 end
 SimpleCov.start "rails" do
+  add_filter "app/components/blacklight/icons"
   add_filter "lib/generators/geoblacklight/install_generator.rb"
   add_filter "lib/geoblacklight/version.rb"
   add_filter "lib/geoblacklight/engine.rb"
@@ -36,26 +37,36 @@ require "selenium-webdriver"
 require "webmock/rspec"
 WebMock.allow_net_connect!(net_http_connect_on_start: true)
-Capybara.javascript_driver = :selenium_chrome_headless
+Capybara.register_driver :chrome_headless do |app|
+  # Set up Chrome options
+  options = Selenium::WebDriver::Chrome::Options.new
+  options.add_argument("--headless")
+  options.add_argument("--disable-gpu")
+  options.add_argument("--no-sandbox")
+  options.add_argument("--window-size=1280,1024")
+  # Allow longer TCP reads to prevent timeout in the case of loading fixture
+  # eee6150b-ce2f-4837-9d17-ce72a0c1c26f, as part of relations_spec.rb
+  client = Selenium::WebDriver::Remote::Http::Default.new
+  client.read_timeout = 120 # seconds
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options, http_client: client)
+end
+Capybara.javascript_driver = :chrome_headless
 require "geoblacklight"
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
-FactoryBot.definition_file_paths = [File.expand_path("../factories", __FILE__)]
+FactoryBot.definition_file_paths = [File.expand_path("factories", __dir__)]
 FactoryBot.find_definitions
 RSpec.configure do |config|
-  config.use_transactional_fixtures = true
+  config.disable_monkey_patching!
-  if Rails::VERSION::MAJOR >= 5
-    config.include ::Rails.application.routes.url_helpers
-    config.include ::Rails.application.routes.mounted_helpers
-  else
-    config.include BackportTestHelpers, type: :controller
-  end
+  config.use_transactional_fixtures = true
   config.include Devise::Test::ControllerHelpers, type: :controller
   config.include ViewComponent::TestHelpers, type: :component
-  config.include ViewComponentCapybaraTestHelpers, type: :component
 end

data/spec/tasks/geoblacklight_spec.rb CHANGED Viewed

@@ -4,7 +4,7 @@ require "spec_helper"
 require "rake"
 require "fileutils"
-describe "geoblacklight.rake" do
+RSpec.describe "geoblacklight.rake" do
   describe "geoblacklight:downloads:mkdir" do
     before do
       Rails.application.load_tasks

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

@@ -13,15 +13,16 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
+  # Install blacklight
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)
     generate "blacklight:install", "--devise", "--skip-solr"
   end
-  # Install geoblacklight with the `test` option
+  # Install geoblacklight
   def install_engine
-    generate "geoblacklight:install", "-f --test"
+    say_status("warning", "GENERATING GBL", :yellow)
+    generate "geoblacklight:install"
   end
   # Symlink fixture document directories so the test app doesn't have to be