blacklight 7.13.2 → 7.15.2

data/spec/features/advanced_search_spec.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe "Blacklight Advanced Search Form" do
+  describe "advanced search form" do
+    before do
+      visit '/catalog/advanced?hypothetical_existing_param=true&q=ignore+this+existing+query'
+    end
+
+    it "has field and facet blocks" do
+      expect(page).to have_selector('.query-criteria')
+      expect(page).to have_selector('.limit-criteria')
+    end
+
+    describe "query column" do
+      it "gives the user a choice between and/or queries" do
+        expect(page).to have_selector('#op')
+        within('#op') do
+          expect(page).to have_selector('option[value="must"]')
+          expect(page).to have_selector('option[value="should"]')
+        end
+      end
+
+      it "lists the configured search fields" do
+        expect(page).to have_field 'All Fields'
+        expect(page).to have_field 'Title'
+        expect(page).to have_field 'Author'
+        expect(page).to have_field 'Subject'
+      end
+    end
+
+    describe "facet column" do
+      it "lists facets" do
+        expect(page).to have_selector('.blacklight-language_ssim')
+
+        within('.blacklight-language_ssim') do
+          expect(page).to have_content 'Language'
+        end
+      end
+    end
+
+    it 'scopes searches to fields' do
+      fill_in 'Title', with: 'Medicine'
+      click_on 'advanced-search-submit'
+      expect(page).to have_content 'Remove constraint Title: Medicine'
+      expect(page).to have_content 'Strong Medicine speaks'
+    end
+  end
+
+  describe "prepopulated advanced search form" do
+    before do
+      visit '/catalog/advanced?op=must&clause[0][field]=title&clause[0]query=medicine'
+    end
+
+    it "does not create hidden inputs for search fields" do
+      expect(page).to have_field 'Title', with: 'medicine'
+    end
+
+    it "does not have multiple parameters for a search field" do
+      fill_in 'Title', with: 'bread'
+      click_on 'advanced-search-submit'
+      expect(page.current_url).to match(/bread/)
+      expect(page.current_url).not_to match(/medicine/)
+    end
+  end
+end

data/spec/features/bookmarks_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe "Bookmarks" do
     expect(page).to have_content 'Strong Medicine speaks'
   end
 
-  it "cites items in current bookmarks page" do
+  it "cites all items in current bookmarks" do
     visit solr_document_path('2009373513') # Ci an zhou bian
     click_button 'Bookmark'
 
@@ -70,14 +70,6 @@ RSpec.describe "Bookmarks" do
 
     click_link 'Cite'
     expect(page).to have_content 'Strong Medicine speaks'
-    expect(page).not_to have_content 'Ci an zhou bian'
-
-    visit "/bookmarks?per_page=1"
-    click_link "2"
-    expect(page).to have_content 'Ci an zhou bian'
-
-    click_link 'Cite'
-    expect(page).not_to have_content 'Strong Medicine speaks'
     expect(page).to have_content 'Ci an zhou bian'
   end
 end

data/spec/features/facets_spec.rb

@@ -56,10 +56,6 @@ RSpec.describe "Facets" do
 
     expect(page).to have_css('#facet-format', visible: false)
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     page.find('h3.facet-field-heading button', text: 'Format').click
 
     sleep(1) # let facet animation finish and wait for it to potentially re-collapse
@@ -70,14 +66,10 @@ RSpec.describe "Facets" do
   it 'is able to expand pivot facets when javascript is enabled', js: true do
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     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\t30")
       expect(page).not_to have_css('.facet-select', text: 'Tibetan')
       page.find('.facet-toggle-handle').click
       click_link 'Tibetan'
@@ -88,15 +80,8 @@ RSpec.describe "Facets" do
   end
 
   describe 'heading button focus with Firefox' do
-    before do
-      Capybara.current_driver = :selenium_headless
-    end
-
-    after do
-      Capybara.current_driver = :rack_test
-    end
-
     it 'changes to the button on button click in Firefox' do
+      pending 'Capybara::NotSupportedByDriverError: Capybara::Driver::Base#evaluate_script'
       visit root_path
       page.find('h3.facet-field-heading button', text: 'Format').click
       focused_element_data_target = page.evaluate_script("document.activeElement")['data-target']

data/spec/features/search_filters_spec.rb

@@ -168,26 +168,16 @@ RSpec.describe "Facets" do
   end
 
   it "is collapsed when not selected", js: true do
-    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     within(".blacklight-subject_ssim") do
       expect(page).not_to have_selector(".card-body", visible: true)
     end
   end
 
   it "expands when the heading button is clicked", js: true do
-    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     within(".blacklight-subject_ssim") do
       expect(page).not_to have_selector(".card-body", visible: true)
       find(".card-header button").click
@@ -196,13 +186,8 @@ RSpec.describe "Facets" do
   end
 
   it "expands when the button is clicked", js: true do
-    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     within(".blacklight-subject_ssim") do
       expect(page).not_to have_selector(".card-body", visible: true)
       find(".card-header").click
