blacklight 8.8.3 → 9.0.0.beta1

data/spec/features/bookmarks_spec.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe "Bookmarks" do
+  before do
+    # Prevent any existing bookmarks from interfering
+    Bookmark.delete_all
+  end
+
   describe "navigating from the homepage" do
     it "has a link to the history page" do
       sign_in 'user1'
@@ -40,13 +45,25 @@ RSpec.describe "Bookmarks" do
     expect(page).to have_content 'Successfully removed bookmark.'
   end
 
-  it 'shows bookmarks as checkboxes', :js do
-    visit solr_document_path('2007020969')
-    check 'Bookmark'
+  context 'when bookmark_icon_component is set to nil' do
+    let!(:default_bookmark_icon_component) { CatalogController.blacklight_config.bookmark_icon_component }
 
-    visit solr_document_path('2007020969')
-    expect(page).to have_css('input[type="checkbox"][checked]')
-    uncheck 'In Bookmarks'
+    before do
+      CatalogController.blacklight_config.bookmark_icon_component = nil
+    end
+
+    after do
+      CatalogController.blacklight_config.bookmark_icon_component = default_bookmark_icon_component
+    end
+
+    it 'shows bookmarks as checkboxes', :js do
+      visit solr_document_path('2007020969')
+      check 'Bookmark'
+
+      visit solr_document_path('2007020969')
+      expect(page).to have_css('input[type="checkbox"][checked]')
+      uncheck 'In Bookmarks'
+    end
   end
 
   it "adds bookmarks after a user logs in" do
@@ -82,17 +99,37 @@ RSpec.describe "Bookmarks" do
     expect(page).to have_content 'Ci an zhou bian'
   end
 
-  context "has bookmark icon" do
+  context "when the bookmark icon is configured (default)" do
+    it 'shows bookmark icon', :js do
+      visit solr_document_path('2007020969')
+      expect(page).to have_css('.blacklight-icons-bookmark')
+      find('.blacklight-icons-bookmark').click
+
+      expect(find('.toggle-bookmark-input', visible: false)).to be_checked
+      find('.blacklight-icons-bookmark').click
+    end
+  end
+
+  context "without bookmark navbar element" do
+    let!(:default_nav_partials) { CatalogController.blacklight_config.navbar.partials }
+
     before do
-      CatalogController.blacklight_config.bookmark_icon_component = Blacklight::Icons::BookmarkIconComponent
+      CatalogController.blacklight_config.navbar.partials = CatalogController.blacklight_config.navbar.partials.except(:bookmark)
+    end
+
+    after do
+      CatalogController.blacklight_config.navbar.partials = default_nav_partials
     end
 
-    it 'shows bookmark icon instead of checkbox', :js do
+    it 'adds and removes bookmarks', :js do
       visit solr_document_path('2007020969')
-      expect(page).to have_css('.blacklight-icons-bookmark')
+      expect(page).to have_no_css('#bookmarks_nav')
       find('.blacklight-icons-bookmark').click
 
-      expect(find('.toggle-bookmark[type="checkbox"]', visible: false)).to be_checked
+      expect(page).to have_content 'In Bookmarks'
+
+      visit solr_document_path('2007020969')
+      expect(find('.toggle-bookmark-input', visible: false)).to be_checked
       find('.blacklight-icons-bookmark').click
     end
   end

data/spec/features/facets_spec.rb

@@ -100,49 +100,34 @@ RSpec.describe "Facets" do
   end
 
   describe 'Facet modal' do
-    context 'when configured' do
-      before do
-        enabled = CatalogController.blacklight_config.dup
-        enabled.facet_fields[:subject_ssim].merge!({ suggest: true })
-        allow(CatalogController).to receive(:blacklight_config).and_return enabled
-      end
-
-      it 'allows the user to filter a long list of facet values', :js do
-        visit '/catalog/facet/subject_ssim'
-        expect(page).to have_no_link 'Old age' # This is on the second page of facet values
-        expect(page).to have_css 'a.facet-select', count: 20
+    it 'allows the user to filter a long list of facet values', :js do
+      visit '/catalog/facet/subject_ssim'
+      expect(page).to have_no_link 'Old age' # This is on the second page of facet values
+      expect(page).to have_css 'a.facet-select', count: 20
 
