blacklight 7.22.2 → 7.23.0

data/spec/models/blacklight/facet_paginator_spec.rb

@@ -13,44 +13,89 @@ RSpec.describe Blacklight::FacetPaginator, api: true do
   let(:limit) { 6 }
 
   context 'on the first page of two pages' do
-    subject { described_class.new(seven_facet_values, limit: limit) }
+    subject(:paginator) { described_class.new(seven_facet_values, limit: limit) }
 
     it { is_expected.to be_first_page }
     it { is_expected.not_to be_last_page }
-    its(:current_page) { is_expected.to eq 1 }
-    its(:prev_page) { is_expected.to be_nil }
-    its(:next_page) { is_expected.to eq 2 }
+
+    describe '#current_page' do
+      subject { paginator.current_page }
+
+      it { is_expected.to eq 1 }
+    end
+
+    describe '#prev_page' do
+      subject { paginator.prev_page }
+
+      it { is_expected.to be_nil }
+    end
+
+    describe '#next_page' do
+      subject { paginator.next_page }
+
+      it { is_expected.to eq 2 }
+    end
 
     it 'limits items to limit, if limit is smaller than items.length' do
-      expect(subject.items.size).to eq 6
+      expect(paginator.items.size).to eq 6
     end
   end
 
   context 'on the last page of two pages' do
-    subject { described_class.new([f7], offset: 6, limit: limit) }
+    subject(:paginator) { described_class.new([f7], offset: 6, limit: limit) }
 
     it { is_expected.not_to be_first_page }
     it { is_expected.to be_last_page }
-    its(:current_page) { is_expected.to eq 2 }
-    its(:prev_page) { is_expected.to eq 1 }
-    its(:next_page) { is_expected.to be_nil }
+
+    describe '#current_page' do
+      subject { paginator.current_page }
+
+      it { is_expected.to eq 2 }
+    end
+
+    describe '#prev_page' do
+      subject { paginator.prev_page }
+
+      it { is_expected.to eq 1 }
+    end
+
+    describe '#next_page' do
+      subject { paginator.next_page }
+
+      it { is_expected.to be_nil }
+    end
 
     it 'returns all items when limit is greater than items.length' do
-      expect(subject.items.size).to eq 1
+      expect(paginator.items.size).to eq 1
     end
   end
 
   context 'on the second page of three pages' do
-    subject { described_class.new(seven_facet_values, offset: 6, limit: limit) }
+    subject(:paginator) { described_class.new(seven_facet_values, offset: 6, limit: limit) }
 
     it { is_expected.not_to be_first_page }
     it { is_expected.not_to be_last_page }
-    its(:current_page) { is_expected.to eq 2 }
-    its(:prev_page) { is_expected.to eq 1 }
-    its(:next_page) { is_expected.to eq 3 }
+
+    describe '#current_page' do
+      subject { paginator.current_page }
+
+      it { is_expected.to eq 2 }
+    end
+
+    describe '#prev_page' do
+      subject { paginator.prev_page }
+
+      it { is_expected.to eq 1 }
+    end
+
+    describe '#next_page' do
+      subject { paginator.next_page }
+
+      it { is_expected.to eq 3 }
+    end
 
     it 'limits items to limit, if limit is smaller than items.length' do
-      expect(subject.items.size).to eq 6
+      expect(paginator.items.size).to eq 6
     end
   end
 

data/spec/models/blacklight/solr/repository_spec.rb

@@ -9,6 +9,8 @@ RSpec.describe Blacklight::Solr::Repository, api: true do
     CatalogController.blacklight_config.deep_copy
   end
 
+  let(:all_docs_query) { '' }
+
   let :mock_response do
     { response: { docs: [document] } }
   end
@@ -104,19 +106,30 @@ RSpec.describe Blacklight::Solr::Repository, api: true do
       expect(response).to be_a_kind_of Blacklight::Solr::Response
       expect(response.params).to be_a_kind_of ActiveSupport::HashWithIndifferentAccess
     end
