blacklight 7.40.0 → 8.0.0.beta1

data/spec/controllers/bookmarks_controller_spec.rb

@@ -7,11 +7,10 @@ RSpec.describe BookmarksController do
     end
 
     it 'opts out of search session tracking' do
-      expect(@controller.blacklight_config.track_search_session).to eq false
+      expect(@controller.blacklight_config.track_search_session).to be false
     end
   end
 
-  # jquery 1.9 ajax does error callback if 200 returns empty body. so use 204 instead.
   describe "update" do
     it "has a 200 status code when creating a new one" do
       put :update, xhr: true, params: { id: '2007020969', format: :js }
@@ -105,7 +104,7 @@ RSpec.describe BookmarksController do
     end
 
     context 'created over an hour ago' do
-      let(:current_time) { Time.zone.now - 2.hours }
+      let(:current_time) { 2.hours.ago }
 
       it 'is expired' do
         get :index, params: { encrypted_user_id: token }

data/spec/controllers/catalog_controller_spec.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe CatalogController, api: true do
-  around { |test| Deprecation.silence(Blacklight::Catalog) { test.call } }
-
   let(:doc_id) { '2007020969' }
-  let(:mock_response) { instance_double(Blacklight::Solr::Response) }
   let(:mock_document) { instance_double(SolrDocument, export_formats: {}) }
   let(:search_service) { instance_double(Blacklight::SearchService) }
 
@@ -63,17 +60,17 @@ RSpec.describe CatalogController, api: true do
       end
 
       it "shows 0 results when the user asks for an invalid value to a custom facet query", integration: true do
-        get :index, params: { f: { example_query_facet_field: 'bogus' } } # bogus custom facet value
+        get :index, params: { f: { example_query_facet_field: ['bogus'] } } # bogus custom facet value
         expect(assigns(:response).docs).to be_empty
       end
 
       it "returns results (possibly 0) when the user asks for a valid value to a custom facet query", integration: true do
-        get :index, params: { f: { example_query_facet_field: 'years_25' } } # valid custom facet value with some results
+        get :index, params: { f: { example_query_facet_field: ['years_25'] } } # valid custom facet value with some results
         expect(assigns(:response).docs).not_to be_empty
       end
 
       it "returns no results when the users asks for a value that doesn't match any" do
-        get :index, params: { f: { example_query_facet_field: 'years_5' } } # valid custom facet value with NO results
+        get :index, params: { f: { example_query_facet_field: ['years_5'] } } # valid custom facet value with NO results
         expect(assigns(:response).docs).to be_empty
       end
 
@@ -161,20 +158,20 @@ RSpec.describe CatalogController, api: true do
 
         format = facets.find { |x| x['id'] == 'format' }
 
-        expect(format['attributes']['items'].map { |x| x['attributes'] }).to match_array([{ "value" => "Book", "hits" => 30, "label" => "Book" }])
+        expect(format['attributes']['items'].pluck('attributes')).to match_array([{ "value" => "Book", "hits" => 30, "label" => "Book" }])
         expect(format['links']['self']).to eq facet_catalog_url(format: :json, id: 'format')
         expect(format['attributes']['items'].first['links']['self']).to eq search_catalog_url(format: :json, f: { format: ['Book'] })
       end
 
       it "gets the search fields" do
         expect(search_fields).to have(4).fields
-        expect(search_fields.map { |x| x['id'] }).to match_array %w[all_fields author subject title]
+        expect(search_fields.pluck('id')).to match_array %w[all_fields author subject title]
         expect(search_fields.first['links']['self']).to eq search_catalog_url(format: :json, search_field: 'all_fields')
       end
 
       describe "facets" do
         let(:query_facet) { facets.find { |x| x['id'] == 'example_query_facet_field' } }
-        let(:query_facet_items) { query_facet['attributes']['items'].map { |x| x['attributes'] } }
+        let(:query_facet_items) { query_facet['attributes']['items'].pluck('attributes') }
 
         it "has items with labels and values" do
           expect(query_facet_items.first['label']).to eq 'within 25 Years'
@@ -339,7 +336,7 @@ RSpec.describe CatalogController, api: true do
       before do
         allow(mock_document).to receive_messages(export_formats: {})
         allow(controller).to receive(:search_service).and_return(search_service)
