blacklight 9.0.0.beta1 → 9.0.0

data/spec/components/blacklight/system/flash_message_component_spec.rb

@@ -5,26 +5,22 @@ require 'spec_helper'
 RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
   subject(:component) { described_class.new(message: message, type: type) }
 
-  let(:view_context) { controller.view_context }
-  let(:render) do
-    component.render_in(view_context)
+  before do
+    render_inline(component)
   end
 
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
-  end
   let(:message) { 'This is an important message' }
   let(:type) { 'whatever' }
 
   it 'renders a message inside an alert' do
-    expect(rendered).to have_css 'div.alert.alert-whatever', text: message
+    expect(page).to have_css 'div.alert.alert-whatever', text: message
   end
 
   context 'with a success message' do
     let(:type) { 'success' }
 
     it 'adds some styling' do
-      expect(rendered).to have_css 'div.alert-success'
+      expect(page).to have_css 'div.alert-success'
     end
   end
 
@@ -32,7 +28,7 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
     let(:type) { 'notice' }
 
     it 'adds some styling' do
-      expect(rendered).to have_css 'div.alert-info'
+      expect(page).to have_css 'div.alert-info'
     end
   end
 
@@ -40,7 +36,7 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
     let(:type) { 'alert' }
 
     it 'adds some styling' do
-      expect(rendered).to have_css 'div.alert-warning'
+      expect(page).to have_css 'div.alert-warning'
     end
   end
 
@@ -48,7 +44,7 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
     let(:type) { 'error' }
 
     it 'adds some styling' do
-      expect(rendered).to have_css 'div.alert-danger'
+      expect(page).to have_css 'div.alert-danger'
     end
   end
 end

data/spec/controllers/blacklight/catalog_spec.rb

@@ -3,7 +3,7 @@
 RSpec.describe Blacklight::Catalog do
   subject { controller }
 
-  let(:controller) { (Class.new(ApplicationController) { include Blacklight::Catalog }).new }
+  let(:controller) { Class.new(ApplicationController) { include Blacklight::Catalog }.new }
 
   describe "#search_state" do
     subject { controller.send(:search_state) }

data/spec/controllers/catalog_controller_spec.rb

@@ -499,13 +499,14 @@ RSpec.describe CatalogController, :api do
         expect(request.flash[:error]).to be_nil
       end
 
-      it "redirects back to the record upon success" do
-        allow(RecordMailer).to receive(:email_record)
-          .with(anything, { to: 'test_email@projectblacklight.org', message: 'xyz', config: config }, hash_including(host: 'test.host'))
-          .and_return double(deliver: nil)
-        post :email, params: { id: doc_id, to: 'test_email@projectblacklight.org', message: 'xyz' }
-        expect(request.flash[:error]).to be_nil
-        expect(request).to redirect_to(solr_document_path(doc_id))
+      context 'when message is provided' do
+        it "sends email and redirects back to the record" do
+          expect do
+            post :email, params: { id: doc_id, to: 'test_email@projectblacklight.org', message: 'xyz' }
+          end.to send_email(to: 'test_email@projectblacklight.org')
+          expect(request.flash[:error]).to be_nil
+          expect(request).to redirect_to(solr_document_path(doc_id))
+        end
       end
 
       it "renders email_success for XHR requests" do
@@ -549,11 +550,9 @@ RSpec.describe CatalogController, :api do
       end
 
       it "sends to the appropriate carrier email address" do
-        expect(RecordMailer)
-          .to receive(:sms_record)
-          .with(anything, { to: '5555555555@txt.att.net', config: config }, hash_including(host: 'test.host'))
-          .and_return double(deliver: nil)
-        post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
+        expect do
+          post :sms, params: { id: doc_id, to: '5555555555', carrier: 'txt.att.net' }
+        end.to send_email(to: '5555555555@txt.att.net')
       end
 
       it "redirects back to the record upon success" do
@@ -786,13 +785,6 @@ RSpec.describe CatalogController, :api do
     end
   end
 
