blacklight 8.2.2 → 8.3.0

data/spec/features/search_pagination_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe "Search Pagination" do
   it "has results with pagination" do
     visit root_path
     fill_in "q", with: ''
-    click_button 'search'
+    click_on 'search'
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 10 of "
       within '#per_page-dropdown' do
@@ -15,11 +15,11 @@ RSpec.describe "Search Pagination" do
       end
     end
     within '#sortAndPerPage' do
-      click_link "Next »"
+      click_on "Next »"
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "11 - 20 of "
-      click_link "« Previous"
+      click_on "« Previous"
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "1 - 10 of "
@@ -29,13 +29,13 @@ RSpec.describe "Search Pagination" do
   it "is able to change the number of items per page" do
     visit root_path
     fill_in "q", with: ''
-    click_button 'search'
+    click_on 'search'
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 10 of "
     end
 
     within ("#per_page-dropdown") do
-      click_link '20'
+      click_on '20'
     end
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 20 of "
@@ -59,7 +59,7 @@ RSpec.describe "Search Pagination" do
     it "uses the configured values" do
       visit root_path
       fill_in "q", with: ''
-      click_button 'search'
+      click_on 'search'
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 - 15 of "
         within '#per_page-dropdown' do
@@ -68,7 +68,7 @@ RSpec.describe "Search Pagination" do
         end
       end
       within ("#per_page-dropdown") do
-        click_link '30'
+        click_on '30'
       end
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 - 30 of "
@@ -79,15 +79,15 @@ RSpec.describe "Search Pagination" do
   it "resets the page offset to 1 when changing per page" do
     visit root_path
     fill_in "q", with: ''
-    click_button 'search'
+    click_on 'search'
     within "#sortAndPerPage" do
-      click_link "Next »"
+      click_on "Next »"
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "11 - 20 of "
     end
     within ("#per_page-dropdown") do
-      click_link '20'
+      click_on '20'
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "1 - 20 of "

data/spec/features/search_results_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe "Search Results" do
     visit root_path
     fill_in "q", with: "inmul"
     select "Author", from: "search_field"
-    click_button 'search'
+    click_on 'search'
     expect(page).to have_content "No results found for your search"
     expect(page).to have_content "you searched by Author"
     click_on "try searching everything"

data/spec/features/search_sort_spec.rb

@@ -4,19 +4,19 @@ RSpec.describe "Search Sort" do
   it "sorts on facet results with no search terms" do
     visit root_path
     within "#facet-language_ssim" do
-      click_link 'English'
+      click_on 'English'
     end
     expect(page).to have_content 'Sort by relevance'
-    click_link 'title'
+    click_on 'title'
     expect(page).to have_content 'Sort by title'
   end
 
   it "sorts on search" do
     visit root_path
     fill_in "q", with: 'bod'
-    click_button 'search'
+    click_on 'search'
     expect(page).to have_content 'Sort by relevance'
-    click_link 'title'
+    click_on 'title'
     expect(page).to have_content 'Sort by title'
   end
 end

data/spec/features/search_spec.rb

@@ -3,25 +3,25 @@
 RSpec.describe "Search Page" do
   it 'declares the page language in the html lang attribute' do
     visit root_path
-    expect(page).to have_selector('html[lang=en]')
+    expect(page).to have_css('html[lang=en]')
   end
 
   it "shows welcome" do
     visit root_path
-    expect(page).to have_selector("input#q")
+    expect(page).to have_field("search for")
     within ("select#search_field") do
-      expect(page).to have_selector('option', text: 'All Fields')
-      expect(page).to have_selector('option', text: 'Title')
-      expect(page).to have_selector('option', text: 'Author')
-      expect(page).to have_selector('option', text: 'Subject')
+      expect(page).to have_css('option', text: 'All Fields')
+      expect(page).to have_css('option', text: 'Title')
+      expect(page).to have_css('option', text: 'Author')
+      expect(page).to have_css('option', text: 'Subject')
     end
-    expect(page).to have_selector("button[type='submit'] .submit-search-text")
-    expect(page).not_to have_link "Start Over"
+    expect(page).to have_css("button[type='submit'] .submit-search-text")
+    expect(page).to have_no_link "Start Over"
 
     expect(page).to have_content "Welcome!"
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
-    expect(page).to have_selector("link[rel=stylesheet]")
+    expect(page).to have_css("link[rel=stylesheet]")
     Capybara.ignore_hidden_elements = tmp_value
   end
 
@@ -29,18 +29,18 @@ RSpec.describe "Search Page" do
     visit root_path
     fill_in "q", with: 'history'
     select 'All Fields', from: 'search_field'
