blacklight 8.0.0 → 8.1.0

data/spec/presenters/blacklight/show_presenter_spec.rb

@@ -50,10 +50,6 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
 
       MockDocument.use_extension(MockExtension)
 
-      def mock_document_app_helper_url *args
-        solr_document_url(*args)
-      end
-
       allow(request_context).to receive(:polymorphic_url) do |_, opts|
         "url.#{opts[:format]}"
       end
@@ -68,12 +64,10 @@ RSpec.describe Blacklight::ShowPresenter, api: true do
         tmp_value = Capybara.ignore_hidden_elements
         Capybara.ignore_hidden_elements = false
         document.export_formats.each_pair do |format, _spec|
-          expect(subject).to have_selector("link[href$='.#{format}']") do |matches|
-            expect(matches).to have(1).match
-            tag = matches[0]
-            expect(tag.attributes["rel"].value).to eq "alternate"
-            expect(tag.attributes["title"].value).to eq format.to_s
-            expect(tag.attributes["href"].value).to eq mock_document_app_helper_url(document, format: format)
+          expect(subject).to have_selector("link[href$='.#{format}']", count: 1) do |tag|
+            expect(tag["rel"]).to eq "alternate"
+            expect(tag["title"]).to eq format.to_s
+            expect(tag["href"]).to eq "url.#{format}"
           end
         end
         Capybara.ignore_hidden_elements = tmp_value

data/spec/services/blacklight/field_retriever_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+RSpec.describe Blacklight::FieldRetriever, api: true do
+  let(:service) { described_class.new(document, blacklight_field_config) }
+
+  let(:blacklight_field_config) { Blacklight::Configuration::Field.new(field: 'author_field', highlight: true) }
+  let(:document) { SolrDocument.new({ 'id' => 'doc1', 'title_field' => 'doc1 title', 'author_field' => 'author_someone' }, 'highlighting' => { 'doc1' => { 'title_tsimext' => ['doc <em>1</em>'] } }) }
+  let(:view_context) { {} }
+
+  context "highlighting" do
+    describe '#fetch' do
+      it "retrieves an author even if it's not highlighted" do
+        expect(service.fetch).to eq(['author_someone'])
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -17,7 +17,6 @@ EngineCart.load_application!
 require 'rspec/rails'
 require 'rspec/collection_matchers'
 require 'capybara/rails'
-require 'webdrivers'
 require 'selenium-webdriver'
 require 'equivalent-xml'
 require 'axe-rspec'
@@ -35,7 +34,7 @@ Capybara.register_driver :headless_chrome do |app|
     opts.args << '--no-sandbox'
     opts.args << '--window-size=1280,1696'
   end
-  Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: capabilities)
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: capabilities)
 end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
@@ -119,3 +118,31 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 end
+
+# RSpec's stub_template method needs a differnet implementation for Rails 7.1, that
+# isn't yet in an rspec-rails release.
+#
+# First rspec-rails tried this:
+#   https://github.com/rspec/rspec-rails/commit/4d65bea0619955acb15023b9c3f57a3a53183da8
+#
+# But it was subject to this problem:
+#   https://github.com/rspec/rspec-rails/issues/2696
+#
+# Below implementation appears to work for our purposes here, so we will patch it in
+# if we are on Rails 7.1+, and  not yet rspec-rails 6.1 which we expect to have it.
+
+if ::Rails.version.to_f >= 7.1 && Gem.loaded_specs["rspec-rails"].version.release < Gem::Version.new('6.1')
+
+  module RSpec
+    module Rails
+      module ViewExampleGroup
+        module ExampleMethods
+          def stub_template(hash)
+            controller.prepend_view_path(StubResolverCache.resolver_for(hash))
+          end
+        end
+      end
+    end
+  end
+
+end

data/spec/support/view_component_test_helpers.rb

@@ -18,4 +18,18 @@ module ViewComponentTestHelpers
 
     ApplicationController.new.extend(Rails.application.routes.url_helpers)
   end
+
+  # Nokogiri 1.15.0 upgrades the vendored libxml2 from v2.10.4 to v2.11.3
+  # libxml2 v2.11.0 introduces a change to parsing HTML href attributes
+  # in nokogiri < 1.15, brackets in href attributes are escaped:
+  # - <a class="facet-select" rel="nofollow" href="/catalog?f%5Bz%5D%5B%5D=x:1">x:1</a>
+  # in nokogiri >= 1.15, brackets in href attributes are not escaped:
+  # - <a class="facet-select" rel="nofollow" href="/catalog?f[z][]=x:1">x:1</a>
+  # until we can spec a minimum nokogiri version of 1.15.0, we need to see how
+  # the installed version parsed the html
+  def nokogiri_mediated_href(href)
+    start = "<a href=\"".length
+    stop = -"\"></a>".length
+    Nokogiri::HTML.fragment("<a href=\"#{href}\"></a>").to_s[start...stop]
+  end
 end

data/spec/views/catalog/_paginate_compact.html.erb_spec.rb

@@ -2,9 +2,11 @@
 
 RSpec.describe "catalog/_paginate_compact.html.erb" do
   let(:user) { User.new { |u| u.save(validate: false) } }
+  let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
     controller.request.path_parameters[:action] = 'index'
+    allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
   end
 
   it "renders paginatable arrays" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,7 +118,7 @@ dependencies:
         version: '2.66'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ dependencies:
         version: '2.66'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -205,20 +205,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -771,6 +757,7 @@ files:
 - spec/components/blacklight/constraints_component_spec.rb
 - spec/components/blacklight/document/action_component_spec.rb
 - spec/components/blacklight/document/group_component_spec.rb
+- spec/components/blacklight/document/sidebar_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
 - spec/components/blacklight/facet_component_spec.rb
@@ -781,6 +768,7 @@ files:
 - spec/components/blacklight/header_component_spec.rb
 - spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
+- spec/components/blacklight/response/pagination_component_spec.rb
 - spec/components/blacklight/response/spellcheck_component_spec.rb
 - spec/components/blacklight/response/view_type_component_spec.rb
 - spec/components/blacklight/search_bar_component_spec.rb
@@ -881,6 +869,7 @@ files:
 - spec/requests/load_suggestions_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/routing/search_history_spec.rb
+- spec/services/blacklight/field_retriever_spec.rb
 - spec/services/blacklight/search_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_level_helpers.rb
@@ -934,7 +923,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -945,6 +934,7 @@ test_files:
 - spec/components/blacklight/constraints_component_spec.rb
 - spec/components/blacklight/document/action_component_spec.rb
 - spec/components/blacklight/document/group_component_spec.rb
+- spec/components/blacklight/document/sidebar_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
 - spec/components/blacklight/facet_component_spec.rb
@@ -955,6 +945,7 @@ test_files:
 - spec/components/blacklight/header_component_spec.rb
 - spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
+- spec/components/blacklight/response/pagination_component_spec.rb
 - spec/components/blacklight/response/spellcheck_component_spec.rb
 - spec/components/blacklight/response/view_type_component_spec.rb
 - spec/components/blacklight/search_bar_component_spec.rb
@@ -1055,6 +1046,7 @@ test_files:
 - spec/requests/load_suggestions_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/routing/search_history_spec.rb
+- spec/services/blacklight/field_retriever_spec.rb
 - spec/services/blacklight/search_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_level_helpers.rb