-  describe "search_facet_path" do
-    it "is the same as the catalog path" do
-      get :index, params: { page: 1 }
-      expect(controller.send(:search_facet_path, id: "some_facet", page: 5)).to eq facet_catalog_path(id: "some_facet")
-    end
-  end
-
   describe "page_links" do
     it "has prev/next docs and result set data for non-empty result sets", :integration do
       get :page_links, params: { f: { "format" => 'Book' }, counter: 2 }
@@ -803,7 +795,7 @@ RSpec.describe CatalogController, :api do
     end
 
     it "is empty for empty result sets", :integration do
-      get :page_links, params: { f: { "format" => 'empty-result-set' }, counter: 1 }
+      get :page_links, params: { f: { "format" => ['empty-result-set'] }, counter: 1 }
       expect(assigns(:page_link_data)).to be_empty
     end
   end

data/spec/features/advanced_search_spec.rb

@@ -5,25 +5,7 @@ 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}' }
-      }
-      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
+      visit '/catalog/advanced'
     end
 
     it "has field and facet blocks" do
@@ -56,6 +38,16 @@ RSpec.describe "Blacklight Advanced Search Form" do
           expect(page).to have_content 'Language'
         end
       end
+
+      it "omits facets configured with include_in_advanced_search: false" do
+        expect(page).to have_no_css('.blacklight-example_pivot_field')
+      end
+
+      it "lists all the values for an included facet" do
+        within('.blacklight-subject_ssim') do
+          expect(page).to have_css('ul.facet-values li', count: 45)
+        end
+      end
     end
 
     it 'scopes searches to fields' do
@@ -66,10 +58,20 @@ RSpec.describe "Blacklight Advanced Search Form" do
       expect(page).to have_css('article.document', count: 1)
     end
 
+    it 'does not render spellcheck/did you mean? section' do
+      fill_in 'All Fields', with: 'tibet'
+      click_on 'advanced-search-submit'
+      expect(page).to have_content 'Remove constraint All Fields: tibet'
+      expect(page).to have_css('article.document', count: 2)
+      expect(page).to have_no_css('#spell')
+    end
+
     it 'can limit to facets' do
       fill_in 'Subject', with: 'Women'
       click_on 'Language'
-      check 'Urdu 3'
+      within '#facet-language_ssim' do
+        check 'Urdu 3'
+      end
       click_on 'advanced-search-submit'
       expect(page).to have_content 'Pākistānī ʻaurat dorāhe par'
       expect(page).to have_no_content 'Ajikto kŭrŏk chŏrŏk sasimnikka : and 아직도　그럭　저럭　사십니까'
@@ -105,7 +107,7 @@ RSpec.describe "Blacklight Advanced Search Form" do
 
   describe "prepopulated advanced search form" do
     before do
-      visit '/catalog/advanced?op=must&clause[1][field]=title&clause[1]query=medicine&f_inclusive[language_ssim][]=Tibetan&sort=author'
+      visit '/catalog/advanced?op=must&clause[1][field]=title&clause[1]query=medicine&f_inclusive[language_ssim][]=Tibetan&f[format][]=Book&sort=author'
     end
 
     it 'prepopulates the expected fields' do
@@ -115,6 +117,12 @@ RSpec.describe "Blacklight Advanced Search Form" do
       expect(page).to have_select 'sort', selected: 'author'
     end
 
+    it 'creates hidden inputs for fields not included in the advanced search form' do
+      within('form.advanced') do
+        expect(page).to have_field 'f[format][]', type: :hidden, with: 'Book'
+      end
+    end
+
     it "does not create hidden inputs for fields included in adv search form" do
       within('form.advanced') do
         expect(page).to have_no_field('clause[1][query]', type: :hidden, with: 'medicine')
@@ -138,5 +146,18 @@ RSpec.describe "Blacklight Advanced Search Form" do
       expect(page).to have_no_field 'Title', with: 'medicine'
       expect(page).to have_no_field 'Tibetan', checked: true
     end