@@ -211,13 +196,8 @@ RSpec.describe "Facets" do
   end
 
   it "keeps selected facets expanded on page load", js: true do
-    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .facets-header') do
-      page.find('button.navbar-toggler').click
-    end
-
     within(".blacklight-subject_ssim") do
       page.find('h3.facet-field-heading', text: 'Topic').click
       expect(page).to have_selector(".panel-collapse", visible: true)

data/spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb

@@ -14,6 +14,7 @@ RSpec.describe Blacklight::HashAsHiddenFieldsHelperBehavior do
   let(:generated) { helper.render_hash_as_hidden_fields(params) }
 
   it "converts a hash with nested complex data to Rails-style hidden form fields" do
+    allow(Deprecation).to receive(:warn)
     expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']", visible: false)
     expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: false)
     expect(generated).to have_selector("input[type='hidden'][name='page'][value='5']", visible: false)

data/spec/helpers/blacklight/url_helper_behavior_spec.rb

@@ -13,6 +13,7 @@ RSpec.describe Blacklight::UrlHelperBehavior do
   let(:parameter_class) { ActionController::Parameters }
 
   before do
+    allow(controller).to receive(:controller_name).and_return('test')
     allow(helper).to receive(:search_action_path) do |*args|
       search_catalog_url *args
     end

data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb

@@ -145,4 +145,12 @@ RSpec.describe Blacklight::OpenStructWithHashAccess do
       expect(copy.b[:c]).to eq 2
     end
   end
+
+  describe "#try" do
+    subject { described_class.new a: 1 }
+
+    it "works (and doesn't throw a stack error...)" do
+      expect(subject.try(:a)).to eq 1
+    end
+  end
 end

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

@@ -72,6 +72,33 @@ RSpec.describe Blacklight::SearchState::FilterField do
         expect(new_state.filter('some_field').values).to eq %w[1 2 4]
       end
     end
+
+    context 'with an array' do
+      let(:params) do
+        { f: { another_field: ['3'] }, f_inclusive: { some_field: %w[a b c] } }
+      end
+
+      it 'creates a new group with the new values' do
+        filter = search_state.filter('new_field')
+        new_state = filter.add(%w[x y z])
+
+        expect(new_state.filter('new_field').values).to eq [%w[x y z]]
+      end
+
+      it 'updates any existing groups with the new values' do
+        filter = search_state.filter('some_field')
+        new_state = filter.add(%w[x y z])
+
+        expect(new_state.filter('some_field').values).to eq [%w[x y z]]
+      end
+
+      it 'leaves existing filters alone' do
+        filter = search_state.filter('another_field')
+        new_state = filter.add(%w[x y z])
+
+        expect(new_state.filter('another_field').values).to eq ['3', %w[x y z]]
+      end
+    end
   end
 
   describe '#remove' do
@@ -104,12 +131,50 @@ RSpec.describe Blacklight::SearchState::FilterField do
 
       expect(new_state.filter('some_field').values).to eq ['2']
     end
+
+    context 'with an array' do
+      let(:params) do
+        { f: { another_field: ['3'] }, f_inclusive: { some_field: %w[a b c], another_field: %w[x y z] } }
+      end
+
+      it 'removes groups of values' do
+        filter = search_state.filter('some_field')
+        new_state = filter.remove(%w[a b c])
+
+        expect(new_state.params[:f_inclusive]).not_to include :some_field
+        expect(new_state.filter('some_field').values).to eq []
+      end
+
+      it 'can remove single values' do
+        filter = search_state.filter('some_field')
+        new_state = filter.remove(%w[a])
+
+        expect(new_state.filter('some_field').values).to eq [%w[b c]]
+      end
+
+      it 'leaves existing filters alone' do
+        filter = search_state.filter('another_field')
+        new_state = filter.remove(%w[x y z])
+
+        expect(new_state.filter('another_field').values).to eq ['3']
+      end
+    end
   end
 
   describe '#values' do
     it 'returns the currently selected values of the filter' do
       expect(search_state.filter('some_field').values).to eq %w[1 2]
     end
+
+    context 'with an array' do
+      let(:params) do
+        { f: { some_field: ['3'] }, f_inclusive: { some_field: %w[a b c] } }
+      end
+
+      it 'combines the exclusive and inclusive values' do
+        expect(search_state.filter('some_field').values).to eq ['3', %w[a b c]]
+      end
+    end
   end
 
   describe '#include?' do

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

@@ -134,6 +134,18 @@ RSpec.describe Blacklight::Solr::Repository, api: true do
         end
       end
     end
+
+    context 'with json parameters' do
+      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: {} } })
+      end
+    end
   end
 
   describe "http_method configuration", integration: true do

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

@@ -109,7 +109,7 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
     let(:facet) { { name: "foo", value: "bar", hits: 1 } }
 
     before do
-      response.merge_facet(facet)
+      response.merge_facet(**facet)
     end
 
     context "facet does not already exist" do

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