+
+    it "calls send_and_receive with params returned from request factory method" do
+      expect(blacklight_config.http_method).to eq :get
+      input_params = { q: all_docs_query }
+      allow(subject.connection).to receive(:send_and_receive) do |path, params|
+        expect(path).to eq 'select'
+        expect(params[:method]).to eq :get
+        expect(params[:params]).to include input_params
+      end.and_return('response' => { 'docs' => [] })
+      subject.search(input_params)
+    end
   end
 
-  describe "#send_and_receive" do
+  describe "#build_solr_request" do
+    let(:input_params) { { q: all_docs_query } }
+    let(:actual_params) { subject.build_solr_request(input_params) }
+
     describe "http_method configuration" do
       describe "using default" do
         it "defaults to get" do
           expect(blacklight_config.http_method).to eq :get
-          allow(subject.connection).to receive(:send_and_receive) do |path, params|
-            expect(path).to eq 'select'
-            expect(params[:method]).to eq :get
-            expect(params[:params]).to include(:q)
-          end.and_return('response' => { 'docs' => [] })
-          subject.search(q: @all_docs_query)
+          expect(actual_params[:method]).to eq :get
+          expect(actual_params[:params]).to include input_params
+          expect(actual_params).not_to have_key :data
         end
       end
 
@@ -125,25 +138,20 @@ RSpec.describe Blacklight::Solr::Repository, api: true do
 
         it "keep value set to post" do
           expect(blacklight_config.http_method).to eq :post
-          allow(subject.connection).to receive(:send_and_receive) do |path, params|
-            expect(path).to eq 'select'
-            expect(params[:method]).to eq :post
-            expect(params[:data]).to include(:q)
-          end.and_return('response' => { 'docs' => [] })
-          subject.search(q: @all_docs_query)
+          expect(actual_params[:method]).to eq :post
+          expect(actual_params[:data]).to include input_params
+          expect(actual_params).not_to have_key :params
         end
       end
     end
 
     context 'with json parameters' do
+      let(:input_params) { { json: { query: { bool: {} } } } }
+
       it 'sends a post request with some json' do
-        allow(subject.connection).to receive(:send_and_receive) do |path, params|
-          expect(path).to eq 'select'
-          expect(params[:method]).to eq :post
-          expect(JSON.parse(params[:data]).with_indifferent_access).to include(query: { bool: {} })
-          expect(params[:headers]).to include({ 'Content-Type' => 'application/json' })
-        end.and_return('response' => { 'docs' => [] })
-        subject.search(json: { query: { bool: {} } })
+        expect(actual_params[:method]).to eq :post
+        expect(JSON.parse(actual_params[:data]).with_indifferent_access).to include(query: { bool: {} })
+        expect(actual_params[:headers]).to include({ 'Content-Type' => 'application/json' })
       end
     end
   end
@@ -152,7 +160,7 @@ RSpec.describe Blacklight::Solr::Repository, api: true do
     let (:blacklight_config) { config = Blacklight::Configuration.new; config.http_method = :post; config }
 
     it "sends a post request to solr and get a response back" do
-      response = subject.search(q: @all_docs_query)
+      response = subject.search(q: all_docs_query)
       expect(response.docs.length).to be >= 1
     end
   end

data/spec/models/blacklight/solr/response/facets_spec.rb

@@ -3,21 +3,59 @@
 RSpec.describe Blacklight::Solr::Response::Facets, api: true do
   describe Blacklight::Solr::Response::Facets::FacetField do
     describe "A field with default options" do
-      subject { described_class.new "my_field", [] }
+      subject(:field) { described_class.new "my_field", [] }
 
-      its(:name) { is_expected.to eq "my_field" }
-      its(:limit) { is_expected.to eq 100 }
-      its(:sort) { is_expected.to eq 'count' }
-      its(:offset) { is_expected.to eq 0 }
+      describe '#name' do
+        subject { field.name }
+
+        it { is_expected.to eq "my_field" }
+      end
+
+      describe '#limit' do
+        subject { field.limit }
+
+        it { is_expected.to eq 100 }
+      end
+
+      describe '#sort' do
+        subject { field.sort }
+
+        it { is_expected.to eq 'count' }
+      end
+
+      describe '#offset' do
+        subject { field.offset }
+
+        it { is_expected.to eq 0 }
+      end
     end
 
     describe "A field with additional options" do