-        expect(search_service).to receive(:fetch).and_return([mock_response, mock_document])
+        expect(search_service).to receive(:fetch).and_return(mock_document)
         allow(controller).to receive(:current_search_session).and_return(current_search)
       end
 
@@ -399,7 +396,7 @@ RSpec.describe CatalogController, api: true do
 
     it "renders show.html.erb" do
       allow(controller).to receive(:search_service).and_return(search_service)
-      expect(search_service).to receive(:fetch).and_return([mock_response, mock_document])
+      expect(search_service).to receive(:fetch).and_return(mock_document)
 
       get :show, params: { id: doc_id }
       expect(response).to render_template(:show)
@@ -408,7 +405,7 @@ RSpec.describe CatalogController, api: true do
     describe '@document' do
       before do
         allow(controller).to receive(:search_service).and_return(search_service)
-        expect(search_service).to receive(:fetch).and_return([mock_response, mock_document])
+        expect(search_service).to receive(:fetch).and_return(mock_document)
 
         get :show, params: { id: doc_id }
       end
@@ -434,7 +431,7 @@ RSpec.describe CatalogController, api: true do
         Mime::Type.register "application/mock", :mock
         SolrDocument.use_extension(FakeExtension)
         allow(controller).to receive(:search_service).and_return(search_service)
-        expect(search_service).to receive(:fetch).and_return([nil, SolrDocument.new(id: 'my_fake_doc')])
+        expect(search_service).to receive(:fetch).and_return(SolrDocument.new(id: 'my_fake_doc'))
       end
 
       after do
@@ -470,23 +467,7 @@ RSpec.describe CatalogController, api: true do
     end
   end
 
-  describe 'GET suggest' do
-    it 'returns JSON' do
-      get :suggest, params: { format: 'json' }
-      expect(response.body).to eq [].to_json
-    end
-
-    it 'returns suggestions' do
-      get :suggest, params: { format: 'json', q: 'new' }
-      json = JSON.parse(response.body)
-      expect(json.count).to eq 5
-      expect(json.first['term']).to eq 'new jersey'
-    end
-  end
-
   describe "email/sms" do
-    let(:mock_response) { instance_double(Blacklight::Solr::Response, documents: [SolrDocument.new(id: 'my_fake_doc'), SolrDocument.new(id: 'my_other_doc')]) }
-
     before do
       mock_document.extend(Blacklight::Document::Sms)
       mock_document.extend(Blacklight::Document::Email)
@@ -494,7 +475,7 @@ RSpec.describe CatalogController, api: true do
       allow(mock_document).to receive(:to_model).and_return(SolrDocument.new(id: 'my_fake_doc'))
 
       allow(controller).to receive(:search_service).and_return(search_service)
-      expect(search_service).to receive(:fetch).and_return([mock_response, [mock_document]])
+      expect(search_service).to receive(:fetch).and_return([mock_document])
       request.env["HTTP_REFERER"] = "/catalog/#{doc_id}"
       SolrDocument.use_extension(Blacklight::Document::Email)
       SolrDocument.use_extension(Blacklight::Document::Sms)
@@ -535,10 +516,6 @@ RSpec.describe CatalogController, api: true do
         post :email, xhr: true, params: { id: doc_id, to: 'test_email@projectblacklight.org' }
         expect(request).to render_template 'email_success'
         expect(request.flash[:success]).to eq "Email Sent"
-        allow(search_service).to receive(:search_results)
-        # When we go to another page, the flash message should no longer display
-        get :index
-        expect(request.flash[:success]).to be_nil
       end
     end
 
@@ -585,7 +562,7 @@ RSpec.describe CatalogController, api: true do
 
       it "redirects back to the record upon success" do
         post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
-        expect(request.flash[:error]).to eq nil
+        expect(request.flash[:error]).to be_nil
         expect(request).to redirect_to(solr_document_path(doc_id))
       end
 
@@ -593,10 +570,6 @@ RSpec.describe CatalogController, api: true do
         post :sms, xhr: true, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
         expect(request).to render_template 'sms_success'
         expect(request.flash[:success]).to eq "SMS Sent"
-        allow(search_service).to receive(:search_results)
-        # When we go to another page, the flash message should no longer display
-        get :index
-        expect(request.flash[:success]).to be_nil
       end
     end
   end
