blacklight 7.10.0 → 7.11.1

data/spec/features/search_context_spec.rb

@@ -7,12 +7,12 @@ RSpec.describe "Search Results context", js: true do
     click_on 'Pluvial nectar of blessings'
     expect(page).to have_content "« Previous | 10 of 30 | Next »"
     prev = page.find(".pagination-search-widgets .previous")
-    expect(prev['data-context-href']).to eq "/catalog/2003546302/track?counter=9&search_id=#{search_id}"
+    expect(prev['data-context-href']).to eq "/catalog/2003546302/track?counter=9&document_id=2003546302&search_id=#{search_id}"
 
     click_on "« Previous"
 
     prev = page.find(".pagination-search-widgets .previous")
-    expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&search_id=#{search_id}"
+    expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&document_id=2004310986&search_id=#{search_id}"
   end
 
   it "redirects context urls to the original url" do
@@ -31,6 +31,16 @@ RSpec.describe "Search Results context", js: true do
     end
   end
 
+  it "does not display stale previous and next links for direct item views" do
+    search_for ''
+    click_on 'Pluvial nectar of blessings'
+
+    # Go to the number 9 result separately
+    visit '/catalog/2003546302'
+    expect(page).not_to have_selector '.page-links'
+    expect(page).not_to have_content "« Previous | 10 of 30 | Next »"
+  end
+
   context "navigating between search results using context pagination" do
     it "updates the back to search link with the current search pagination context" do
       search_for ''

data/spec/features/search_filters_spec.rb

@@ -166,6 +166,7 @@ RSpec.describe "Facets" do
       expect(page).to have_content "history"
     end
   end
+
   it "is collapsed when not selected", js: true do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
@@ -178,6 +179,7 @@ RSpec.describe "Facets" 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
@@ -192,6 +194,7 @@ RSpec.describe "Facets" do
       expect(page).to have_selector(".card-body", visible: true)
     end
   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
@@ -206,6 +209,7 @@ RSpec.describe "Facets" do
       expect(page).to have_selector(".card-body", visible: true)
     end
   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

data/spec/features/search_results_spec.rb

@@ -17,6 +17,7 @@ RSpec.describe "Search Results" do
     search_for 'inmül'
     expect(number_of_results_from_page(page)).to eq 1
   end
+
   it "finds same result set for a case-insensitive query" do
     search_for 'inmul'
     expect(number_of_results_from_page(page)).to eq 1

data/spec/features/sitelinks_search_box.rb

@@ -5,6 +5,7 @@ describe 'Sitelinks search box' do
     visit root_path
     expect(page).to have_css 'script[type="application/ld+json"]'
   end
+
   it 'on search page' do
     visit search_catalog_path q: 'book'
     expect(page).not_to have_css 'script[type="application/ld+json"]'

data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb

@@ -271,9 +271,11 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
       it 'handles a found key' do
         expect(helper.label_for_search_field('my-key')).to eq 'My Field'
       end
+
       it 'handles a missing key' do
         expect(helper.label_for_search_field('not-found')).to eq 'Not Found'
       end
+
       it 'handles a missing field' do
         expect(helper.label_for_search_field(nil)).to eq nil
       end
@@ -285,6 +287,7 @@ RSpec.describe Blacklight::ConfigurationHelperBehavior do
       it 'handles a found key' do
         expect(helper.sort_field_label('my-key')).to eq 'My Field'
       end
+
       it 'handles a missing key' do
         expect(helper.sort_field_label('not-found')).to eq 'Not Found'
       end

data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb

@@ -70,6 +70,7 @@ RSpec.describe Blacklight::RenderPartialsHelperBehavior do
       it "uses the value in the configured display type field" do
         expect(helper.document_partial_name(document)).to eq 'xyz'
       end
+
       it "uses the value in the configured display type field if the action-specific field is empty" do
         expect(helper.document_partial_name(document, :some_action)).to eq 'xyz'
       end

data/spec/helpers/blacklight/search_history_constraints_helper_behavior_spec.rb

@@ -28,6 +28,7 @@ RSpec.describe Blacklight::SearchHistoryConstraintsHelperBehavior do
         end
         expect(response).to be_html_safe
       end
+
       it "escapes them that need escaping" do
         response = helper.render_search_to_s_element("key>", "value>")
         expect(response).to have_selector("span.constraint") do |span|
@@ -43,6 +44,7 @@ RSpec.describe Blacklight::SearchHistoryConstraintsHelperBehavior do
         end
         expect(response).to be_html_safe
       end
+
       it "does not escape with options set thus" do
         response = helper.render_search_to_s_element("key>", "value>", escape_key: false, escape_value: false)
         expect(response).to have_selector("span.constraint") do |span|

data/spec/helpers/blacklight/url_helper_behavior_spec.rb

