blacklight 6.25.0 → 7.0.0.rc1

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-describe Blacklight::Solr::SearchBuilderBehavior do
+RSpec.describe Blacklight::Solr::SearchBuilderBehavior do
   let(:single_facet) { { format: 'Book' } }
-  let(:multi_facets) { { format: 'Book', language_facet: 'Tibetan' } }
+  let(:multi_facets) { { format: 'Book', language_ssim: 'Tibetan' } }
   let(:mult_word_query) { 'tibetan history' }
   let(:subject_search_params) { { commit: "search", search_field: "subject", action: "index", controller: "catalog", rows: "10", q: "wome" } }
 
@@ -22,22 +22,9 @@ describe Blacklight::Solr::SearchBuilderBehavior do
   subject { search_builder.with(user_params) }
 
   context "with default processor chain" do
-    context "with two arguments" do
-      subject do
-        Deprecation.silence Blacklight::SearchBuilder do
-          search_builder_class.new true, context
-        end
-      end
-      it "uses the class-level default_processor_chain" do
-        expect(subject.processor_chain).to eq search_builder_class.default_processor_chain
-      end
-    end
-
-    context "with one arguments" do
-      subject { search_builder }
-      it "uses the class-level default_processor_chain" do
-        expect(subject.processor_chain).to eq search_builder_class.default_processor_chain
-      end
+    subject { search_builder }
+    it "uses the class-level default_processor_chain" do
+      expect(subject.processor_chain).to eq search_builder_class.default_processor_chain
     end
   end
 
@@ -104,32 +91,32 @@ describe Blacklight::Solr::SearchBuilderBehavior do
     end
 
     it "should generate a facet limit" do
-      expect(subject[:"f.subject_topic_facet.facet.limit"]).to eq 21
+      expect(subject[:"f.subject_ssim.facet.limit"]).to eq 21
     end
 
     context 'with a negative facet limit' do
       before do
-        blacklight_config.facet_fields['subject_topic_facet'].limit = -1
+        blacklight_config.facet_fields['subject_ssim'].limit = -1
       end
 
       it 'is negative' do
-        expect(subject[:"f.subject_topic_facet.facet.limit"]).to eq -1
+        expect(subject[:"f.subject_ssim.facet.limit"]).to eq -1
       end
     end
 
     context 'with a facet limit set to 0' do
       before do
-        blacklight_config.facet_fields['subject_topic_facet'].limit = 0
+        blacklight_config.facet_fields['subject_ssim'].limit = 0
       end
 
       it 'is negative' do
-        expect(subject[:"f.subject_topic_facet.facet.limit"]).to eq 0
+        expect(subject[:"f.subject_ssim.facet.limit"]).to eq 0
       end
     end
 
     it "should handle no facet_limits in config" do
       blacklight_config.facet_fields = {}
-      expect(subject).not_to have_key(:"f.subject_topic_facet.facet.limit")
+      expect(subject).not_to have_key(:"f.subject_ssim.facet.limit")
     end
 
     describe "with max per page enforced" do
@@ -172,7 +159,7 @@ describe Blacklight::Solr::SearchBuilderBehavior do
       end
       it 'should have default facet fields' do
         # remove local params from the facet.field
-        expect(subject[:"facet.field"].map { |x| x.gsub(/\{![^}]+\}/, '') }).to match_array ["format", "subject_topic_facet", "pub_date", "language_facet", "lc_1letter_facet", "subject_geo_facet", "subject_era_facet"]
+        expect(subject[:"facet.field"].map { |x| x.gsub(/\{![^}]+\}/, '') }).to match_array ["format", "subject_ssim", "pub_date_ssim", "language_ssim", "lc_1letter_ssim", "subject_geo_ssim", "subject_era_ssim"]
       end
 
       it "should not have a default qt"  do
@@ -310,21 +297,34 @@ describe Blacklight::Solr::SearchBuilderBehavior do
 
 
     describe "sorting" do
-      it "should send the default sort parameter to solr" do
-        expect(subject[:sort]).to eq 'score desc, pub_date_sort desc, title_sort asc'
+      context 'when the user has not provided a value' do
+        it 'sends the default sort parameter to solr' do
+          expect(subject[:sort]).to eq 'score desc, pub_date_si desc, title_si asc'
+        end
       end
 
-      it "should not send a sort parameter to solr if the sort value is blank" do
-        blacklight_config.sort_fields = {}
-        blacklight_config.add_sort_field('', :label => 'test')
+      context "when the configured sort field is blank" do
+        before do
+          blacklight_config.sort_fields = {}
+          blacklight_config.add_sort_field('', :label => 'test')
+        end
 
-        expect(subject).not_to have_key(:sort)
+        it "does not send a sort parameter to solr if the sort value is blank" do
+          expect(subject).not_to have_key(:sort)
+        end
       end
 