-    click_button 'search'
+    click_on 'search'
 
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
-    expect(page).to have_selector("link[rel=alternate][type='application/rss+xml']")
-    expect(page).to have_selector("link[rel=alternate][type='application/atom+xml']")
-    expect(page).to have_selector("link[rel=alternate][type='application/json']")
+    expect(page).to have_css("link[rel=alternate][type='application/rss+xml']")
+    expect(page).to have_css("link[rel=alternate][type='application/atom+xml']")
+    expect(page).to have_css("link[rel=alternate][type='application/json']")
 
     # opensearch
-    expect(page).to have_selector("meta[name=totalResults]")
-    expect(page).to have_selector("meta[name=startIndex]")
-    expect(page).to have_selector("meta[name=itemsPerPage]")
+    expect(page).to have_css("meta[name=totalResults]")
+    expect(page).to have_css("meta[name=startIndex]")
+    expect(page).to have_css("meta[name=itemsPerPage]")
     Capybara.ignore_hidden_elements = tmp_value
 
     within "#appliedParams" do
@@ -49,7 +49,7 @@ RSpec.describe "Search Page" do
     end
 
     within ("select#search_field") do
-      expect(page).to have_selector("option[selected]", text: "All Fields")
+      expect(page).to have_css("option[selected]", text: "All Fields")
     end
 
     within ("#sortAndPerPage") do
@@ -63,7 +63,7 @@ RSpec.describe "Search Page" do
       end
     end
     within "#documents" do
-      expect(page).to have_selector(".document", count: 10)
+      expect(page).to have_css(".document", count: 10)
     end
   end
 
@@ -71,7 +71,7 @@ RSpec.describe "Search Page" do
     visit root_path
     fill_in "q", with: 'inmul'
     select 'Title', from: 'search_field'
-    click_button 'search'
+    click_on 'search'
 
     within "#appliedParams" do
       expect(page).to have_content "You searched for:"
@@ -79,7 +79,7 @@ RSpec.describe "Search Page" do
       expect(page).to have_content "inmul"
     end
     within ("select#search_field") do
-      expect(page).to have_selector("option[selected]", text: "Title")
+      expect(page).to have_css("option[selected]", text: "Title")
     end
     within(".index_title") do
       expect(page).to have_content "1."
@@ -92,7 +92,7 @@ RSpec.describe "Search Page" do
   it "shows vernacular (Linked 880) and call number" do
     visit root_path
     fill_in "q", with: 'history'
-    click_button 'search'
+    click_on 'search'
     within "#documents" do
       expect(page).to have_content "次按驟變"
       expect(page).to have_content "DK861.K3 V5"
@@ -102,17 +102,17 @@ RSpec.describe "Search Page" do
   it "allows you to clear the search" do
     visit root_path
     fill_in "q", with: 'history'
-    click_button 'search'
+    click_on 'search'
     within "#appliedParams" do
       expect(page).to have_content "You searched for:"
       expect(page).to have_content "history"
     end
 
-    expect(page).to have_selector "#q[value='history']"
+    expect(page).to have_css "#q[value='history']"
 
-    click_link "Start Over"
+    click_on "Start Over"
 
     expect(page).to have_content "Welcome!"
-    expect(page).not_to have_selector "#q[value='history']"
+    expect(page).to have_no_css "#q[value='history']"
   end
 end

data/spec/features/sitelinks_search_box_spec.rb

@@ -3,11 +3,11 @@
 RSpec.describe 'Sitelinks search box' do
   it 'is home page' do
     visit root_path
-    expect(page).to have_selector 'script[type="application/ld+json"]', visible: :hidden
+    expect(page).to have_css 'script[type="application/ld+json"]', visible: :hidden
   end
 
   it 'on search page' do
     visit search_catalog_path q: 'book'
-    expect(page).not_to have_selector 'script[type="application/ld+json"]', visible: :hidden
+    expect(page).to have_no_css 'script[type="application/ld+json"]', visible: :hidden
   end
 end

data/spec/features/sms_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe 'SMS functionality' do
   before { visit solr_document_path('2007020969') }
 
   it 'displays SMS modal with form' do
-    click_link 'SMS'
+    click_on 'SMS'
     expect(find('div.modal-header')).to have_text 'SMS This'
     fill_in 'Phone Number:', with: '555-555-5555'
     select 'Verizon', from: 'Carrier'

data/spec/helpers/blacklight/layout_helper_behavior_spec.rb

@@ -30,9 +30,26 @@ RSpec.describe Blacklight::LayoutHelperBehavior do
   end
 
   describe '#container_classes' do