-        fill_in 'facet_suggest_subject_ssim', with: "ag"
+      fill_in 'facet_suggest_subject_ssim', with: "ag"
 
-        expect(page).to have_link 'Old age'
-        expect(page).to have_css 'a.facet-select', count: 2
-      end
-
-      it 'shows the user facet suggestions that are relevant to their q param', :js do
-        visit '/catalog/facet/subject_ssim?q=tibet&search_field=all_fields'
-        fill_in 'facet_suggest_subject_ssim', with: 'la'
+      expect(page).to have_link 'Old age'
+      expect(page).to have_css 'a.facet-select', count: 2
+    end
 
-        expect(page).to have_link 'Tibetan language'
-        expect(page).to have_css 'a.facet-select', count: 1
-      end
+    it 'shows the user facet suggestions that are relevant to their q param', :js do
+      visit '/catalog/facet/subject_ssim?q=tibet&search_field=all_fields'
+      fill_in 'facet_suggest_subject_ssim', with: 'la'
 
-      it 'allows the user to filter more than once', :js do
-        visit '/catalog/facet/subject_ssim'
-        expect(page).to have_no_link 'Old age' # This is on the second page of facet values
-        expect(page).to have_css 'a.facet-select', count: 20
+      expect(page).to have_link 'Tibetan language'
+      expect(page).to have_css 'a.facet-select', count: 1
+    end
 
-        fill_in 'facet_suggest_subject_ssim', with: "ag"
+    it 'allows the user to filter more than once', :js do
+      visit '/catalog/facet/subject_ssim'
+      expect(page).to have_no_link 'Old age' # This is on the second page of facet values
+      expect(page).to have_css 'a.facet-select', count: 20
 
-        expect(page).to have_link 'Old age'
-        expect(page).to have_link('Old age', href: '/?f%5Bsubject_ssim%5D%5B%5D=Old+age')
-      end
-    end
-  end
+      fill_in 'facet_suggest_subject_ssim', with: "ag"
 
-  describe 'facebook-style facet parameters' do
-    it 'can perform a search' do
-      visit '/?f[subject_ssim][0]=Iran.+Viza%CC%84rat-i+Kishvar'
-      expect(page).to have_text 'Naqdī barā-yi tamām-i fuṣūl'
+      expect(page).to have_link 'Old age'
+      expect(page).to have_link('Old age', href: '/?f%5Bsubject_ssim%5D%5B%5D=Old+age')
     end
   end
 end

data/spec/features/search_context_spec.rb

@@ -47,10 +47,9 @@ RSpec.describe "Search Results context" do
       search_for ''
       expect(page).to have_content "1 - 10"
       find_all('.index_title a').last.click
-      expect(page).to have_css "h1", text: "Pluvial nectar"
       click_on "Next »"
 
-      expect(page).to have_css "h1", text: "Naqdī barā-yi tamām-i"
+      expect(page).to have_content "Naqdī barā-yi tamām-i"
       click_on "Back to Search"
       expect(page).to have_content "11 - 20"
     end

data/spec/features/search_filters_spec.rb

@@ -171,7 +171,7 @@ RSpec.describe "Facets" do
     visit root_path
 
     within(".blacklight-subject_ssim") do
-      expect(page).to have_no_css(".card-body", visible: true)
+      expect(page).to have_no_css(".accordion-body", visible: true)
     end
   end
 
@@ -179,9 +179,9 @@ RSpec.describe "Facets" do
     visit root_path
 
     within(".blacklight-subject_ssim") do
-      expect(page).to have_no_css(".card-body", visible: true)
+      expect(page).to have_no_css(".accordion-body", visible: true)
       click_on 'Topic'