-      context "when the user provides sort parmeters" do
-        let(:user_params) { { sort: 'solr_test_field desc' } }
+      context "when the user provides a valid sort parmeter" do
+        let(:user_params) { { sort: 'title_si asc, pub_date_si desc' } }
         it "passes them through" do
-          expect(subject[:sort]).to eq 'solr_test_field desc'
+          expect(subject[:sort]).to eq 'title_si asc, pub_date_si desc'
+        end
+      end
+
+      context "when the user provides an invalid sort parameter" do
+        let(:user_params) { { sort: 'bad' } }
+        it "removes them" do
+          expect(subject).not_to have_key(:sort)
         end
       end
     end
@@ -642,24 +642,11 @@ describe Blacklight::Solr::SearchBuilderBehavior do
       end
     end
 
+
     it 'defaults limit to 20' do
       expect(solr_parameters[:"f.#{facet_field}.facet.limit"]).to eq 21
     end
 
-    context 'when facet_list_limit is defined in scope' do
-      before do
-        allow(Deprecation).to receive(:warn)
-        allow(context).to receive_messages facet_list_limit: 1000
-      end
-      it 'uses scope method for limit' do
-        expect(solr_parameters[:"f.#{facet_field}.facet.limit"]).to eq 1001
-      end
-
-      it 'uses controller method for limit when a ordinary limit is set' do
-        expect(solr_parameters[:"f.#{facet_field}.facet.limit"]).to eq 1001
-      end
-    end
-
     it 'uses the default sort' do
       expect(solr_parameters[:"f.#{facet_field}.facet.sort"]).to be_blank
     end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-RSpec.describe Blacklight::Suggest::Response, api: true do