-    it 'returns a string of classe(s)' do
-      expect(helper.container_classes).to be_an String
-      expect(helper.container_classes).to eq 'container'
+    before do
+      allow(view).to receive(:blacklight_config).and_return(config)
+    end
+
+    context 'when not full-width' do
+      let(:config) { Blacklight::Configuration.new }
+
+      it 'returns a string of classe(s)' do
+        expect(helper.container_classes).to be_an String
+        expect(helper.container_classes).to eq 'container'
+      end
+    end
+
+    context 'when full-width' do
+      let(:config) { Blacklight::Configuration.new(full_width_layout: true) }
+
+      it 'returns a string of classe(s)' do
+        expect(helper.container_classes).to be_an String
+        expect(helper.container_classes).to eq 'container-fluid'
+      end
     end
   end
 

data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb

@@ -40,8 +40,9 @@ RSpec.describe Blacklight::RenderPartialsHelperBehavior do
     end
 
     it "gets the document format from document_partial_name" do
-      allow(helper).to receive(:document_partial_name).with(doc, :xyz)
+      allow(helper).to receive(:document_partial_name)
       helper.render_document_partial(doc, :xyz)
+      expect(helper).to have_received(:document_partial_name).with(doc, :xyz)
     end
   end
 

data/spec/helpers/blacklight/url_helper_behavior_spec.rb

@@ -11,8 +11,7 @@ RSpec.describe Blacklight::UrlHelperBehavior do
   let(:parameter_class) { ActionController::Parameters }
 
   before do
-    allow(controller).to receive(:controller_name).and_return('test')
-    allow(controller).to receive(:search_state_class).and_return(Blacklight::SearchState)
+    allow(controller).to receive_messages(controller_name: 'test', search_state_class: Blacklight::SearchState)
     allow(helper).to receive(:search_action_path) do |*args|
       search_catalog_url *args
     end
@@ -112,18 +111,18 @@ RSpec.describe Blacklight::UrlHelperBehavior do
     end
 
     it "consists of the document title wrapped in a <a>" do
-      expect(helper.link_to_document(document)).to have_selector("a", text: '654321', count: 1)
+      expect(helper.link_to_document(document)).to have_css("a", text: '654321', count: 1)
     end
 
     it "accepts and returns a string label" do
-      expect(helper.link_to_document(document, 'This is the title')).to have_selector("a", text: 'This is the title', count: 1)
+      expect(helper.link_to_document(document, 'This is the title')).to have_css("a", text: 'This is the title', count: 1)
     end
 
     context 'when label is missing' do
       let(:data) { { 'id' => id } }
 
       it "returns id" do
-        expect(helper.link_to_document(document)).to have_selector("a", text: '123456', count: 1)
+        expect(helper.link_to_document(document)).to have_css("a", text: '123456', count: 1)
       end
 
       it "is html safe" do
@@ -142,7 +141,7 @@ RSpec.describe Blacklight::UrlHelperBehavior do
         let(:id) { 123_456 }
 
         it "has a link" do
-          expect(helper.link_to_document(document)).to have_selector("a")
+          expect(helper.link_to_document(document)).to have_css("a")
         end
       end
     end
@@ -154,14 +153,14 @@ RSpec.describe Blacklight::UrlHelperBehavior do
 
     it "includes the data- attributes from the options" do
       link = helper.link_to_document document, data: { x: 1 }
-      expect(link).to have_selector '[data-x]'
+      expect(link).to have_css '[data-x]'
     end
 
     it 'adds a controller-specific tracking attribute' do
       expect(helper.main_app).to receive(:track_test_path).and_return('/asdf')
       link = helper.link_to_document document, data: { x: 1 }
 
-      expect(link).to have_selector '[data-context-href="/asdf"]'
+      expect(link).to have_css '[data-context-href="/asdf"]'
     end
   end
 

data/spec/helpers/blacklight_helper_spec.rb

@@ -73,8 +73,7 @@ RSpec.describe BlacklightHelper do
     end
 
     before do
-      allow(helper).to receive(:document_presenter).and_return(presenter)
-      allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
+      allow(helper).to receive_messages(document_presenter: presenter, blacklight_config: blacklight_config)
     end
 
     it "generates <link rel=alternate> tags" do
@@ -109,8 +108,8 @@ RSpec.describe BlacklightHelper do
       it "renders partials" do
         buff = String.new
         helper.render_nav_actions { |_config, item| buff << "<foo>#{item}</foo>" }