+
+    it 'creates constraints for fields not included in advanced search form' do
+      within('div.constraints') do
+        expect(page).to have_content('Format:Book')
+      end
+    end
+
+    it 'does not create constraints for fields included in the advanced search form' do
+      within('div.constraints') do
+        expect(page).to have_no_content('Title:medicine')
+        expect(page).to have_no_content('Language:Tibetan')
+      end
+    end
   end
 end

data/spec/features/facets_spec.rb

@@ -69,14 +69,14 @@ RSpec.describe "Facets" do
     click_on 'Pivot Field'
 
     within '#facet-example_pivot_field' do
-      expect(page).to have_css('.facet-leaf-node', text: "Book 30", normalize_ws: true)
-      expect(page).to have_no_css('.facet-select', text: 'Tibetan')
-      page.find('.facet-toggle-handle').click
-      click_on 'Tibetan'
+      expect(page).to have_css('.facet-leaf-node', text: "Tibetan 6", normalize_ws: true)
+      expect(page).to have_no_css('.facet-select', text: 'India')
+      first('.facet-toggle-handle').click
+      click_on 'India'
     end
 
-    expect(page).to have_css('.constraint-value', text: 'Format Book')
     expect(page).to have_css('.constraint-value', text: 'Language Tibetan')
+    expect(page).to have_css('.constraint-value', text: 'Region India')
   end
 
   describe 'heading button focus with Firefox' do
@@ -99,7 +99,7 @@ RSpec.describe "Facets" do
     end
   end
 
-  describe 'Facet modal' do
+  describe 'Facet modal content' do
     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
@@ -107,27 +107,99 @@ RSpec.describe "Facets" do
 
       fill_in 'facet_suggest_subject_ssim', with: "ag"
 
+      expect(page).to have_css '.facet-suggestions'
       expect(page).to have_link 'Old age'
       expect(page).to have_css 'a.facet-select', count: 2
     end
 
+    it 'can show suggestions including a period', :js do
+      visit '/catalog/facet/subject_ssim'
+      fill_in 'facet_suggest_subject_ssim', with: 'iran.'
+
+      expect(page).to have_css '.facet-suggestions'
+      expect(page).to have_link 'Iran. Vizārat-i Kishvar'
+      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'
 
+      expect(page).to have_css '.facet-suggestions'
       expect(page).to have_link 'Tibetan language'
+      expect(page).to have_no_link 'Law'
       expect(page).to have_css 'a.facet-select', count: 1
     end
 
-    it 'allows the user to filter more than once', :js do
+    it 'allows the user to toggle the sort, then filter', :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: 'po'
 
-      expect(page).to have_link 'Old age'
-      expect(page).to have_link('Old age', href: '/?f%5Bsubject_ssim%5D%5B%5D=Old+age')
+      expect(page).to have_css '.facet-suggestions'
+      expect(page).to have_css('.facet-values li:nth-child(1)', text: 'Political plays, Japanese')
+      expect(page).to have_css('.facet-values li:nth-child(2)', text: 'Military weapons')
+      expect(page).to have_css('.facet-values li:nth-child(3)', text: 'Political science')
+
+      first(:link, 'A-Z Sort').click
+
+      expect(page).to have_css('.facet-suggest[data-facet-search-context*="facet.sort=index"]')
+
+      fill_in 'facet_suggest_subject_ssim', with: 'po'
+
+      expect(page).to have_css '.facet-suggestions'
+      expect(page).to have_css('.facet-values li:nth-child(1)', text: 'Military weapons')
+      expect(page).to have_css('.facet-values li:nth-child(2)', text: 'Political plays, Japanese')
+      expect(page).to have_css('.facet-values li:nth-child(3)', text: 'Political science')
+    end
+
+    it 'allows the user to choose a starting letter, then filter', :js do
+      visit '/catalog/facet/subject_ssim'
+
+      first(:link, 'A-Z Sort').click
+      expect(page).to have_css('.facet-suggest[data-facet-search-context*="facet.sort=index"]')
+
+      click_on 'M'
+      expect(page).to have_css('.facet-suggest[data-facet-search-context*="facet.prefix=M"]')
+
+      fill_in 'facet_suggest_subject_ssim', with: 'te'
+
+      expect(page).to have_css '.facet-suggestions'
+      expect(page).to have_link 'Maternity insurance'
+      expect(page).to have_no_link 'Teaching'
+    end
+
+    it 'hides previous/next links when filtering', :js do
+      visit '/catalog/facet/subject_ssim'
+      expect(page).to have_link 'Next »'
+
+      fill_in 'facet_suggest_subject_ssim', with: 'te'
+      expect(page).to have_css '.facet-suggestions'
+      expect(page).to have_no_link 'Next »'
+
+      fill_in 'facet_suggest_subject_ssim', with: ''
+      expect(page).to have_no_css '.facet-suggestions'
+      expect(page).to have_link 'Next »'
+    end
+
+    context 'when facet is configured with suggest: false' do
+      before do
+        enabled = CatalogController.blacklight_config.dup
+        enabled.facet_fields[:subject_ssim].merge!({ suggest: false })
+        allow(CatalogController).to receive(:blacklight_config).and_return enabled
+      end
+
+      it 'does not offer the user a way to filter the list of facet values' do
+        visit '/catalog/facet/subject_ssim'
+        expect(page).to have_no_field 'facet_suggest_subject_ssim'
+      end
+    end
+  end
+
+  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'
     end
   end
 end