@@ -615,31 +588,6 @@ RSpec.describe CatalogController, api: true do
         get :citation, params: { id: "bad-record-identifer" }
       end.to raise_error Blacklight::Exceptions::RecordNotFound
     end
-
-    context "when there is an invalid search", api: false do
-      let(:service) { instance_double(Blacklight::SearchService) }
-      let(:fake_error) { Blacklight::Exceptions::InvalidRequest.new }
-
-      before do
-        allow(controller).to receive(:search_service).and_return(service)
-        allow(service).to receive(:search_results) { |*_args| raise fake_error }
-        allow(Rails.env).to receive_messages(test?: false)
-      end
-
-      it "redirects the user to the root url for a bad search" do
-        expect(controller.logger).to receive(:error).with(fake_error)
-        get :index, params: { q: '+' }
-        expect(response.redirect_url).to eq root_url
-        expect(request.flash[:notice]).to eq "Sorry, I don't understand your search."
-        expect(response).not_to be_successful
-        expect(response.status).to eq 302
-      end
-
-      it "returns status 500 if the catalog path is raising an exception" do
-        allow(controller).to receive(:flash).and_return(notice: I18n.t('blacklight.search.errors.request_error'))
-        expect { get :index, params: { q: '+' } }.to raise_error Blacklight::Exceptions::InvalidRequest
-      end
-    end
   end
 
   context "without a user authentication provider" do
@@ -787,7 +735,7 @@ RSpec.describe CatalogController, api: true do
     end
 
     describe "with a facet" do
-      before { allow(controller).to receive_messages(params: { f: { "field" => ["value"] } }) }
+      before { allow(controller).to receive_messages(params: { f: { "format" => ["value"] } }) }
 
       it { is_expected.to be true }
     end
@@ -849,76 +797,6 @@ RSpec.describe CatalogController, api: true do
       expect(controller.send(:search_facet_path, id: "some_facet", page: 5)).to eq facet_catalog_path(id: "some_facet")
     end
   end
-
-  describe "facet_limit_for" do
-    let(:blacklight_config) { controller.blacklight_config }
-
-    it "returns specified value for facet_field specified" do
-      expect(controller.facet_limit_for("subject_ssim")).to eq blacklight_config.facet_fields["subject_ssim"].limit
-    end
-
-    it "facet_limit_hash should return hash with key being facet_field and value being configured limit" do
-      # facet_limit_hash has been removed from solrhelper in refactor. should it go back?
-      skip "facet_limit_hash has been removed from solrhelper in refactor. should it go back?"
-      expect(controller.facet_limit_hash).to eq blacklight_config[:facet][:limits]
-    end
-
-    it "handles no facet_limits in config" do
-      blacklight_config.facet_fields = {}
-      expect(controller.facet_limit_for("subject_ssim")).to be_nil
-    end
-
-    describe "for 'true' configured values" do
-      before do
-        allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
-      end
-
-      let(:blacklight_config) do
-        Blacklight::Configuration.new do |config|
-          config.add_facet_field "language_facet", limit: true
-        end
-      end
-
-      it "returns nil if no @response available" do
-        expect(controller.facet_limit_for("some_unknown_field")).to be_nil
-      end
-
-      it "gets from @response facet.limit if available" do
-        response = instance_double(Blacklight::Solr::Response, aggregations: { "language_facet" => double(limit: nil) })
-        controller.instance_variable_set(:@response, response)
-        blacklight_config.facet_fields['language_facet'].limit = 10
-        expect(controller.facet_limit_for("language_facet")).to eq 10
-      end
-
-      it "gets the limit from the facet field in @response" do
-        response = instance_double(Blacklight::Solr::Response, aggregations: { "language_facet" => double(limit: 16) })
-        controller.instance_variable_set(:@response, response)
-        expect(controller.facet_limit_for("language_facet")).to eq 15
-      end
-
-      it "defaults to 10" do
-        expect(controller.facet_limit_for("language_facet")).to eq 10
-      end
-    end
-
-    context 'for facet fields with a key that is different from the field name' do
-      before do
-        allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
-      end
-
-      let(:blacklight_config) do
-        Blacklight::Configuration.new do |config|
-          config.add_facet_field 'some_key', field: 'x', limit: true
-        end
-      end
-
-      it 'gets the limit from the facet field in the @response' do
-        response = instance_double(Blacklight::Solr::Response, aggregations: { 'x' => double(limit: 16) })
-        controller.instance_variable_set(:@response, response)
-        expect(controller.facet_limit_for('some_key')).to eq 15
-      end
-    end
-  end
 end
 
 # there must be at least one facet, and each facet must have at least one value