-        expect(buff).to have_selector "foo a#bookmarks_nav[href=\"/bookmarks\"]"
-        expect(buff).to have_selector "foo a span[data-role='bookmark-counter']", text: '0'
+        expect(buff).to have_css "foo a#bookmarks_nav[href=\"/bookmarks\"]"
+        expect(buff).to have_css "foo a span[data-role='bookmark-counter']", text: '0'
       end
     end
 
@@ -118,7 +117,7 @@ RSpec.describe BlacklightHelper do
       it "renders partials" do
         allow(controller).to receive(:render_bookmarks_control?).and_return(true)
         response = helper.render_index_doc_actions(document)
-        expect(response).to have_selector(".bookmark-toggle")
+        expect(response).to have_css(".bookmark-toggle")
       end
 
       it "is nil if no partials are renderable" do
@@ -138,27 +137,28 @@ RSpec.describe BlacklightHelper do
     subject { helper.opensearch_description_tag 'title', 'href' }
 
     it "has a search rel" do
-      expect(subject).to have_selector "link[rel='search']", visible: false
+      expect(subject).to have_css "link[rel='search']", visible: false
     end
 
     it "has the correct mime type" do
-      expect(subject).to have_selector "link[type='application/opensearchdescription+xml']", visible: false
+      expect(subject).to have_css "link[type='application/opensearchdescription+xml']", visible: false
     end
 
     it "has a title attribute" do
-      expect(subject).to have_selector "link[title='title']", visible: false
+      expect(subject).to have_css "link[title='title']", visible: false
     end
 
     it "has an href attribute" do
-      expect(subject).to have_selector "link[href='href']", visible: false
+      expect(subject).to have_css "link[href='href']", visible: false
     end
   end
 
   describe "#render_document_index" do
     it "renders the document index with the current view type" do
       allow(helper).to receive_messages(document_index_view_type: :current_view)
-      allow(helper).to receive(:render_document_index_with_view).with(:current_view, [], { a: 1, b: 2 })
+      allow(helper).to receive(:render_document_index_with_view)
       helper.render_document_index [], a: 1, b: 2
+      expect(helper).to have_received(:render_document_index_with_view).with(:current_view, [], { a: 1, b: 2 })
     end
   end
 
@@ -167,17 +167,15 @@ RSpec.describe BlacklightHelper do
     let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
 
     before do
-      allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
       assign(:response, instance_double(Blacklight::Solr::Response, grouped?: false, start: 0))
-      allow(helper).to receive(:link_to_document).and_return('<a/>')
-      allow(helper).to receive(:render_index_doc_actions).and_return('<div/>')
+      allow(helper).to receive_messages(blacklight_config: blacklight_config, link_to_document: '<a/>', render_index_doc_actions: '<div/>')
     end
 
     it "ignores missing templates" do
       blacklight_config.view.view_type(partials: %w[index_header a b])
 
       response = helper.render_document_index_with_view :view_type, [obj1, obj1]
-      expect(response).to have_selector "div#documents"
+      expect(response).to have_css "div#documents"
     end
 
     context 'with a template partial provided by the view config' do
@@ -191,7 +189,7 @@ RSpec.describe BlacklightHelper do
         # https://github.com/rspec/rspec-rails/commit/4d65bea0619955acb15023b9c3f57a3a53183da8
         # https://github.com/rspec/rspec-rails/issues/2696
         replace_hash = { 'my/_partial.html.erb' => 'some content' }
-        if ::Rails.version.to_f >= 7.1
+        if Rails.version.to_f >= 7.1
           controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
         else
           view.view_paths.unshift(ActionView::FixtureResolver.new(replace_hash))

data/spec/helpers/catalog_helper_spec.rb

@@ -267,8 +267,7 @@ RSpec.describe CatalogHelper do
     subject { helper.render_search_to_page_title(Blacklight::SearchState.new(params, blacklight_config)) }
 
     before do
-      allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
-      allow(helper).to receive(:default_search_field).and_return(Blacklight::Configuration::SearchField.new(key: 'default_search_field', display_label: 'Default'))
+      allow(helper).to receive_messages(blacklight_config: blacklight_config, default_search_field: Blacklight::Configuration::SearchField.new(key: 'default_search_field', display_label: 'Default'))
       allow(helper).to receive(:label_for_search_field).with(nil).and_return('')
     end
 
@@ -299,8 +298,7 @@ RSpec.describe CatalogHelper do
 
   describe "#document_index_view_type" do
     it "defaults to the default view" do
-      allow(helper).to receive(:document_index_views).and_return(a: 1, b: 2)
-      allow(helper).to receive(:default_document_index_view_type).and_return(:xyz)
+      allow(helper).to receive_messages(document_index_views: { a: 1, b: 2 }, default_document_index_view_type: :xyz)
       expect(helper.document_index_view_type).to eq :xyz
     end
 
