blacklight 7.1.0 → 7.2.0

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

@@ -63,6 +63,19 @@ RSpec.describe Blacklight::Solr::Response::GroupResponse, api: true do
       expect(group.empty?).to be false
     end
   end
+
+  describe "entry_name" do
+    it "accesses a custom field grouped i18n key" do
+      allow(I18n).to receive(:t).with(
+        'blacklight.entry_name.grouped.result_group_ssi',
+        default: :'blacklight.entry_name.grouped.default'
+      ).and_return('cool group')
+      expect(group.entry_name(count: 2)).to eq 'cool groups'
+    end
+    it "falls back to default group key" do
+      expect(group.entry_name(count: 2)).to eq 'grouped results'
+    end
+  end
 end
 
 def create_response(response, params = {})

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

@@ -66,6 +66,9 @@ RSpec.describe Blacklight::Solr::Response, api: true do
     expect(r.total_count).to eq(r.total)
     expect(r.next_page).to eq(r.current_page + 1)
     expect(r.prev_page).to eq(nil)
+    expect(r.entry_name(count: 1)).to eq 'entry'
+    expect(r.entry_name(count: 2)).to eq 'entries'
+    expect(r.size).to eq 26
     if Kaminari.config.respond_to? :max_pages
       expect(r.max_pages).to be_nil
     end

data/spec/presenters/blacklight/search_bar_presenter_spec.rb

@@ -46,6 +46,12 @@ RSpec.describe Blacklight::SearchBarPresenter do
     subject { presenter.autofocus? }
 
     context "on a catalog-like index page without query or facet parameters" do
+      let(:blacklight_config) do
+        Blacklight::Configuration.new.configure do |config|
+          config.enable_search_bar_autofocus = true
+        end
+      end
+
       before do
         allow(controller).to receive(:action_name).and_return('index')
         allow(controller).to receive(:has_search_parameters?).and_return(false)
@@ -54,6 +60,15 @@ RSpec.describe Blacklight::SearchBarPresenter do
       it { is_expected.to be true }
     end
 
+    context "when disabled in config" do
+      before do
+        allow(controller).to receive(:action_name).and_return('index')
+        allow(controller).to receive(:has_search_parameters?).and_return(false)
+      end
+
+      it { is_expected.to be false }
+    end
+
     context "when not the catalog controller" do
       let(:controller) { ApplicationController.new }
 

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+RSpec.describe "catalog/_facet_group" do
+  let(:blacklight_config) { Blacklight::Configuration.new }
+
+  before do
+    allow(view).to receive_messages(blacklight_config: blacklight_config)
+    allow(view).to receive(:search_action_path).and_return('/catalog')
+  end
+
+  context "without any facet fields" do
+    before do
+      allow(view).to receive_messages(groupname: nil, render_facet_partials: '')
+      render
+    end
+
+    it "does not have a header if no facets are displayed" do
+      expect(rendered).not_to have_selector('h4')
+    end
+  end
+
+  context "with facet groups" do
+    let :facet_field do
+      Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: nil).normalize!
+    end
+
+    let(:mock_display_facet1) do
+      double(name: 'facet_field_1', sort: nil, offset: nil, prefix: nil, items: [Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Value', hits: 1234)])
+    end
+
+    let(:response) do
+      instance_double(Blacklight::Solr::Response, aggregations: { "facet_field_1" => mock_display_facet1 })
+    end
+
+    before do
+      blacklight_config.facet_fields['facet_field_1'] = facet_field
+      allow(view).to receive_messages(groupname: nil, facet_field_names: [:facet_field_1], facet_limit_for: 10)
+      @response = response
+    end
+
+    context "with the default facet group" do
+      it "has a header" do
+        allow(view).to receive_messages(render_facet_partials: '')
+        render
+        expect(rendered).to have_selector('.facets-heading')
+      end
+    end
+
+    context "with a named facet group" do
+      let :facet_field do
+        Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: 'group_1').normalize!
+      end
+
+      before do
+        blacklight_config.facet_fields['facet_field_1'] = facet_field
+        allow(view).to receive_messages(groupname: 'group_1', facet_field_names: [:facet_field_1], facet_limit_for: 10)
+      end
+
+      it "has a header" do
+        allow(view).to receive_messages(render_facet_partials: '')
+        render
+        expect(rendered).to have_selector('.facets-heading')
+        expect(rendered).to have_selector('#facets-group_1')
+      end
+    end
+
+    describe "facet display" do
+      it "has a(n accessible) header" do
+        render
+        expect(rendered).to have_selector('.facet-field-heading')
+      end
+      it "lists values" do
+        render
+        # The .facet-content class is used by blacklight_range_limit js, and
+        # should be applied to the .panel-collapse div that contains the collapsible
+        # facet content. Please make sure it remains if possible.
+        expect(rendered).to have_selector('.facet-content a.facet-select')
+        expect(rendered).to have_selector('.facet-content .facet-count')
+      end
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ RSpec.describe "catalog/facet_layout" do
 
   it "is collapsable" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
-    expect(rendered).to have_selector '.card-header.collapsed'
+    expect(rendered).to have_selector 'button.collapsed'
     expect(rendered).to have_selector '.collapse .card-body'
   end
 

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

@@ -1,76 +1,15 @@
 # frozen_string_literal: true
 
 RSpec.describe "catalog/_facets" do
-  let(:blacklight_config) { Blacklight::Configuration.new }
-
-  before do
-    allow(view).to receive_messages(blacklight_config: blacklight_config)
-    allow(view).to receive(:search_action_path).and_return('/catalog')
-  end
-
-  context "without any facet fields" do
-    it "does not have a header if no facets are displayed" do
-      allow(view).to receive_messages(render_facet_partials: '')
-      render
-      expect(rendered).not_to have_selector('h4')
-    end
-  end
-
   context "with facet groups" do
-    let :facet_field do
-      Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: nil).normalize!
-    end
-
     before do
