blacklight 7.0.0.rc1 → 7.0.0.rc2

data/spec/presenters/pipeline_spec.rb

@@ -9,28 +9,35 @@ RSpec.describe Blacklight::Rendering::Pipeline do
 
   describe "render" do
     subject { presenter.render }
-    let(:values) { ['a', 'b'] }
+
+    let(:values) { %w[a b] }
     let(:field_config) { Blacklight::Configuration::NullField.new }
+
     it { is_expected.to eq "a and b" }
 
     context "when separator_options are in the config" do
-      let(:values) { ['c', 'd'] }
-      let(:field_config) { Blacklight::Configuration::NullField.new(itemprop: nil, separator_options: { two_words_connector: '; '}) }
+      let(:values) { %w[c d] }
+      let(:field_config) { Blacklight::Configuration::NullField.new(itemprop: nil, separator_options: { two_words_connector: '; ' }) }
+
       it { is_expected.to eq "c; d" }
     end
 
     context "when itemprop is in the config" do
       let(:values) { ['a'] }
       let(:field_config) { Blacklight::Configuration::NullField.new(itemprop: 'some-prop', separator_options: nil) }
-      it { is_expected.to have_selector("span[@itemprop='some-prop']", :text => "a") }
+
+      it { is_expected.to have_selector("span[@itemprop='some-prop']", text: "a") }
     end
   end
 
   describe "#operations" do
     subject { described_class.operations }
-    it { is_expected.to eq [Blacklight::Rendering::HelperMethod,
-                            Blacklight::Rendering::LinkToFacet,
-                            Blacklight::Rendering::Microdata,
-                            Blacklight::Rendering::Join] }
+
+    it {
+      expect(subject).to eq [Blacklight::Rendering::HelperMethod,
+                             Blacklight::Rendering::LinkToFacet,
+                             Blacklight::Rendering::Microdata,
+                             Blacklight::Rendering::Join]
+    }
   end
 end

data/spec/presenters/thumbnail_presenter_spec.rb

@@ -14,6 +14,7 @@ RSpec.describe Blacklight::ThumbnailPresenter do
       let(:config) do
         Blacklight::OpenStructWithHashAccess.new(thumbnail_method: :xyz)
       end
+
       it { is_expected.to be true }
     end
 
@@ -62,6 +63,7 @@ RSpec.describe Blacklight::ThumbnailPresenter do
 
   describe "#thumbnail_tag" do
     subject { presenter.thumbnail_tag }
+
     context "when thumbnail_method is configured" do
       let(:config) do
         Blacklight::OpenStructWithHashAccess.new(thumbnail_method: :xyz)
@@ -75,7 +77,7 @@ RSpec.describe Blacklight::ThumbnailPresenter do
         it "calls the provided thumbnail method" do
           expect(view_context).to receive_messages(xyz: "some-thumbnail")
           allow(view_context).to receive(:link_to_document).with(document, "some-thumbnail", {})
-            .and_return("link")
+                                                           .and_return("link")
           expect(subject).to eq "link"
         end
 
@@ -92,6 +94,7 @@ RSpec.describe Blacklight::ThumbnailPresenter do
         before do
           allow(view_context).to receive_messages(xyz: nil)
         end
+
         it { is_expected.to be nil }
       end
     end
@@ -155,7 +158,7 @@ RSpec.describe Blacklight::ThumbnailPresenter do
 
       context "and is a proc" do
         let(:config) do
-          Blacklight::OpenStructWithHashAccess.new(default_thumbnail: lambda { |_, _| '<img src="image.jpg">' })
+          Blacklight::OpenStructWithHashAccess.new(default_thumbnail: ->(_, _) { '<img src="image.jpg">' })
         end
 
         it "calls that lambda" do

data/spec/routing/catalog_routing_spec.rb

@@ -5,50 +5,48 @@ RSpec.describe "Routing" do
   describe "Paths Generated by Custom Routes:" do
     # paths generated by custom routes
     it "has a path for showing the email form" do