-      expect(page).to have_css(".card-body", visible: true)
+      expect(page).to have_css(".accordion-body", visible: true)
     end
   end
 
@@ -189,9 +189,9 @@ RSpec.describe "Facets" do
     visit root_path
 
     within(".blacklight-subject_ssim") do
-      expect(page).to have_no_css(".card-body", visible: true)
-      find(".card-header").click
-      expect(page).to have_css(".card-body", visible: true)
+      expect(page).to have_no_css(".accordion-body", visible: true)
+      find(".accordion-header").click
+      expect(page).to have_css(".accordion-body", visible: true)
     end
   end
 

data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb

@@ -93,15 +93,6 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
     end
   end
 
-  describe "#per_page_options_for_select" do
-    it "is the per-page values formatted as options_for_select" do
-      allow(helper).to receive_messages(blacklight_config: double(per_page: [11, 22, 33]))
-      expect(helper.per_page_options_for_select).to include ["11<span class=\"sr-only visually-hidden\"> per page</span>", 11]
-      expect(helper.per_page_options_for_select).to include ["22<span class=\"sr-only visually-hidden\"> per page</span>", 22]
-      expect(helper.per_page_options_for_select).to include ["33<span class=\"sr-only visually-hidden\"> per page</span>", 33]
-    end
-  end
-
   describe "#should_render_field?" do
     let(:field_config) { double('field config', if: true, unless: false) }
 

data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Blacklight::RenderPartialsHelperBehavior do
     end
   end
 
-  describe "#render_document_partials" do
+  describe "#render_document_partial" do
     let(:doc) { double }
 
     before do

data/spec/lib/blacklight/parameters_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe Blacklight::Parameters do
     let(:search_state) { Blacklight::SearchState.new(query_params, blacklight_config) }
     let(:blacklight_config) { Blacklight::Configuration.new }
 