data/spec/features/advanced_search_spec.rb

@@ -5,28 +5,9 @@ require 'spec_helper'
 RSpec.describe "Blacklight Advanced Search Form" do
   describe "advanced search form" do
     before do
-      CatalogController.blacklight_config.search_fields['all_fields']['clause_params'] = {
-        edismax: {}
-      }
-      CatalogController.blacklight_config.search_fields['author']['clause_params'] = {
-        edismax: { qf: '${author_qf}' }
-      }
-      CatalogController.blacklight_config.search_fields['title']['clause_params'] = {
-        edismax: { qf: '${title_qf}' }
-      }
-      CatalogController.blacklight_config.search_fields['subject']['clause_params'] = {
-        edismax: { qf: '${subject_qf}' }
-      }
-      CatalogController.blacklight_config.json_solr_path = 'advanced'
       visit '/catalog/advanced?hypothetical_existing_param=true&q=ignore+this+existing+query'
     end
 
-    after do
-      %w[all_fields author title subject].each do |field|
-        CatalogController.blacklight_config.search_fields[field].delete(:clause_params)
-      end
-    end
-
     it "has field and facet blocks" do
       expect(page).to have_selector('.query-criteria')
       expect(page).to have_selector('.limit-criteria')
@@ -64,43 +45,6 @@ RSpec.describe "Blacklight Advanced Search Form" do
       click_on 'advanced-search-submit'
       expect(page).to have_content 'Remove constraint Title: Medicine'
       expect(page).to have_content 'Strong Medicine speaks'
-      expect(page).to have_selector('article.document', count: 1)
-    end
-
-    it 'can limit to facets' do
-      fill_in 'Subject', with: 'Women'
-      click_on 'Language'
-      check 'Urdu 3'
-      click_on 'advanced-search-submit'
-      expect(page).to have_content 'Pākistānī ʻaurat dorāhe par'
-      expect(page).not_to have_content 'Ajikto kŭrŏk chŏrŏk sasimnikka : and 아직도　그럭　저럭　사십니까'
-      expect(page).to have_selector('article.document', count: 1)
-    end
-
-    it 'handles boolean queries' do
-      fill_in 'All Fields', with: 'history NOT strong'
-      click_on 'advanced-search-submit'
-      expect(page).to have_content('Ci an zhou bian')
-      expect(page).not_to have_content('Strong Medicine speaks')
-      expect(page).to have_selector('article.document', count: 10)
-    end
-
-    it 'handles queries in multiple fields with the ALL operator' do
-      fill_in 'All Fields', with: 'history'
-      fill_in 'Author', with: 'hearth'
-      click_on 'advanced-search-submit'
-      expect(page).to have_content('Strong Medicine speaks')
-      expect(page).to have_selector('article.document', count: 1)
-    end
-
-    it 'handles queries in multiple fields with the ANY operator' do
-      select 'any', from: 'op'
-      fill_in 'All Fields', with: 'history'
-      fill_in 'Subject', with: 'women'
-      click_on 'advanced-search-submit'
-      expect(page).to have_content('Ci an zhou bian')
-      expect(page).to have_content('Pākistānī ʻaurat dorāhe par')
-      expect(page).to have_selector('article.document', count: 10)
     end
   end
 

data/spec/features/autocomplete_spec.rb

@@ -3,6 +3,6 @@
 RSpec.describe 'Autocomplete suggestions' do
   it 'search form has suggest path' do
     visit root_path
-    expect(page).to have_css 'input[data-autocomplete-path="/catalog/suggest"]'
+    expect(page).to have_css 'auto-complete[src="/catalog/suggest"]'
   end
 end

data/spec/features/axe_spec.rb

@@ -21,11 +21,6 @@ RSpec.describe 'Accessibility testing', api: false, js: true do
     expect(page).to be_accessible
   end
 