-      expect(:get => "/catalog/email").to route_to(:controller => 'catalog', :action => 'email')
+      expect(get: "/catalog/email").to route_to(controller: 'catalog', action: 'email')
     end
     it "has a path for sending the email" do
-      expect(:post => "/catalog/email").to route_to(:controller => 'catalog', :action => 'email')
+      expect(post: "/catalog/email").to route_to(controller: 'catalog', action: 'email')
     end
     it "maps GET {:controller => 'catalog', :action => 'sms'} to /catalog/sms" do
-      expect(:get => "/catalog/sms").to route_to(:controller => 'catalog', :action => 'sms')
+      expect(get: "/catalog/sms").to route_to(controller: 'catalog', action: 'sms')
     end
     it "maps POST {:controller => 'catalog', :action => 'sms'} to /catalog/sms" do
-      expect(:post => "/catalog/sms").to route_to(:controller => 'catalog', :action => 'sms')
+      expect(post: "/catalog/sms").to route_to(controller: 'catalog', action: 'sms')
     end
     it "maps { :controller => 'catalog', :action => 'show', :id => 666 } to /catalog/666" do
-      expect(:get => "/catalog/666").to route_to(:controller => 'catalog', :action => 'show', :id => "666")
+      expect(get: "/catalog/666").to route_to(controller: 'catalog', action: 'show', id: "666")
     end
   end
 
-
-  describe "solr_document_path for SolrDocument", :test => true do
+  describe "solr_document_path for SolrDocument", test: true do
     it "routes correctly" do