data/spec/features/modal_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe 'Modal' do
     expect(page).to have_no_selector 'dialog#blacklight-modal'
     click_on 'Email'
     expect(page).to have_css 'dialog#blacklight-modal'
-    click_on '×'
+    find('button[aria-label=Close]').click
     expect(page).to have_no_selector 'dialog#blacklight-modal'
   end
 end

data/spec/features/search_filters_spec.rb

@@ -18,7 +18,9 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "6")
     end
 
-    click_on "India"
+    within "#facet-subject_geo_ssim" do
+      click_on "India"
+    end
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 2 of 2"
     end
@@ -51,7 +53,7 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
 
@@ -138,7 +140,7 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
   end
@@ -162,7 +164,7 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
   end

data/spec/features/search_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe "Search Page" do
     Capybara.ignore_hidden_elements = tmp_value
 
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
 
@@ -74,7 +74,7 @@ RSpec.describe "Search Page" do
     click_on 'search'
 
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "Title"
       expect(page).to have_content "inmul"
     end
@@ -104,7 +104,7 @@ RSpec.describe "Search Page" do
     fill_in "q", with: 'history'
     click_on 'search'
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
 

data/spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -26,4 +26,14 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
       expect(presenter).to be_a SomePresenter
     end
   end
+
+  describe "#search_facet_path" do
+    before do
+      params[:controller] = 'catalog'
+    end
+
+    it "is the same as the catalog path" do
+      expect(helper.search_facet_path(id: "some_facet", page: 5)).to eq facet_catalog_path(id: "some_facet")
+    end
+  end
 end

data/spec/lib/blacklight/configuration/facet_field_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe Blacklight::Configuration::FacetField do
       subject.normalize!
 
       expect(subject.presenter).to eq Blacklight::FacetFieldPresenter
-      expect(subject.component).to eq Blacklight::FacetFieldListComponent
+      expect(subject.component).to eq Blacklight::Facets::ListComponent
     end
 
     context 'when component is set to true' do
@@ -34,7 +34,7 @@ RSpec.describe Blacklight::Configuration::FacetField do
       it 'casts to the default component' do
         subject.normalize!
 
-        expect(subject.component).to eq Blacklight::FacetFieldListComponent
+        expect(subject.component).to eq Blacklight::Facets::ListComponent
       end
     end
   end

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 facebooks badly mangled query parameters' do
+    context 'with facebook\'s badly mangled query parameters' do
       let(:query_params) do
         ActionController::Parameters.new(
           f: { field: { '0': 'first', '1': 'second' } },
@@ -67,6 +67,17 @@ 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,4 +198,22 @@ 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