-  it 'validates the advanced search form' do
-    visit advanced_search_catalog_path
-    expect(page).to be_accessible.excluding('.search-query-form')
-  end
-
   it 'validates the single results page' do
     visit solr_document_path('2007020969')
     expect(page).to be_accessible
@@ -33,6 +28,6 @@ RSpec.describe 'Accessibility testing', api: false, js: true do
 
   def be_accessible(skipping: [])
     # typeahead does funny things with the search bar
-    be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if Bootstrap::VERSION < '5')].compact)
+    be_axe_clean.excluding('.tt-hint').skipping(skipping + [('color-contrast' if defined?(Bootstrap) && Bootstrap::VERSION < '5')].compact)
   end
 end

data/spec/features/bookmarks_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe "Bookmarks" do
     check 'Bookmark'
 
     visit solr_document_path('2007020969')
-    expect(page).to have_css('input[type="checkbox"]:checked')
+    expect(page).to have_css('input[type="checkbox"][checked]')
     uncheck 'In Bookmarks'
   end
 

data/spec/features/facets_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe "Facets" do
     page.find('h3.facet-field-heading button', text: 'Pivot Field').click
 
     within '#facet-example_pivot_field' do
-      expect(page).to have_css('.facet-leaf-node', text: "Book 30")
+      expect(page).to have_css('.facet-leaf-node', text: "Book 30", normalize_ws: true)
       expect(page).not_to have_css('.facet-select', text: 'Tibetan')
       page.find('.facet-toggle-handle').click
       click_link 'Tibetan'

data/spec/features/search_context_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-RSpec.describe "Search Results context", js: true do
-  it "passes the current search id through" do
+RSpec.describe "Search Results context" do
+  it "passes the current search id through", js: true do
     search_for ''
     click_on 'Pluvial nectar of blessings'
     search_id = Search.last.id.to_s
@@ -16,7 +16,7 @@ RSpec.describe "Search Results context", js: true do
     expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&document_id=2004310986&search_id=#{search_id}"
   end
 
-  it "redirects context urls to the original url" do
+  it "redirects context urls to the original url", js: true do
     search_for ''
     first('.index_title a').click
     expect(page).to have_content "« Previous | 1 of 30 | Next »"
@@ -43,7 +43,7 @@ RSpec.describe "Search Results context", js: true do
   end
 
   context "navigating between search results using context pagination" do
-    it "updates the back to search link with the current search pagination context" do
+    it "updates the back to search link with the current search pagination context", js: true do
       search_for ''
       expect(page).to have_content "1 - 10"
       find_all('.index_title a').last.click
@@ -55,9 +55,3 @@ RSpec.describe "Search Results context", js: true do
     end
   end
 end
-
-def search_for q
-  visit root_path
-  fill_in "q", with: q
-  click_button 'search'
-end

data/spec/features/search_results_spec.rb

@@ -58,36 +58,3 @@ RSpec.describe "Search Results" do
     expect(page).to have_xpath("//a[contains(@href, 77826928)]")
   end
 end
-
-def search_for q
-  visit root_path
-  fill_in "q", with: q
-  click_button 'search'
-end
-
-def position_in_result_page(page, id)
-  i = -1
-  page.all(".index_title a").each_with_index do |link, idx|
-    i = (idx + 1) if link['href'] =~ Regexp.new(Regexp.escape(id) + "$")
-  end
-  i.to_i
-end
-
-def number_of_results_for_query(query)
-  visit root_path
-  fill_in "q", with: query
-  click_button "search"
-  get_number_of_results_from_page(page)
-end
-
-def number_of_results_from_page(page)
-  tmp_value = Capybara.ignore_hidden_elements
-  Capybara.ignore_hidden_elements = false
-  val = begin
-          page.find("meta[name=totalResults]")['content'].to_i
-        rescue StandardError
-          0
-        end
-  Capybara.ignore_hidden_elements = tmp_value
-  val
-end

data/spec/features/sitelinks_search_box.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+describe 'Sitelinks search box' do
+  it 'is home page' do
+    visit root_path
+    expect(page).to have_css 'script[type="application/ld+json"]'
+  end
+
+  it 'on search page' do
+    visit search_catalog_path q: 'book'
+    expect(page).not_to have_css 'script[type="application/ld+json"]'
+  end
+end