-      subject { described_class.new "my_field", [], limit: 15, sort: 'alpha', offset: 23 }
+      subject(:field) { described_class.new "my_field", [], limit: 15, sort: 'alpha', offset: 23 }
 
-      its(:name) { is_expected.to eq "my_field" }
-      its(:limit) { is_expected.to eq 15 }
-      its(:sort) { is_expected.to eq 'alpha' }
-      its(:offset) { is_expected.to eq 23 }
+      describe '#name' do
+        subject { field.name }
+
+        it { is_expected.to eq "my_field" }
+      end
+
+      describe '#limit' do
+        subject { field.limit }
+
+        it { is_expected.to eq 15 }
+      end
+
+      describe '#sort' do
+        subject { field.sort }
+
+        it { is_expected.to eq 'alpha' }
+      end
+
+      describe '#offset' do
+        subject { field.offset }
+
+        it { is_expected.to eq 23 }
+      end
     end
   end
 

data/spec/presenters/blacklight/facet_item_presenter_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe Blacklight::FacetItemPresenter, type: :presenter do
 
     it 'is the url to apply the facet' do
       allow(search_state).to receive(:add_facet_params_and_redirect).with('key', facet_item).and_return(f: 'x')
-      allow(view_context).to receive(:search_action_path).with(f: 'x').and_return('/catalog?f=x')
+      allow(view_context).to receive(:search_action_path).with({ f: 'x' }).and_return('/catalog?f=x')
 
       expect(presenter.href).to eq '/catalog?f=x'
     end

data/spec/presenters/blacklight/field_presenter_spec.rb

@@ -81,7 +81,7 @@ RSpec.describe Blacklight::FieldPresenter, api: true do
 
     context 'when field has link_to_facet with true' do
       before do
-        allow(request_context).to receive(:search_action_path).with('f' => { 'link_to_facet_true' => ['x'] }).and_return('/foo')
+        allow(request_context).to receive(:search_action_path).with({ 'f' => { 'link_to_facet_true' => ['x'] } }).and_return('/foo')
         allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       end
 
@@ -92,7 +92,7 @@ RSpec.describe Blacklight::FieldPresenter, api: true do
 
     context 'when field has link_to_facet with a field name' do
       before do
-        allow(request_context).to receive(:search_action_path).with('f' => { 'some_field' => ['x'] }).and_return('/foo')
+        allow(request_context).to receive(:search_action_path).with({ 'f' => { 'some_field' => ['x'] } }).and_return('/foo')
         allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       end
 

data/spec/routing/search_history_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.describe "Search History Routes" do
+  routes { Blacklight::Engine.routes }
+  # paths generated by custom routes
+  it "has a path for showing the search history" do
+    expect(get: "/search_history").to route_to(controller: 'search_history', action: 'index')
+  end
+end

data/spec/services/blacklight/search_service_spec.rb

@@ -421,6 +421,14 @@ RSpec.describe Blacklight::SearchService, api: true do
     expect { service.repository.search }.to raise_exception(/Unable to connect to Solr instance/)
   end
 
+  it "raises a Blacklight exception if RSolr raises a timeout error connecting to Solr instance" do
+    rsolr_timeout = RSolr::Error::Timeout.new(nil, nil)
+    allow(rsolr_timeout).to receive(:to_s).and_return("mocked RSolr timeout")
+
+    allow(blacklight_solr).to receive(:send_and_receive).and_raise(rsolr_timeout)
+    expect { service.repository.search }.to raise_exception(Blacklight::Exceptions::RepositoryTimeout, /Timeout connecting to Solr instance/)
+  end
+
   describe "#previous_and_next_documents_for_search" do
     let(:user_params) { { q: '', per_page: 100 } }
 

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ require 'engine_cart'
 EngineCart.load_application!
 
 require 'rspec/rails'