-      blacklight_config.facet_fields['facet_field_1'] = facet_field
-      @mock_display_facet_1 = double(name: 'facet_field_1', sort: nil, offset: nil, prefix: nil, items: [Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Value', hits: 1234)])
-      allow(view).to receive_messages(facet_group_names: [nil], facet_field_names: [:facet_field_1], facet_limit_for: 10)
-      @response = double
-      allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
-    end
-
-    context "with the default facet group" do
-      it "has a header" do
-        allow(view).to receive_messages(render_facet_partials: '')
-        render
-        expect(rendered).to have_selector('.facets-heading')
-      end
-    end
-
-    context "with a named facet group" do
-      let :facet_field do
-        Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label', group: 'group_1').normalize!
-      end
-
-      before do
-        blacklight_config.facet_fields['facet_field_1'] = facet_field
-        @mock_display_facet_1 = double(name: 'facet_field_1', sort: nil, offset: nil, prefix: nil, items: [Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Value', hits: 1234)])
-        allow(view).to receive_messages(facet_group_names: [nil, 'group_1'], facet_field_names: [:facet_field_1], facet_limit_for: 10)
-        @response = double
-        allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
-      end
-
-      it "has a header" do
-        allow(view).to receive_messages(render_facet_partials: '')
-        render
-        expect(rendered).to have_selector('.facets-heading')
-        expect(rendered).to have_selector('#facets-group_1')
-      end
+      stub_template('catalog/_facet_group.html.erb' => 'text')
+      allow(view).to receive_messages(facet_group_names: [nil, nil])
+      render
     end
 
-    describe "facet display" do
-      it "has a(n accessible) header" do
-        render
-        expect(rendered).to have_selector('.facet-field-heading')
-      end
-      it "lists values" do
-        render
-        # The .facet-content class is used by blacklight_range_limit js, and
-        # should be applied to the .panel-collapse div that contains the collapsible
-        # facet content. Please make sure it remains if possible.
-        expect(rendered).to have_selector('.facet-content a.facet-select')
-        expect(rendered).to have_selector('.facet-content .facet-count')
-      end
+    it "Calls facet_group for each name" do
+      expect(rendered).to match(/^  text\n  text\n$/)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -376,15 +376,14 @@ files:
 - app/helpers/catalog_helper.rb
 - app/javascript/blacklight/autocomplete.js
 - app/javascript/blacklight/bookmark_toggle.js
+- app/javascript/blacklight/button_focus.js
 - app/javascript/blacklight/checkbox_submit.js
-- app/javascript/blacklight/collapsable.js
 - app/javascript/blacklight/core.js
 - app/javascript/blacklight/facet_load.js
 - app/javascript/blacklight/modal.js
 - app/javascript/blacklight/search_context.js
 - app/models/blacklight/facet_paginator.rb
 - app/models/blacklight/icon.rb
-- app/models/blacklight/solr/facet_paginator.rb
 - app/models/blacklight/suggest_search.rb
 - app/models/bookmark.rb
 - app/models/concerns/blacklight/configurable.rb
@@ -398,7 +397,6 @@ files:
 - app/models/concerns/blacklight/document/schema_org.rb
 - app/models/concerns/blacklight/document/semantic_fields.rb
 - app/models/concerns/blacklight/document/sms.rb
-- app/models/concerns/blacklight/solr/document.rb
 - app/models/concerns/blacklight/suggest/response.rb
 - app/models/concerns/blacklight/user.rb
 - app/models/record_mailer.rb
@@ -552,6 +550,8 @@ files:
 - lib/blacklight/search_builder.rb
 - lib/blacklight/search_state.rb
 - lib/blacklight/solr.rb
+- lib/blacklight/solr/document.rb
+- lib/blacklight/solr/facet_paginator.rb
 - lib/blacklight/solr/repository.rb
 - lib/blacklight/solr/request.rb
 - lib/blacklight/solr/response.rb
@@ -698,6 +698,7 @@ files:
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
+- spec/views/catalog/_facet_group.html.erb_spec.rb
 - spec/views/catalog/_facet_index_navigation.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
@@ -846,6 +847,7 @@ test_files:
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
+- spec/views/catalog/_facet_group.html.erb_spec.rb
 - spec/views/catalog/_facet_index_navigation.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb

data/app/javascript/blacklight/collapsable.js

@@ -1,9 +0,0 @@
-(function($) {
-  Blacklight.onLoad(function() {
-    // when clicking on a link that toggles the collapsing behavior, don't do anything
-    // with the hash or the page could jump around.
-    $(document).on('click', 'a[data-toggle=collapse][href="#"], [data-toggle=collapse] a[href="#"]', function(event) {
-      event.preventDefault();
-    });
-  });
-})(jQuery);