-      expect(:get => solr_document_path(SolrDocument.new(:id => 'asdf'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'asdf')
+      expect(get: solr_document_path(SolrDocument.new(id: 'asdf'))).to route_to(controller: 'catalog', action: 'show', id: 'asdf')
     end
 
     context "should escape solr document ids" do
-
       it "pass-throughs url-valid ids" do
-        expect(:get => solr_document_path(SolrDocument.new(:id => 'qwerty'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'qwerty')
+        expect(get: solr_document_path(SolrDocument.new(id: 'qwerty'))).to route_to(controller: 'catalog', action: 'show', id: 'qwerty')
       end
 
       it "routes url-like ids" do
         skip "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
-        expect(:get => solr_document_path(SolrDocument.new(:id => 'http://example.com'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'http://example.com')
+        expect(get: solr_document_path(SolrDocument.new(id: 'http://example.com'))).to route_to(controller: 'catalog', action: 'show', id: 'http://example.com')
       end
 
       it "routes ids with whitespace" do
-        expect(:get => solr_document_path(SolrDocument.new(:id => 'mm 123'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'mm 123')
+        expect(get: solr_document_path(SolrDocument.new(id: 'mm 123'))).to route_to(controller: 'catalog', action: 'show', id: 'mm 123')
       end
 
       it "routes ids with a literal '+'" do
-        expect(:get => solr_document_path(SolrDocument.new(:id => 'this+that'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'this+that')
+        expect(get: solr_document_path(SolrDocument.new(id: 'this+that'))).to route_to(controller: 'catalog', action: 'show', id: 'this+that')
       end
 
       it "routes ids with a literal '/" do
         skip "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
-        expect(:get => solr_document_path(SolrDocument.new(:id => 'and/or'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'and/or')
+        expect(get: solr_document_path(SolrDocument.new(id: 'and/or'))).to route_to(controller: 'catalog', action: 'show', id: 'and/or')
       end
     end
   end

data/spec/services/blacklight/search_service_spec.rb

@@ -8,12 +8,13 @@
 #  to talk with solr and get results)? when we do a document request, does
 #  blacklight code get a single document returned?)
 #
-RSpec.describe Blacklight::SearchService do
+RSpec.describe Blacklight::SearchService, api: true do
+  subject { service }
 
-  let(:service) { described_class.new(blacklight_config, user_params) }
+  let(:service) { described_class.new(config: blacklight_config, user_params: user_params) }
   let(:repository) { Blacklight::Solr::Repository.new(blacklight_config) }
   let(:user_params) { {} }
-  subject { service }
+
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:copy_of_catalog_config) { ::CatalogController.blacklight_config.deep_copy }
   let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config.except(:adapter)) }
@@ -28,10 +29,28 @@ RSpec.describe Blacklight::SearchService do
     service.repository.connection = blacklight_solr
   end
 
-  # SPECS FOR SEARCH RESULTS FOR QUERY
-  describe 'Search Results', :integration => true do
+  describe '#search_builder_class' do
+    subject { service.send(:search_builder_class) }
+
+    it 'defaults to the value in the config' do
+      expect(subject).to eq SearchBuilder
+    end
+
+    context 'when the search_builder_class is passed in' do
+      let(:klass) { double("Search builder") }
+
+      let(:service) { described_class.new(config: blacklight_config, user_params: user_params, search_builder_class: klass) }
 
+      it 'uses the passed value' do
+        expect(subject).to eq klass
+      end
+    end
+  end
+
+  # SPECS FOR SEARCH RESULTS FOR QUERY
+  describe 'Search Results', integration: true do
     let(:blacklight_config) { copy_of_catalog_config }
+
     describe 'for a sample query returning results' do
       let(:user_params) { { q: all_docs_query } }
 
@@ -40,13 +59,13 @@ RSpec.describe Blacklight::SearchService do
       end
 
       it "uses the configured request handler" do
-        allow(blacklight_config).to receive(:default_solr_params).and_return({:qt => 'custom_request_handler'})
+        allow(blacklight_config).to receive(:default_solr_params).and_return(qt: 'custom_request_handler')
         allow(blacklight_solr).to receive(:send_and_receive) do |path, params|
           expect(path).to eq 'select'
           expect(params[:params]['facet.field']).to eq ["format", "{!ex=pub_date_ssim_single}pub_date_ssim", "subject_ssim", "language_ssim", "lc_1letter_ssim", "subject_geo_ssim", "subject_era_ssim"]
           expect(params[:params]["facet.query"]).to eq ["pub_date_ssim:[#{5.years.ago.year} TO *]", "pub_date_ssim:[#{10.years.ago.year} TO *]", "pub_date_ssim:[#{25.years.ago.year} TO *]"]
-          expect(params[:params]).to include('rows' => 10, 'qt'=>"custom_request_handler", 'q'=>"", "f.subject_ssim.facet.limit"=>21, 'sort'=>"score desc, pub_date_si desc, title_si asc")
-        end.and_return({'response'=>{'docs'=>[]}})
+          expect(params[:params]).to include('rows' => 10, 'qt' => "custom_request_handler", 'q' => "", "f.subject_ssim.facet.limit" => 21, 'sort' => "score desc, pub_date_si desc, title_si asc")
+        end.and_return('response' => { 'docs' => [] })
         service.search_results
       end
 
@@ -71,6 +90,7 @@ RSpec.describe Blacklight::SearchService do
     describe "for a query returning a grouped response" do
       let(:blacklight_config) { copy_of_catalog_config }
       let(:user_params) { { q: all_docs_query } }
+
       before do
         blacklight_config.default_solr_params[:group] = true
         blacklight_config.default_solr_params[:'group.field'] = 'pub_date_si'
@@ -86,10 +106,11 @@ RSpec.describe Blacklight::SearchService do
     describe "for a query returning multiple groups", integration: true do
       let(:blacklight_config) { copy_of_catalog_config }
       let(:user_params) { { q: all_docs_query } }
+
       before do
         allow(subject).to receive_messages grouped_key_for_results: 'title_si'
         blacklight_config.default_solr_params[:group] = true
-        blacklight_config.default_solr_params[:'group.field'] = ['pub_date_si', 'title_si']
+        blacklight_config.default_solr_params[:'group.field'] = %w[pub_date_si title_si]
         (@solr_response, @document_list) = service.search_results
       end
 
@@ -100,9 +121,9 @@ RSpec.describe Blacklight::SearchService do
       end
     end
 
-
     describe "for All Docs Query and One Facet" do
       let(:user_params) { { q: all_docs_query, f: single_facet } }
+
       it 'has results' do
         (solr_response, document_list) = service.search_results
         expect(solr_response.docs).to have(document_list.size).results
@@ -114,6 +135,7 @@ RSpec.describe Blacklight::SearchService do
 
     describe "for Query Without Results and No Facet" do
       let(:user_params) { { q: no_docs_query } }
+
       it 'has no results and not raise error' do
         (solr_response, document_list) = service.search_results
         expect(document_list).to have(0).results
@@ -123,6 +145,7 @@ RSpec.describe Blacklight::SearchService do
 
     describe "for Query Without Results and One Facet" do
       let(:user_params) { { q: no_docs_query, f: single_facet } }
+
       it 'has no results and not raise error' do
         (solr_response, document_list) = service.search_results
         expect(document_list).to have(0).results
@@ -140,17 +163,15 @@ RSpec.describe Blacklight::SearchService do
         expect(solr_response.docs).to have(0).results
       end
     end
-  end  # Search Results
-
+  end # Search Results
 
   # SPECS FOR SEARCH RESULTS FOR FACETS
-  describe 'Facets in Search Results for All Docs Query', :integration => true do
-
+  describe 'Facets in Search Results for All Docs Query', integration: true do
     let(:blacklight_config) { copy_of_catalog_config }
     let(:user_params) { { q: all_docs_query } }
 
     before do
-      (solr_response, document_list) = service.search_results
+      (solr_response,) = service.search_results
       @facets = solr_response.aggregations
     end
 
@@ -159,17 +180,17 @@ RSpec.describe Blacklight::SearchService do
     end
     it 'has all facets specified in initializer' do
       expect(@facets.keys).to include *blacklight_config.facet_fields.keys
-      expect(@facets.none? { |k, v| v.nil? }).to eq true
+      expect(@facets.none? { |_k, v| v.nil? }).to eq true
     end
 
     it 'has at least one value for each facet' do
-      @facets.each do |key, facet|
+      @facets.each do |_key, facet|
         expect(facet.items).to have_at_least(1).hit
       end
     end
     it 'has multiple values for at least one facet' do
       has_mult_values = false
-      @facets.each do |key, facet|
+      @facets.each do |_key, facet|
         if facet.items.size > 1
           has_mult_values = true
           break
@@ -178,7 +199,7 @@ RSpec.describe Blacklight::SearchService do
       expect(has_mult_values).to eq true
     end
     it 'has all value counts > 0' do
-      @facets.each do |key, facet|
+      @facets.each do |_key, facet|
         facet.items.each do |facet_vals|
           expect(facet_vals.hits).to be > 0
         end
@@ -186,14 +207,13 @@ RSpec.describe Blacklight::SearchService do
     end
   end # facet specs
 
-
   # SPECS FOR SEARCH RESULTS FOR PAGING
-  describe 'Paging', :integration => true do
+  describe 'Paging', integration: true do
     let(:blacklight_config) { copy_of_catalog_config }
     let(:user_params) { { q: all_docs_query } }
 
     it 'starts with first results by default' do
-      (solr_response, document_list) = service.search_results
+      (solr_response,) = service.search_results
       expect(solr_response.params[:start].to_i).to eq 0
     end
     it 'has number of results (per page) set in initializer, by default' do
@@ -205,6 +225,7 @@ RSpec.describe Blacklight::SearchService do
     context "with per page requested" do
       let(:user_params) { { q: all_docs_query, per_page: num_results } }
       let(:num_results) { 3 }  # non-default value
+
       it 'gets number of results per page requested' do
         (solr_response1, document_list1) = service.search_results
         expect(document_list1).to have(num_results).docs
@@ -215,6 +236,7 @@ RSpec.describe Blacklight::SearchService do
     context "with rows requested" do
       let(:user_params) { { q: all_docs_query, rows: num_results } }
       let(:num_results) { 4 }  # non-default value
+
       it 'gets number of rows requested' do
         (solr_response1, document_list1) = service.search_results
         expect(document_list1).to have(num_results).docs
@@ -225,9 +247,10 @@ RSpec.describe Blacklight::SearchService do
     context "with page requested" do
       let(:user_params) { { q: all_docs_query, page: page } }
       let(:page) { 3 }
+
       it 'skips appropriate number of results when requested - default per page' do
-        (solr_response2, document_list2) = service.search_results
-        expect(solr_response2.params[:start].to_i).to eq  blacklight_config[:default_solr_params][:rows] * (page-1)
+        (solr_response2,) = service.search_results
+        expect(solr_response2.params[:start].to_i).to eq blacklight_config[:default_solr_params][:rows] * (page - 1)
       end
     end
 
@@ -235,10 +258,11 @@ RSpec.describe Blacklight::SearchService do
       let(:user_params) { { q: all_docs_query, page: page, per_page: num_results } }
       let(:page) { 3 }
       let(:num_results) { 3 }  # non-default value
+
       it 'skips appropriate number of results when requested - non-default per page' do
         num_results = 3
-        (solr_response2a, document_list2a) = service.search_results
-        expect(solr_response2a.params[:start].to_i).to eq num_results * (page-1)
+        (solr_response2a,) = service.search_results
+        expect(solr_response2a.params[:start].to_i).to eq num_results * (page - 1)
       end
     end
 
@@ -246,6 +270,7 @@ RSpec.describe Blacklight::SearchService do
       let(:page) { 5000 }
       let(:rows) { 5000 }
       let(:user_params) { { q: all_docs_query, page: page, rows: rows } }
+
       it 'has no results when prompted for page after last result' do
         (solr_response3, document_list3) = service.search_results
         expect(document_list3).to have(0).docs
@@ -256,10 +281,11 @@ RSpec.describe Blacklight::SearchService do
     context "with negative page" do
       let(:page) { '-1' }
       let(:user_params) { { q: all_docs_query, page: page } }
+
       it 'shows first results when prompted for page before first result' do
         # FIXME: should it show first results, or should it throw an error for view to deal w?
         #   Solr throws an error for a negative start value
-        (solr_response4, document_list4) = service.search_results
+        (solr_response4,) = service.search_results
         expect(solr_response4.params[:start].to_i).to eq 0
       end
     end
@@ -268,6 +294,7 @@ RSpec.describe Blacklight::SearchService do
       let(:page) { 1 }
       let(:rows) { 5000 }
       let(:user_params) { { q: all_docs_query, page: page, rows: rows } }
+
       it 'has results available when asked for more than are in response' do
         (solr_response5, document_list5) = service.search_results
         expect(solr_response5.docs).to have(document_list5.length).docs
@@ -277,7 +304,7 @@ RSpec.describe Blacklight::SearchService do
   end # page specs
 
   # SPECS FOR SINGLE DOCUMENT REQUESTS
-  describe 'Get Document By Id', :integration => true do
+  describe 'Get Document By Id', integration: true do
     let(:doc_id) { '2007020969' }
     let(:bad_id) { 'redrum' }
 
@@ -286,15 +313,9 @@ RSpec.describe Blacklight::SearchService do
     end
 
     it "raises Blacklight::RecordNotFound for an unknown id" do
-      expect {
+      expect do
         service.fetch(bad_id)
-      }.to raise_error(Blacklight::Exceptions::RecordNotFound)
-    end
-
-    it "uses a provided document solr path" do
-      allow(blacklight_config).to receive_messages(document_solr_path: 'get')
-      allow(blacklight_solr).to receive(:send_and_receive).with('get', kind_of(Hash)).and_return({'response'=>{'docs'=>[]}})
-      expect { service.fetch(doc_id)}.to raise_error Blacklight::Exceptions::RecordNotFound
+      end.to raise_error(Blacklight::Exceptions::RecordNotFound)
     end
 
     it "has a non-nil result for a known id" do
@@ -311,66 +332,86 @@ RSpec.describe Blacklight::SearchService do
     end
   end
 
-# SPECS FOR SPELLING SUGGESTIONS VIA SEARCH
-  describe "Searches should return spelling suggestions", :integration => true do
+  describe 'Get multiple documents By Id', integration: true do
+    let(:doc_id) { '2007020969' }
+    let(:bad_id) { 'redrum' }
+    let(:response) { service.fetch([doc_id]).first }
+
+    before do
+      blacklight_config.fetch_many_document_params[:fl] = 'id,format'
+    end
+
+    it 'has the expected value in the id field' do
+      expect(response.documents.first.id).to eq doc_id
+    end
+
+    it 'returns all the requested fields' do
+      expect(response.documents.first['format']).to eq ['Book']
+    end
+  end
 
+  # SPECS FOR SPELLING SUGGESTIONS VIA SEARCH
+  describe "Searches should return spelling suggestions", integration: true do
     context "for just-poor-enough-query term" do
       let(:user_params) { { q: 'boo' } }
+
       it 'has (multiple) spelling suggestions' do
-        (solr_response, document_list) = service.search_results
+        (solr_response,) = service.search_results
         expect(solr_response.spelling.words).to include('bon')
-        expect(solr_response.spelling.words).to include('bod')  #for multiple suggestions
+        expect(solr_response.spelling.words).to include('bod') # for multiple suggestions
       end
     end
 
     context "for another just-poor-enough-query term" do
       let(:user_params) { { q: 'politica' } }
+
       it 'has multiple spelling suggestions' do
-        (solr_response, document_list) = service.search_results
+        (solr_response,) = service.search_results
         expect(solr_response.spelling.words).to include('policy') # less freq
         expect(solr_response.spelling.words).to include('politics') # more freq
         expect(solr_response.spelling.words).to include('political') # more freq
-=begin
-        #  when we can have multiple suggestions
-        expect(solr_response.spelling.words).to_not include('policy') # less freq
-        solr_response.spelling.words).to include('politics') # more freq
-        solr_response.spelling.words).to include('political') # more freq
-=end
+        #         #  when we can have multiple suggestions
+        #         expect(solr_response.spelling.words).to_not include('policy') # less freq
+        #         solr_response.spelling.words).to include('politics') # more freq
+        #         solr_response.spelling.words).to include('political') # more freq
       end
     end
 
     context "for title search" do
-      let(:user_params) { { q: 'yehudiyam', qt: 'search', :"spellcheck.dictionary" => "title" } }
+      let(:user_params) { { q: 'yehudiyam', qt: 'search', "spellcheck.dictionary": "title" } }
+
       it 'has spelling suggestions' do
-        (solr_response, document_list) = service.search_results
+        (solr_response,) = service.search_results
         expect(solr_response.spelling.words).to include('yehudiyim')
       end
     end
 
     context "for author search" do
-      let(:user_params) { { q: 'shirma', qt: 'search', :"spellcheck.dictionary" => "author" } }
+      let(:user_params) { { q: 'shirma', qt: 'search', "spellcheck.dictionary": "author" } }
+
       it 'has spelling suggestions' do
-        (solr_response, document_list) = service.search_results
+        (solr_response,) = service.search_results
         expect(solr_response.spelling.words).to include('sharma')
       end
     end
 
     context "for subject search" do
-      let(:user_params) { { q: 'wome', qt: 'search', :"spellcheck.dictionary" => "subject" } }
+      let(:user_params) { { q: 'wome', qt: 'search', "spellcheck.dictionary": "subject" } }
+
       it 'has spelling suggestions' do
-        (solr_response, document_list) = service.search_results
+        (solr_response,) = service.search_results
         expect(solr_response.spelling.words).to include('women')
       end
     end
   end
 
-# TODO:  more complex queries!  phrases, offset into search results, non-latin, boosting(?)
-#  search within query building (?)
-#  search + facets (search done first; facet selected first, both selected)
+  # TODO:  more complex queries!  phrases, offset into search results, non-latin, boosting(?)
+  #  search within query building (?)
+  #  search + facets (search done first; facet selected first, both selected)
 
-# TODO: maybe eventually check other types of solr requests
-#  more like this
-#  nearby on shelf
+  # TODO: maybe eventually check other types of solr requests
+  #  more like this
+  #  nearby on shelf
   it "raises a Blacklight exception if RSolr can't connect to the Solr instance" do
     allow(blacklight_solr).to receive(:send_and_receive).and_raise(Errno::ECONNREFUSED)
     expect { service.repository.search }.to raise_exception(/Unable to connect to Solr instance/)
@@ -378,45 +419,46 @@ RSpec.describe Blacklight::SearchService do
 
   describe "#previous_and_next_documents_for_search" do
     let(:user_params) { { q: '', per_page: 100 } }
+
     before do
       @full_response, @all_docs = service.search_results
     end
 
     it "returns the previous and next documents for a search" do
-      response, docs = service.previous_and_next_documents_for_search(4, :q => '')
+      _response, docs = service.previous_and_next_documents_for_search(4, q: '')
 
       expect(docs.first.id).to eq @all_docs[3].id
       expect(docs.last.id).to eq @all_docs[5].id
     end
 
     it "returns only the next document if the counter is 0" do
-      response, docs = service.previous_and_next_documents_for_search(0, :q => '')
+      _response, docs = service.previous_and_next_documents_for_search(0, q: '')
 
       expect(docs.first).to be_nil
       expect(docs.last.id).to eq @all_docs[1].id
     end
 
     it "returns only the previous document if the counter is the total number of documents" do
-      response, docs = service.previous_and_next_documents_for_search(@full_response.total - 1, :q => '')
+      _response, docs = service.previous_and_next_documents_for_search(@full_response.total - 1, q: '')
       expect(docs.first.id).to eq @all_docs.slice(-2).id
       expect(docs.last).to be_nil
     end
 
     it "returns an array of nil values if there is only one result" do
-      response, docs = service.previous_and_next_documents_for_search(0, :q => 'id:2007020969')
+      _response, docs = service.previous_and_next_documents_for_search(0, q: 'id:2007020969')
       expect(docs.last).to be_nil
       expect(docs.first).to be_nil
     end
 
     it 'returns only the unique key by default' do
-      response, docs = service.previous_and_next_documents_for_search(0, :q => '')
+      _response, docs = service.previous_and_next_documents_for_search(0, q: '')
       expect(docs.last.to_h).to eq 'id' => @all_docs[1].id
     end
 
     it 'allows the query parameters to be customized using configuration' do
       blacklight_config.document_pagination_params[:fl] = 'id,format'
 
-      response, docs = service.previous_and_next_documents_for_search(0, :q => '')
+      _response, docs = service.previous_and_next_documents_for_search(0, q: '')
 
       expect(docs.last.to_h).to eq @all_docs[1].to_h.slice('id', 'format')
     end
@@ -424,11 +466,11 @@ RSpec.describe Blacklight::SearchService do
 
   describe '#opensearch_response' do
     let(:user_params) { { q: 'Book' } }
-    let(:mock_response) {
+    let(:mock_response) do
       instance_double(Blacklight::Solr::Response, documents: [
-        { field: 'A' }, { field: 'B' }, { field: 'C' }
-      ])
-    }
+                        { field: 'A' }, { field: 'B' }, { field: 'C' }
+                      ])
+    end
 
     before do
       blacklight_config.view.opensearch.title_field = :field
@@ -440,7 +482,7 @@ RSpec.describe Blacklight::SearchService do
     end
 
     it 'contains the search suggestions as the second element in the response' do
-      expect(service.opensearch_response.last).to match_array %w(A B C)
+      expect(service.opensearch_response.last).to match_array %w[A B C]
     end
   end
 end