@@ -259,6 +259,17 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       end
     end
 
+    describe 'with multi-valued facets' do
+      let(:user_params) { { f_inclusive: { format: %w[Book Movie CD] } } }
+
+      it "has proper solr parameters" do
+        expect(subject[:fq]).to include('{!lucene}{!query v=$f_inclusive.format.0} OR {!query v=$f_inclusive.format.1} OR {!query v=$f_inclusive.format.2}')
+        expect(subject['f_inclusive.format.0']).to eq '{!term f=format}Book'
+        expect(subject['f_inclusive.format.1']).to eq '{!term f=format}Movie'
+        expect(subject['f_inclusive.format.2']).to eq '{!term f=format}CD'
+      end
+    end
+
     describe "solr parameters for a field search from config (subject)" do
       let(:user_params) { subject_search_params }
 
@@ -723,4 +734,21 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject.with_ex_local_param(nil, "some-value")).to eq "some-value"
     end
   end
+
+  context 'with advanced search clause parameters' do
+    before do
+      blacklight_config.search_fields.each_value do |v|
+        v.clause_params = { edismax: v.solr_parameters.dup }
+      end
+    end
+
+    let(:user_params) { { op: 'must', clause: { '0': { field: 'title', query: 'the book' }, '1': { field: 'author', query: 'the person' } } } }
+
+    it "has proper solr parameters" do
+      expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 0, :edismax, :query)).to eq 'the book'
+      expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 0, :edismax, :qf)).to eq '${title_qf}'
+      expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 1, :edismax, :query)).to eq 'the person'
+      expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 1, :edismax, :qf)).to eq '${author_qf}'
+    end
+  end
 end

data/spec/presenters/blacklight/clause_presenter_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Blacklight::ClausePresenter, type: :presenter do
+  subject(:presenter) do
+    described_class.new('0', params.with_indifferent_access.dig(:clause, '0'), field_config, controller.view_context, search_state)
+  end
+
+  let(:field_config) { Blacklight::Configuration::NullField.new key: 'some_field' }
+  let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, Blacklight::Configuration.new) }
+  let(:params) { {} }
+
+  describe '#field_label' do
+    it 'returns a label for the field' do
+      expect(subject.field_label).to eq 'Some Field'
+    end
+  end
+
+  describe '#label' do
+    let(:params) { { clause: { '0' => { query: 'some search string' } } } }
+
+    it 'returns the query value for the clause' do
+      expect(subject.label).to eq 'some search string'
+    end
+  end
+
+  describe '#remove_href' do
+    let(:params) { { clause: { '0' => { query: 'some_search_string' } } } }
+
+    it 'returns the href to remove the search clause' do
+      expect(subject.remove_href).not_to include 'some_search_string'
+    end
+  end
+end

data/spec/presenters/blacklight/document_presenter_spec.rb

@@ -47,4 +47,17 @@ RSpec.describe Blacklight::DocumentPresenter do
       expect(presenter.field_value(field_config, options)).to eq 'abc'
     end
   end
+
+  describe '#thumbnail' do
+    it 'returns a thumbnail presenter' do
+      expect(presenter.thumbnail).to be_a_kind_of(Blacklight::ThumbnailPresenter)
+    end
+
+    it 'use the configured thumbnail presenter' do
+      custom_presenter_class = Class.new(Blacklight::ThumbnailPresenter)
+      blacklight_config.index.thumbnail_presenter = custom_presenter_class
+
+      expect(presenter.thumbnail).to be_a_kind_of custom_presenter_class
+    end
+  end
 end

data/spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Blacklight::FacetGroupedItemPresenter, type: :presenter do
+  subject(:presenter) do
+    described_class.new(group, facet_item, facet_config, view_context, facet_field, search_state)
+  end
+
+  let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'key') }
+  let(:facet_field) { instance_double(Blacklight::Solr::Response::Facets::FacetField) }
+  let(:view_context) { controller.view_context }
+
+  let(:facet_item) { 'a' }
+  let(:group) { %w[a b c] }
+  let(:search_state) { Blacklight::SearchState.new(params, Blacklight::Configuration.new) }
+  let(:params) { { f_inclusive: { key: group } } }
+
+  describe '#selected' do
+    it { is_expected.to be_selected }
+
+    context 'when the item is not in the group' do
+      let(:facet_item) { 'd' }
+
+      it { is_expected.not_to be_selected }
+    end
+
+    describe '#href' do
+      it 'removes the item from the "group" of filters' do
+        expect(Rack::Utils.parse_query(URI(presenter.href).query)).to include 'f_inclusive[key][]' => %w[b c]
+      end
+
+      context 'when the item is not in the group' do
+        let(:facet_item) { 'd' }
+
+        it 'adds the item to the "group" of filters' do
+          expect(Rack::Utils.parse_query(URI(presenter.href).query)).to include 'f_inclusive[key][]' => %w[a b c d]
+        end
+      end
+    end
+  end
+end