-    context 'with facebook\'s badly mangled query parameters' do
+    context 'with facebooks badly mangled query parameters' do
       let(:query_params) do
         ActionController::Parameters.new(
           f: { field: { '0': 'first', '1': 'second' } },
@@ -67,17 +67,6 @@ RSpec.describe Blacklight::Parameters do
       it 'normalizes the facets to the expected format' do
         expect(params.permit_search_params.to_h.with_indifferent_access).to include f: { field: %w[first second] }, f_inclusive: { field: %w[first second] }
       end
-
-      context 'when several fields are configured' do
-        before do
-          blacklight_config.add_facet_field 'other_field'
-          blacklight_config.add_facet_field 'some_other_pivot_field', pivot: %w[abc def]
-        end
-
-        it 'normalizes the facets to the expected format' do
-          expect(params.permit_search_params.to_h.with_indifferent_access).to include f: { field: %w[first second] }, f_inclusive: { field: %w[first second] }
-        end
-      end
     end
 
     context 'with filter_search_state_fields set to false' do

data/spec/lib/blacklight/search_state/filter_field_spec.rb

@@ -198,22 +198,4 @@ RSpec.describe Blacklight::SearchState::FilterField do
       expect(search_state.filter('some_field').include?(OpenStruct.new(value: '1'))).to be true
     end
   end
-
-  describe '#permitted_params' do
-    context 'with a pivot facet' do
-      let(:blacklight_config) do
-        Blacklight::Configuration.new.configure do |config|
-          config.add_facet_field 'my_pivot', pivot: %w[format language_ssim]
-        end
-      end
-
-      it 'marks all the pivot fields as permitted' do
-        field = described_class.new blacklight_config.facet_fields['my_pivot'], search_state
-        expect(field.permitted_params).to eq({
-                                               f: { "-format" => [], "-language_ssim" => [], "format" => [], "language_ssim" => [] },
-                                               f_inclusive: { "format" => [], "language_ssim" => [] }
-                                             })
-      end
-    end
-  end
 end

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

@@ -64,5 +64,12 @@ RSpec.describe Blacklight::Solr::Request, :api do
 
       expect(subject.dig('json', 'query', 'bool', 'must')).to contain_exactly('some query', 'also required')
     end
+
+    it 'filters out empty query' do
+      subject['q'] = ""
+      subject.append_boolean_query :must, 'present query'
+
+      expect(subject.dig('json', 'query', 'bool', 'must')).to contain_exactly('present query')
+    end
   end
 end

data/spec/services/blacklight/search_service_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Blacklight::SearchService, :api do
         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 contain_exactly "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.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' => [] })

data/spec/test_app_templates/Gemfile.extra

@@ -1,5 +1,4 @@
 gem 'rails-controller-testing'
-gem 'rails-i18n', github: 'Shopify/rails-i18n', branch: 'schwad_rails_8'
 
 unless ENV['VIEW_COMPONENT_VERSION'].to_s == ""
   gem 'view_component', ENV.fetch('VIEW_COMPONENT_VERSION')

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

@@ -28,14 +28,14 @@ RSpec.describe "catalog/facet_layout" do
   it "is collapsable" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_css 'button.collapsed[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="false"]'
-    expect(rendered).to have_css '.collapse .card-body'
+    expect(rendered).to have_css '.collapse .accordion-body'
   end
 
   it "is configured to be open by default" do
     allow(facet_field).to receive_messages(collapse: false)
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_css 'button[data-toggle="collapse"][data-bs-toggle="collapse"][aria-expanded="true"]'
-    expect(rendered).to have_no_css '.card-header.collapsed'
-    expect(rendered).to have_css '.collapse.show .card-body'
+    expect(rendered).to have_no_css '.accordion-header.collapsed'
+    expect(rendered).to have_css '.collapse.show .accordion-body'
   end
 end

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

@@ -19,14 +19,17 @@ RSpec.describe "catalog/index.html.erb" do
   describe "with search parameters" do
     before do
       stub_template "catalog/_results_pagination.html.erb" => ""
-      stub_template "catalog/_search_header.html.erb" => "header_content"
       allow(view).to receive_messages(has_search_parameters?: true, blacklight_config: Blacklight::Configuration.new)
-      @response = instance_double(Blacklight::Solr::Response, empty?: true, total: 11, start: 1, limit_value: 10)
+      allow(controller).to receive_messages(blacklight_config: Blacklight::Configuration.new)
+
+      @response = response
     end
 
+    let(:response) { Blacklight::Solr::Response.new({ response: { numFound: 30 } }, start: 10, rows: 10) }
+
     it "renders the search_header partial" do
       render
-      expect(rendered).to match /header_content/
+      expect(rendered).to match /sortAndPerPage/
     end
   end
 end

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

@@ -7,6 +7,7 @@ RSpec.describe "catalog/show.html.erb" do
 
   before do
     allow(presenter).to receive(:html_title).and_return('Heading')
+    allow(document).to receive(:more_like_this).and_return([])
     allow(view).to receive_messages(has_user_authentication_provider?: false)
     allow(view).to receive_messages(render_document_sidebar_partial: "Sidebar")
     allow(view).to receive_messages(current_search_session: nil, search_session: {})

data/tasks/blacklight.rake

@@ -3,7 +3,7 @@
 require 'engine_cart/rake_task'
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |t|
+RSpec::Core::RakeTask.new(spec: 'blacklight:build_host_assets') do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
@@ -46,15 +46,18 @@ desc "Run test suite"
 task ci: ['build:npm'] do
   with_solr do
     Rake::Task['blacklight:internal:seed'].invoke
-    within_test_app do
-      # Precompiles the assets
-      system "bin/rake spec:prepare"
-    end
     Rake::Task['blacklight:coverage'].invoke
   end
 end
 
 namespace :blacklight do
+  task :build_host_assets do
+    within_test_app do
+      # Precompiles the assets
+      `bin/rails spec:prepare`
+    end
+  end
+
   desc "Run tests with coverage"
   task :coverage do
     ENV['COVERAGE'] = 'true'