@@ -310,8 +308,7 @@ RSpec.describe CatalogHelper do
     end
 
     it "uses the default view if the requested view is not available" do
-      allow(helper).to receive(:default_document_index_view_type).and_return(:xyz)
-      allow(helper).to receive(:document_index_views).and_return(a: 1, b: 2)
+      allow(helper).to receive_messages(default_document_index_view_type: :xyz, document_index_views: { a: 1, b: 2 })
       expect(helper.document_index_view_type(view: :c)).to eq :xyz
     end
 

data/spec/i18n_spec.rb

@@ -12,7 +12,8 @@ RSpec.describe 'I18n', type: :i18n do
                             "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"
   end
 
-  pending 'does not have unused keys' do
+  it 'does not have unused keys' do
+    pending 'Many unused keys are detected'
     expect(unused_keys).to be_empty,
                            "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"
   end

data/spec/lib/blacklight/search_state_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe Blacklight::SearchState do
     end
 
     context 'with HashWithIndifferentAccess' do
-      let(:parameter_class) { HashWithIndifferentAccess }
+      let(:parameter_class) { ActiveSupport::HashWithIndifferentAccess }
 
       it 'returns the hash data' do
         expect(search_state.to_h).to eq data.with_indifferent_access
@@ -356,7 +356,7 @@ RSpec.describe Blacklight::SearchState do
   end
 
   describe "#url_for_document" do
-    let(:controller_class) { ::CatalogController.new }
+    let(:controller_class) { CatalogController.new }
     let(:doc) { SolrDocument.new }
 
     before do
@@ -375,7 +375,7 @@ RSpec.describe Blacklight::SearchState do
     end
 
     context "within bookmarks" do
-      let(:controller_class) { ::BookmarksController.new }
+      let(:controller_class) { BookmarksController.new }
 
       it "uses polymorphic routing" do
         expect(search_state.url_for_document(doc)).to eq doc
@@ -383,7 +383,7 @@ RSpec.describe Blacklight::SearchState do
     end
 
     context "within an alternative catalog controller" do
-      let(:controller_class) { ::AlternateController.new }
+      let(:controller_class) { AlternateController.new }
 
       before do
         search_state.blacklight_config.show.route = { controller: :current }

data/spec/lib/tasks/blacklight_task_spec.rb

@@ -13,7 +13,8 @@ RSpec.describe "blacklight:delete_old_searches" do
 
   it "calls Search.delete_old_searches" do
     days_old = 7
-    allow(Search).to receive(:delete_old_searches).with(days_old)
+    allow(Search).to receive(:delete_old_searches)
     @rake[@task_name].invoke(days_old)
+    expect(Search).to have_received(:delete_old_searches).with(days_old)
   end
 end

data/spec/models/blacklight/configurable_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Blacklight::Configurable", api: true do
+RSpec.describe "Blacklight::Configurable", :api do
   describe "inheritence" do
     before(:all) do
       module TestCaseInheritence

data/spec/models/blacklight/configuration/context_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::Configuration::Context, api: true do
+RSpec.describe Blacklight::Configuration::Context, :api do
   subject { described_class.new(context) }
 
   let(:context) { double }

data/spec/models/blacklight/configuration_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Blacklight::Configuration", api: true do
+RSpec.describe "Blacklight::Configuration", :api do
   let(:config) do
     Blacklight::Configuration.new
   end
@@ -352,7 +352,7 @@ RSpec.describe "Blacklight::Configuration", api: true do
       expect(config.index_fields.keys).to eq %w[some_field_display another_field_display]
     end
 
-    it "queries solr and get live values for match fields", integration: true do
+    it "queries solr and get live values for match fields", :integration do
       config.add_index_field match: /title.+sim/
       expect(config.index_fields.keys).to include "subtitle_tsim", "subtitle_vern_ssim", "title_tsim", "title_vern_ssim"
     end

data/spec/models/blacklight/document/active_model_shim_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe 'Blacklight::Document::ActiveModelShim', api: true do
+RSpec.describe 'Blacklight::Document::ActiveModelShim', :api do
   class MockDocument
     include Blacklight::Document
     include Blacklight::Document::ActiveModelShim

data/spec/models/blacklight/document/cache_key_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::Document::CacheKey, api: true do
+RSpec.describe Blacklight::Document::CacheKey, :api do
   let(:attributes) { {} }
   let(:subject) { SolrDocument.new(attributes) }
 

data/spec/models/blacklight/document_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::Document, api: true do
+RSpec.describe Blacklight::Document, :api do
   subject do
     Class.new do
       include Blacklight::Document