-require 'rspec/its'
 require 'rspec/collection_matchers'
 require 'capybara/rails'
 require 'webdrivers'
@@ -29,13 +28,13 @@ Capybara.javascript_driver = :headless_chrome
 
 Capybara.register_driver :headless_chrome do |app|
   Capybara::Selenium::Driver.load_selenium
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+  capabilities = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
     opts.args << '--headless'
     opts.args << '--disable-gpu'
     opts.args << '--no-sandbox'
     opts.args << '--window-size=1280,1696'
   end
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
+  Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: capabilities)
 end
 
 # Requires supporting ruby files with custom matchers and macros, etc,

data/spec/support/controller_level_helpers.rb

@@ -15,4 +15,12 @@ module ControllerLevelHelpers
   def initialize_controller_helpers(helper)
     helper.extend ControllerViewHelpers
   end
+
+  # Monkeypatch to fix https://github.com/rspec/rspec-rails/pull/2521
+  def _default_render_options
+    val = super
+    return val unless val[:handlers]
+
+    val.merge(handlers: val.fetch(:handlers).map(&:to_sym))
+  end
 end

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

@@ -23,7 +23,7 @@ RSpec.describe "catalog/constraints" do
   end
 
   it "renders a start over link with the current view type" do
-    allow(view).to receive(:search_action_path).with(view: :xyz).and_return('http://xyz?view=xyz')
+    allow(view).to receive(:search_action_path).with({ view: :xyz }).and_return('http://xyz?view=xyz')
     allow(view).to receive_messages(query_has_constraints?: true)
     params[:view] = 'xyz'
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)

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

@@ -2,7 +2,7 @@
 
 # spec for default partial to display solr document fields in catalog INDEX view
 
-RSpec.describe "/catalog/_index" do
+RSpec.describe "catalog/_index" do
   include BlacklightHelper
   include CatalogHelper
 

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

@@ -2,7 +2,7 @@
 
 # spec for default partial to display solr document fields in catalog show view
 
-RSpec.describe "/catalog/_show" do
+RSpec.describe "catalog/_show" do
   include BlacklightHelper
   include CatalogHelper
 

data/spec/views/catalog/_show_sidebar.erb_spec.rb

@@ -2,7 +2,7 @@
 
 # spec for sidebar partial in catalog show view
 
-RSpec.describe "/catalog/_show_sidebar.html.erb" do
+RSpec.describe "catalog/_show_sidebar.html.erb" do
   let(:blacklight_config) do
     Blacklight::Configuration.new do |config|
       config.index.title_field = 'title_tsim'

data/spec/views/catalog/facet.json.jbuilder_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe "catalog/facet.json", api: true do
   it "renders facet json" do
     assign :pagination, items: [{ value: 'Book' }]
-    render template: "catalog/facet.json", format: :json
+    render template: "catalog/facet", formats: [:json]
     hash = JSON.parse(rendered)
     expect(hash).to eq('response' => { 'facets' => { 'items' => [{ 'value' => 'Book' }] } })
   end

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -16,6 +16,7 @@ RSpec.describe "catalog/index" do
 
   before do
     @response = Blacklight::Solr::Response.new({ response: { numFound: 30 } }, start: 10, rows: 10)
+    allow(controller).to receive(:search_state_class).and_return(Blacklight::SearchState)
     allow(@response).to receive(:documents).and_return(document_list)
     params['content_format'] = 'some_format'
     allow(view).to receive(:action_name).and_return('index')

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

@@ -18,6 +18,7 @@ RSpec.describe "catalog/index.html.erb" do
 
   describe "with search parameters" do
     before do
+      allow(controller).to receive(:search_state_class).and_return(Blacklight::SearchState)
       allow(view).to receive(:has_search_parameters?).and_return(true)
       stub_template "catalog/_results_pagination.html.erb" => ""
       stub_template "catalog/_search_header.html.erb" => "header_content"

data/spec/views/catalog/index.json.jbuilder_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe "catalog/index.json", api: true do
   let(:presenter) { Blacklight::JsonPresenter.new(response, config) }
 
   let(:hash) do