-  let(:empty_response) { described_class.new({}, { q: 'hello' }, 'suggest', 'mySuggester') }
+RSpec.describe Blacklight::Suggest::Response do
+  let(:empty_response) { described_class.new({}, { q: 'hello' }, 'suggest') }
   let(:full_response) do
     described_class.new(
       {
@@ -36,8 +36,7 @@ RSpec.describe Blacklight::Suggest::Response, api: true do
       {
         q: 'new'
       },
-      'suggest',
-      'mySuggester'
+      'suggest'
     )
   end
 
@@ -53,4 +52,4 @@ RSpec.describe Blacklight::Suggest::Response, api: true do
       expect(full_response.suggestions.first['term']).to eq 'new jersey'
     end
   end
-end
+end

data/spec/models/blacklight/suggest_search_spec.rb

@@ -1,15 +1,22 @@
 # frozen_string_literal: true
 
-describe Blacklight::SuggestSearch do
+RSpec.describe Blacklight::SuggestSearch do
   let(:params) { {q: 'test'} }
-  let(:response) { instance_double(Blacklight::Suggest::Response)}
-  let(:repository) { instance_double(Blacklight::Solr::Repository, suggestions: response) }
+  let(:suggest_path) { 'suggest' }
+  let(:connection) { instance_double(RSolr::Client, send_and_receive: 'sent')}
+  let(:repository) { instance_double(Blacklight::Solr::Repository, connection: connection) }
   let(:suggest_search) { described_class.new(params, repository)}
-
   describe '#suggestions' do
-    it 'delegates to the repository' do
-      expect(repository).to receive(:suggestions).with(q: 'test').and_return(response)
-      expect(suggest_search.suggestions).to eq response
+    it 'returns a Blacklight::Suggest::Response' do
+      expect(suggest_search).to receive(:suggest_results).and_return([])
+      expect(suggest_search).to receive(:suggest_handler_path).and_return(suggest_path)
+      expect(suggest_search.suggestions).to be_an Blacklight::Suggest::Response
+    end
+  end
+  describe '#suggest_results' do
+    it 'calls send_and_recieve from a repository connection' do
+      expect(suggest_search).to receive(:suggest_handler_path).and_return(suggest_path)
+      expect(suggest_search.suggest_results).to eq 'sent'
     end
   end
 end

data/spec/models/blacklight/user_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Blacklight::User" do
+RSpec.describe "Blacklight::User" do
 
   subject { User.create! :email => 'xyz@example.com', :password => 'xyz12345' }
 

data/spec/models/bookmark_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Bookmark do
+RSpec.describe Bookmark do
   let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345'}
   subject do
     b = Bookmark.new(user: user)

data/spec/models/record_mailer_spec.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-describe RecordMailer do
+RSpec.describe RecordMailer do
   before(:each) do
     allow(RecordMailer).to receive(:default) { { :from => 'no-reply@projectblacklight.org' } }
     SolrDocument.use_extension( Blacklight::Document::Email )
     SolrDocument.use_extension( Blacklight::Document::Sms )
-    document = SolrDocument.new({:id=>"123456", :format=>["book"], :title_display => "The horn", :language_facet => "English", :author_display => "Janetzky, Kurt"})
+    document = SolrDocument.new({:id=>"123456", :format=>["book"], :title_tsim => "The horn", :language_ssim => "English", :author_tsim => "Janetzky, Kurt"})
     @documents = [document]
   end
   describe "email" do

data/spec/models/search_spec.rb

@@ -1,51 +1,30 @@
 # frozen_string_literal: true
 
-describe Search do
-  let(:search) { described_class.new(user: user) }
+RSpec.describe Search do
   let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345'}
-  let(:hash_params) { { q: "query", f: { facet: "filter" } } }
-  let(:query_params) { hash_params }
-
   describe "query_params" do
-    shared_examples "persisting query_params" do
-      it "can save and retrieve the hash" do
-        search.query_params = query_params
-        search.save!
-        expect(described_class.find(search.id).query_params).to eq query_params.with_indifferent_access
-      end
-    end
-
-    context "are an indifferent hash" do
-      include_context "persisting query_params" do
-        let(:query_params) { hash_params.with_indifferent_access }
-      end
-    end
-
-    context "are a string-keyed hash" do
-      include_context "persisting query_params" do
-        let(:query_params) { hash_params.with_indifferent_access.to_hash }
-      end
+    before(:each) do
+      @search = Search.new(user: user)
+      @query_params = { :q => "query", :f => "facet" }
     end
 
-    context "include symbol keys" do
-      include_context "persisting query_params" do
-        let(:query_params) { hash_params }
-      end
+    it "can save and retrieve the hash" do
+      @search.query_params = @query_params
+      @search.save!
+      expect(Search.find(@search.id).query_params).to eq @query_params
     end
   end
 
   describe "saved?" do
     it "is true when user_id is not NULL and greater than 0" do
-      search.save!
-      expect(search).to be_saved
-    end
+      @search = Search.new(user: user)
+      @search.save!
 
-    context "when user_id is NULL or less than 1" do
-      let(:search) { described_class.create }
-
-      it "is false" do
-        expect(search).not_to be_saved
-      end
+      expect(@search).to be_saved
+    end
+    it "is false when user_id is NULL or less than 1" do
+      @search = Search.create
+      expect(@search).not_to be_saved
     end
   end
 

data/spec/models/solr_document_spec.rb

@@ -3,14 +3,14 @@
 RSpec.describe SolrDocument do
   describe "access methods" do
     let(:solrdoc) do
-      SolrDocument.new(id: '00282214', format: ['Book'], title_display: 'some-title')
+      SolrDocument.new(id: '00282214', format: ['Book'], title_tsim: 'some-title')
     end
 
     describe "#[]" do
       subject { solrdoc[field] }
 
-      context "with title_display" do
-        let(:field) { :title_display }
+      context "with title_tsim" do
+        let(:field) { :title_tsim }
         it { is_expected.to eq 'some-title' }
       end
       context "with format" do

data/spec/presenters/blacklight/search_bar_presenter_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Blacklight::SearchBarPresenter do
+  let(:controller) { CatalogController.new }
+  let(:presenter) { described_class.new(controller, blacklight_config) }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+
+  describe '#autocomplete_enabled?' do
+    subject { presenter.autocomplete_enabled? }
+
+    describe 'with autocomplete config' do
+      let(:blacklight_config) do
+        Blacklight::Configuration.new.configure do |config|
+          config.autocomplete_enabled = true
+          config.autocomplete_path = 'suggest'
+        end
+      end
+      it { is_expected.to be true }
+    end
+
+    describe 'without disabled config' do
+      let(:blacklight_config) do
+        Blacklight::Configuration.new.configure do |config|
+          config.autocomplete_enabled = false
+          config.autocomplete_path = 'suggest'
+        end
+      end
+      it { is_expected.to be false }
+    end
+
+    describe 'without path config' do
+      let(:blacklight_config) do
+        Blacklight::Configuration.new.configure do |config|
+          config.autocomplete_enabled = true
+        end
+      end
+
+      it { is_expected.to be false }
+    end
+  end
+
+  describe "#autofocus?" do
+    subject { presenter.autofocus? }
+    context "on a catalog-like index page without query or facet parameters" 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 true }
+    end
+
+    context "when not the catalog controller" do
+      let(:controller) { ApplicationController.new }
+      it { is_expected.to be false }
+    end
+
+    context "when on the catalog controller show page" do
+      before do
+        allow(controller).to receive(:action_name).and_return('show')
+      end
+      it { is_expected.to be false }
+    end
+
+    context "when search parameters are provided" do
+      before do
+        allow(controller).to receive(:has_search_parameters?).and_return(true)
+      end
+      it { is_expected.to be false }
+    end
+  end
+end