blacklight 7.13.0 → 7.15.0

data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
+  subject(:render) do
+    render_inline(described_class.new(facet_field: facet_field))
+  end
+
+  let(:rendered) do
+    Capybara::Node::Simple.new(render)
+  end
+
+  let(:facet_field) do
+    instance_double(
+      Blacklight::FacetFieldPresenter,
+      facet_field: Blacklight::Configuration::NullField.new(key: 'field'),
+      paginator: paginator,
+      key: 'field',
+      label: 'Field',
+      active?: false,
+      collapsed?: false,
+      modal_path: nil,
+      html_id: 'facet-field',
+      search_state: search_state
+    )
+  end
+
+  let(:paginator) do
+    instance_double(Blacklight::FacetPaginator, items: [
+                      double(label: 'a', hits: 10, value: 'a'),
+                      double(label: 'b', hits: 33, value: 'b'),
+                      double(label: 'c', hits: 3, value: 'c')
+                    ])
+  end
+
+  let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, Blacklight::Configuration.new) }
+  let(:params) { { f: { field: ['a'] } } }
+
+  it 'renders a collapsible card' do
+    expect(rendered).to have_selector '.card'
+    expect(rendered).to have_button 'Field'
+    expect(rendered).to have_selector 'button[data-target="#facet-field"]'
+    expect(rendered).to have_selector '#facet-field.collapse.show'
+  end
+
+  it 'renders the facet items' do
+    expect(rendered).to have_selector 'ul.facet-values'
+    expect(rendered).to have_selector 'li', count: 3
+
+    expect(rendered).to have_field 'f_inclusive[field][]', with: 'a'
+    expect(rendered).to have_field 'f_inclusive[field][]', with: 'b'
+    expect(rendered).to have_field 'f_inclusive[field][]', with: 'c'
+  end
+end

data/spec/components/blacklight/facet_field_list_component_spec.rb

@@ -20,7 +20,8 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
       active?: false,
       collapsed?: false,
       modal_path: nil,
-      html_id: 'facet-field'
+      html_id: 'facet-field',
+      values: []
     )
   end
 
@@ -53,7 +54,8 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
         active?: true,
         collapsed?: false,
         modal_path: nil,
-        html_id: 'facet-field'
+        html_id: 'facet-field',
+        values: []
       )
     end
 
@@ -72,7 +74,8 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
         active?: false,
         collapsed?: true,
         modal_path: nil,
-        html_id: 'facet-field'
+        html_id: 'facet-field',
+        values: []
       )
     end
 
@@ -97,7 +100,8 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
         active?: false,
         collapsed?: false,
         modal_path: '/catalog/facet/modal',
-        html_id: 'facet-field'
+        html_id: 'facet-field',
+        values: []
       )
     end
 
@@ -105,4 +109,35 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
       expect(rendered).to have_link 'more Field', href: '/catalog/facet/modal'
     end
   end
+
+  context 'with inclusive facets' do
+    let(:facet_field) do
+      instance_double(
+        Blacklight::FacetFieldPresenter,
+        paginator: paginator,
+        facet_field: Blacklight::Configuration::NullField.new(key: 'field'),
+        key: 'field',
+        label: 'Field',
+        active?: false,
+        collapsed?: false,
+        modal_path: nil,
+        html_id: 'facet-field',
+        values: [%w[a b c]],
+        search_state: search_state
+      )
+    end
+
+    let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, Blacklight::Configuration.new) }
+    let(:params) { { f_inclusive: { field: %w[a b c] } } }
+
+    it 'displays the constraint above the list' do
+      expect(rendered).to have_content 'Any of:'
+      expect(rendered).to have_selector '.inclusive_or .facet-label', text: 'a'
+      expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=b&f_inclusive%5Bfield%5D%5B%5D=c'
+      expect(rendered).to have_selector '.inclusive_or .facet-label', text: 'b'
+      expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=a&f_inclusive%5Bfield%5D%5B%5D=c'
+      expect(rendered).to have_selector '.inclusive_or .facet-label', text: 'c'
+      expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=a&f_inclusive%5Bfield%5D%5B%5D=b'
+    end
+  end
 end

data/spec/components/blacklight/hidden_search_state_component_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
+  subject(:render) { render_inline(instance) }
+
+  let(:params) do
+    { q: "query",
+      search_field: "search_field",
+      per_page: 10,
+      extra_arbitrary_key: "arbitrary_value",
+      f: { field1: %w[a b], field2: ["z"] } }
+  end
+  let(:instance) { described_class.new(params: params) }
+  let(:generated) { Capybara::Node::Simple.new("<div>#{render.to_html}</div>") }
+
+  it "converts a hash with nested complex data to Rails-style hidden form fields" do
+    expect(generated).to have_selector("input[type='hidden'][name='q'][value='query']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
+    expect(generated).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
+  end
+end

data/spec/controllers/catalog_controller_spec.rb

@@ -301,6 +301,15 @@ RSpec.describe CatalogController, api: true do
     end
   end
 
+  describe 'GET advanced_search' do
+    it 'renders an advanced search form' do
+      get :advanced_search
+      expect(response).to be_successful
+
+      assert_facets_have_values(assigns(:response).aggregations)
+    end
+  end
+
   # SHOW ACTION
   describe "show action" do
     describe "with format :html" do

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/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