-    render template: "catalog/index.json", format: :json
+    render template: "catalog/index", formats: [:json]
     JSON.parse(rendered).with_indifferent_access
   end
 

data/spec/views/catalog/show.json.jbuilder_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe "catalog/show.json" do
   end
 
   let(:hash) do
-    render template: "catalog/show.json", format: :json
+    render template: "catalog/show", formats: [:json]
     JSON.parse(rendered).with_indifferent_access
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.22.2
+  version: 7.23.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-19 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,7 +28,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,7 +38,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.42'
+        version: '2.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.42'
+        version: '2.43'
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -163,28 +163,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  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'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -489,6 +475,8 @@ files:
 - app/components/blacklight/search_bar_component.rb
 - app/components/blacklight/search_context_component.html.erb
 - app/components/blacklight/search_context_component.rb
+- app/components/blacklight/search_history_constraint_layout_component.rb
+- app/components/blacklight/start_over_button_component.rb
 - app/components/blacklight/system/dropdown_component.html.erb
 - app/components/blacklight/system/dropdown_component.rb
 - app/components/blacklight/system/flash_message_component.html.erb
@@ -703,6 +691,7 @@ files:
 - lib/blacklight/configuration/sort_field.rb
 - lib/blacklight/configuration/tool_config.rb
 - lib/blacklight/configuration/view_config.rb
+- lib/blacklight/deprecations/engine_configuration.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
 - lib/blacklight/nested_open_struct_with_hash_access.rb
@@ -769,6 +758,7 @@ files:
 - package.json
 - spec/components/blacklight/advanced_search_form_component_spec.rb
 - spec/components/blacklight/constraint_layout_component_spec.rb
+- 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_component_spec.rb
@@ -779,6 +769,8 @@ files:
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
 - spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
+- spec/components/blacklight/response/spellcheck_component_spec.rb
+- spec/components/blacklight/start_over_button_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
@@ -826,6 +818,7 @@ files:
 - spec/lib/blacklight/configuration/facet_field_spec.rb
 - spec/lib/blacklight/configuration/field_spec.rb
 - spec/lib/blacklight/configuration/view_config_spec.rb
+- spec/lib/blacklight/engine_spec.rb
 - spec/lib/blacklight/nested_open_struct_with_hash_access_spec.rb
 - spec/lib/blacklight/open_struct_with_hash_access_spec.rb
 - spec/lib/blacklight/parameters_spec.rb
@@ -875,6 +868,7 @@ files:
 - spec/presenters/pipeline_spec.rb
 - spec/presenters/thumbnail_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
+- spec/routing/search_history_spec.rb
 - spec/services/blacklight/search_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_level_helpers.rb
@@ -943,6 +937,7 @@ summary: Blacklight provides a discovery interface for any Solr (http://lucene.a
 test_files:
 - spec/components/blacklight/advanced_search_form_component_spec.rb
 - spec/components/blacklight/constraint_layout_component_spec.rb
+- 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_component_spec.rb
@@ -953,6 +948,8 @@ test_files:
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
 - spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
+- spec/components/blacklight/response/spellcheck_component_spec.rb
+- spec/components/blacklight/start_over_button_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
@@ -1000,6 +997,7 @@ test_files:
 - spec/lib/blacklight/configuration/facet_field_spec.rb
 - spec/lib/blacklight/configuration/field_spec.rb
 - spec/lib/blacklight/configuration/view_config_spec.rb
+- spec/lib/blacklight/engine_spec.rb
 - spec/lib/blacklight/nested_open_struct_with_hash_access_spec.rb
 - spec/lib/blacklight/open_struct_with_hash_access_spec.rb
 - spec/lib/blacklight/parameters_spec.rb
@@ -1049,6 +1047,7 @@ test_files:
 - spec/presenters/pipeline_spec.rb
 - spec/presenters/thumbnail_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
+- spec/routing/search_history_spec.rb
 - spec/services/blacklight/search_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_level_helpers.rb