@@ -233,7 +233,7 @@ RSpec.describe Blacklight::UrlHelperBehavior do
       end
 
       it "passes on the title attribute to the link_to_with_data method" do
-        expect(helper.link_to_document(document, "Some crazy long label...", title: "Some crazy longer label")).to match(/title=\"Some crazy longer label\"/)
+        expect(helper.link_to_document(document, "Some crazy long label...", title: "Some crazy longer label")).to match(/title="Some crazy longer label"/)
       end
 
       it "doesn't add an erroneous title attribute if one isn't provided" do

data/spec/helpers/blacklight_helper_spec.rb

@@ -48,10 +48,12 @@ RSpec.describe BlacklightHelper do
       helper.content_for(:page_title) { "xyz" }
       expect(helper.render_page_title).to eq "xyz"
     end
+
     it "looks in the @page_title ivar" do
       assign(:page_title, "xyz")
       expect(helper.render_page_title).to eq "xyz"
     end
+
     it "defaults to the application name" do
       expect(helper.render_page_title).to eq helper.application_name
     end
@@ -194,12 +196,14 @@ RSpec.describe BlacklightHelper do
       field_config = double(field: 'asdf')
       expect(helper.document_has_value?(doc, field_config)).to eq true
     end
+
     it "ifs the document has a highlight field value" do
       allow(doc).to receive(:has?).with('asdf').and_return(false)
       allow(doc).to receive(:has_highlight_field?).with('asdf').and_return(true)
       field_config = double(field: 'asdf', highlight: true)
       expect(helper.document_has_value?(doc, field_config)).to eq true
     end
+
     it "ifs the field has a model accessor" do
       allow(doc).to receive(:has?).with('asdf').and_return(false)
       allow(doc).to receive(:has_highlight_field?).with('asdf').and_return(false)
@@ -250,14 +254,17 @@ RSpec.describe BlacklightHelper do
       response = double(total: 10)
       expect(helper.should_show_spellcheck_suggestions?(response)).to be false
     end
+
     it "only shows suggestions if there are very few results" do
       response = double(total: 4, spelling: double(words: [1]))
       expect(helper.should_show_spellcheck_suggestions?(response)).to be true
     end
+
     it "shows suggestions only if there are spelling suggestions available" do
       response = double(total: 4, spelling: double(words: []))
       expect(helper.should_show_spellcheck_suggestions?(response)).to be false
     end
+
     it "does not show suggestions if spelling is not available" do
       response = double(total: 4, spelling: nil)
       expect(helper.should_show_spellcheck_suggestions?(response)).to be false
@@ -270,12 +277,15 @@ RSpec.describe BlacklightHelper do
     it "has a search rel" do
       expect(subject).to have_selector "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
     end
+
     it "has a title attribute" do
       expect(subject).to have_selector "link[title='title']", visible: false
     end
+
     it "has an href attribute" do
       expect(subject).to have_selector "link[href='href']", visible: false
     end
@@ -291,15 +301,18 @@ RSpec.describe BlacklightHelper do
 
   describe "#render_document_index_with_view" do
     let(:obj1) { SolrDocument.new }
+    let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
 
     before do
-      allow(helper).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+      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/>')
     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"
     end

data/spec/helpers/catalog_helper_spec.rb

@@ -18,10 +18,6 @@ RSpec.describe CatalogHelper do
     mock_response
   end
 
-  def render_grouped_response?
-    false
-  end
-
   describe "page_entries_info" do
     it "with no results" do
       @response = mock_response total: 0
@@ -97,6 +93,7 @@ RSpec.describe CatalogHelper do
       expect(html).to eq "<strong>41</strong> - <strong>47</strong> of <strong>47</strong>"
       expect(html).to be_html_safe
     end
+
     it "works with rows the same as per_page" do
       @response = mock_response total: 47, rows: 20, current_page: 2
 

data/spec/lib/blacklight/search_state_spec.rb

@@ -46,6 +46,38 @@ RSpec.describe Blacklight::SearchState do
         expect(search_state.to_h).to eq data.with_indifferent_access
       end
     end
+
+    context 'with facebooks badly mangled query parameters' do
+      let(:params) { { f: { field: { '0': 'first', '1': 'second' } } } }
+
+      it 'normalizes the facets to the expected format' do
+        expect(search_state.to_h).to include f: { field: %w[first second] }
+      end
+    end
+
+    context 'deleting item from to_h' do
+      let(:params) { { q: 'foo', q_1: 'bar' } }
+
+      it 'does not mutate search_state to mutate search_state.to_h' do
+        params = search_state.to_h
+        params.delete(:q_1)
+
+        expect(search_state.to_h).to eq('q' => 'foo', 'q_1' => 'bar')
+        expect(params).to eq('q' => 'foo')
+      end
+    end
+
+    context 'deleting deep item from to_h' do
+      let(:params) { { foo: { bar: [] } } }
+
+      it 'does not mutate search_state to deep mutate search_state.to_h' do
+        params = search_state.to_h
+        params[:foo][:bar] << 'buzz'
+
+        expect(search_state.to_h).to eq('foo' => { 'bar' => [] })
+        expect(params).to eq('foo' => { 'bar' => ['buzz'] })
+      end
+    end
   end
 
   describe 'interface compatibility with params' do

data/spec/models/blacklight/configuration_spec.rb

@@ -55,6 +55,7 @@ RSpec.describe "Blacklight::Configuration", api: true do
     it "has the global blacklight configuration" do
       expect(config.connection_config).to eq Blacklight.connection_config
     end
+
     it "is overridable with custom configuration" do
       config.connection_config = custom_config
       expect(config.connection_config).to eq custom_config
@@ -340,12 +341,14 @@ RSpec.describe "Blacklight::Configuration", api: true do
       expect(config.index_fields["title_tsim"]).not_to be_nil
       expect(config.index_fields["title_tsim"].label).to eq "Title"
     end
+
     it "takes IndexField param" do
       config.add_index_field("title_tsim", Blacklight::Configuration::IndexField.new(field: "title_display", label: "Title"))
 
       expect(config.index_fields["title_tsim"]).not_to be_nil
       expect(config.index_fields["title_tsim"].label).to eq "Title"
     end
+
     it "takes block form" do
       config.add_index_field("title_tsim") do |field|
         field.label = "Title"
@@ -388,12 +391,14 @@ RSpec.describe "Blacklight::Configuration", api: true do
       expect(config.show_fields["title_tsim"]).not_to be_nil
       expect(config.show_fields["title_tsim"].label).to eq "Title"
     end
+
     it "takes ShowField argument" do
       config.add_show_field("title_tsim", Blacklight::Configuration::ShowField.new(field: "title_display", label: "Title"))
 
       expect(config.show_fields["title_tsim"]).not_to be_nil
       expect(config.show_fields["title_tsim"].label).to eq "Title"
     end
+
     it "takes block form" do
       config.add_show_field("title_tsim") do |f|
         f.label = "Title"

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

@@ -24,6 +24,7 @@ RSpec.describe Blacklight::Document::CacheKey, api: true do
     it 'provides a cache key with the id and version' do
       expect(subject.cache_key).to eq 'solr_documents/12345-1497353774427013120'
     end
+
     describe 'as array' do
       let(:attributes) { { id: '12345', _version_: %w[1234 4321] } }
 

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

@@ -11,11 +11,13 @@ RSpec.describe "Blacklight::Document::Email" do
     expect(email_body).to match(/Title: My Title/)
     expect(email_body).not_to match(/Author/)
   end
+
   it "handles multi-values fields correctly" do
     doc = SolrDocument.new(id: "1234", title_tsim: ["My Title", "My Alt. Title"])
     email_body = doc.to_email_text
     expect(email_body).to match(/Title: My Title My Alt. Title/)
   end
+
   it "returns nil if there are no valid field semantics to build the email body from" do
     doc = SolrDocument.new(id: "1234")
     expect(doc.to_email_text).to be_nil

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

@@ -10,12 +10,14 @@ RSpec.describe "Blacklight::Document::Email" do
     sms_text = doc.to_sms_text
     expect(sms_text).to match(/My Title by Joe Schmoe/)
   end
+
   it "handles multi-values fields correctly and only take the first" do
     doc = SolrDocument.new(id: "1234", title_tsim: ["My Title", "My Alt. Title"])
     sms_text = doc.to_sms_text
     expect(sms_text).to match(/My Title/)
     expect(sms_text).not_to match(/My Alt\. Title/)
   end
+
   it "returns nil if there are no valid field semantics to build the email body from" do
     doc = SolrDocument.new(id: "1234")
     expect(doc.to_sms_text).to be_nil

data/spec/models/blacklight/facet_paginator_spec.rb

@@ -20,6 +20,7 @@ RSpec.describe Blacklight::FacetPaginator, api: true do
     its(:current_page) { is_expected.to eq 1 }
     its(:prev_page) { is_expected.to be_nil }
     its(:next_page) { is_expected.to eq 2 }
+
     it 'limits items to limit, if limit is smaller than items.length' do
       expect(subject.items.size).to eq 6
     end
@@ -33,6 +34,7 @@ RSpec.describe Blacklight::FacetPaginator, api: true do
     its(:current_page) { is_expected.to eq 2 }
     its(:prev_page) { is_expected.to eq 1 }
     its(:next_page) { is_expected.to be_nil }
+
     it 'returns all items when limit is greater than items.length' do
       expect(subject.items.size).to eq 1
     end
@@ -46,6 +48,7 @@ RSpec.describe Blacklight::FacetPaginator, api: true do
     its(:current_page) { is_expected.to eq 2 }
     its(:prev_page) { is_expected.to eq 1 }
     its(:next_page) { is_expected.to eq 3 }
+
     it 'limits items to limit, if limit is smaller than items.length' do
       expect(subject.items.size).to eq 6
     end

data/spec/models/blacklight/icon_spec.rb

@@ -7,18 +7,22 @@ RSpec.describe Blacklight::Icon do
     it 'returns a string' do
       expect(subject.svg).to be_an String
     end
+
     it 'returns raw svg' do
       expect(Capybara.string(subject.svg))
         .to have_css 'svg[width="24"]'
     end
+
     it 'adds role="img"' do
       expect(Capybara.string(subject.svg))
         .to have_css 'svg[role="img"]'
     end
+
     it 'adds title' do
       expect(Capybara.string(subject.svg))
         .to have_css 'title', text: 'Search'
     end
+
     context 'when label is false' do
       subject { described_class.new(:search, classes: 'awesome', aria_hidden: true, label: false) }
 
@@ -42,9 +46,11 @@ RSpec.describe Blacklight::Icon do
     it 'applies options classes and default class' do
       expect(subject.options[:class]).to eq 'blacklight-icons blacklight-icon-search awesome'
     end
+
     it 'applies options aria-hidden=true' do
       expect(subject.options[:'aria-hidden']).to be true
     end
+
     context 'no options provided' do
       subject { described_class.new(:view) }
 

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

@@ -80,10 +80,12 @@ RSpec.describe "Blacklight::Solr::Document", api: true do
 
       expect(MockDocument.registered_extensions.find { |a| a[:module_obj] == MockExtension }).not_to be_nil
     end
+
     it "lets you register an extension with a nil condition proc" do
       MockDocument.use_extension(MockExtension) { |_doc| true }
       expect(MockDocument.registered_extensions.find { |a| a[:module_obj] == MockExtension }).not_to be_nil
     end
+
     it "applies an extension whose condition is met" do
       MockDocument.use_extension(MockExtension) { |_doc| true }
       doc = MockDocument.new
@@ -91,6 +93,7 @@ RSpec.describe "Blacklight::Solr::Document", api: true do
       expect(doc.methods.find { |name| name.to_s == "my_extension_method" }).not_to be_nil
       expect(doc.my_extension_method.to_s).to eq "my_extension_results"
     end
+
     it "applies an extension based on a Solr field" do
       MockDocument.use_extension(MockExtension) { |doc| doc.key?(:required_key) }
 
@@ -100,12 +103,14 @@ RSpec.describe "Blacklight::Solr::Document", api: true do
       without_extension = MockDocument.new(other_key: "value")
       expect(without_extension.methods.find { |name| name.to_s == "my_extension_method" }).to be_nil
     end
+
     it "does not apply an extension whose condition is not met" do
       MockDocument.use_extension(MockExtension) { |_doc| false }
       doc = MockDocument.new
 
       expect(doc.methods.find { |name| name.to_s == "my_extension_method" }).to be_nil
     end
+
     it "treats a nil condition as always applyable" do
       MockDocument.use_extension(MockExtension)
 
@@ -114,6 +119,7 @@ RSpec.describe "Blacklight::Solr::Document", api: true do
       expect(doc.methods.find { |name| name.to_s == "my_extension_method" }).not_to be_nil
       expect(doc.my_extension_method).to eq "my_extension_results"
     end
+
     it "lets last extension applied override earlier extensions" do
       MockDocument.use_extension(MockExtension)
       MockDocument.use_extension(MockSecondExtension)
@@ -176,6 +182,7 @@ RSpec.describe "Blacklight::Solr::Document", api: true do
       it "registers format" do
         expect(defined?("Mime::MOCK2")).to be_truthy
       end
+
       it "registers as alias only" do
         expect(Mime::Type.lookup("application/mock2")).not_to equal Mime::Type.lookup_by_extension("mock2")
       end
@@ -217,13 +224,16 @@ RSpec.describe "Blacklight::Solr::Document", api: true do
       expect(@doc1.to_semantic_values)
         .to eq title: ["doc1 title", "doc1 title other"], something: %w[val1 val2]
     end
+
     it "returns empty array for a key without a value" do
       expect(@doc1.to_semantic_values[:author]).to be_empty
       expect(@doc1.to_semantic_values[:nonexistent_token]).to be_empty
     end
+
     it "returns an array even for a single-value field" do
       expect(@doc1.to_semantic_values[:title]).to be_kind_of(Array)
     end
+
     it "returns complete array for a multi-value field" do
       expect(@doc1.to_semantic_values[:something]).to eq %w[val1 val2]
     end