blacklight 7.36.2 → 8.0.0.beta1

data/spec/models/blacklight/search_builder_spec.rb

@@ -234,50 +234,50 @@ RSpec.describe Blacklight::SearchBuilder, api: true do
 
   describe "#params_changed?" do
     it "is false" do
-      expect(subject.send(:params_changed?)).to eq false
+      expect(subject.send(:params_changed?)).to be false
     end
 
     it "is marked as changed when with() changes" do
       subject.with(a: 1)
-      expect(subject.send(:params_changed?)).to eq true
+      expect(subject.send(:params_changed?)).to be true
     end
 
     it "is marked as changed when where() changes" do
       subject.where(a: 1)
-      expect(subject.send(:params_changed?)).to eq true
+      expect(subject.send(:params_changed?)).to be true
     end
 
     it "is marked as changed when the processor chain changes" do
       subject.append(:a)
-      expect(subject.send(:params_changed?)).to eq true
+      expect(subject.send(:params_changed?)).to be true
     end
 
     it "is marked as changed when merged parameters are added" do
       subject.merge(a: 1)
-      expect(subject.send(:params_changed?)).to eq true
+      expect(subject.send(:params_changed?)).to be true
     end
 
     it "is marked as changed when reverse merged parameters are added" do
       subject.reverse_merge(a: 1)
-      expect(subject.send(:params_changed?)).to eq true
+      expect(subject.send(:params_changed?)).to be true
     end
 
     it "is marked as changed when pagination changes" do
       expect(subject).to receive(:page=).with(1).and_call_original
       subject.page(1)
-      expect(subject.send(:params_changed?)).to eq true
+      expect(subject.send(:params_changed?)).to be true
     end
 
     it "is marked as changed when rows changes" do
       expect(subject).to receive(:rows=).with(1).and_call_original
       subject.rows(1)
-      expect(subject.send(:params_changed?)).to eq true
+      expect(subject.send(:params_changed?)).to be true
     end
 
     it "is marked as changed when start offset changes" do
       expect(subject).to receive(:start=).with(1).and_call_original
       subject.start(1)
-      expect(subject.send(:params_changed?)).to eq true
+      expect(subject.send(:params_changed?)).to be true
     end
   end
 end

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

@@ -21,9 +21,9 @@ RSpec.describe "Blacklight::Solr::Document", api: true do
     it 'creates a doc with hashy methods' do
       doc = SolrDocument.new('id' => 'SP2514N', 'inStock' => true, 'manu' => 'Samsung Electronics Co. Ltd.', 'name' => 'Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133', 'popularity' => 6, 'price' => 92.0, 'sku' => 'SP2514N', 'timestamp' => '2009-03-20T14:42:49.795Z', 'cat' => ['electronics', 'hard drive'], 'spell' => ['Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133'], 'features' => ['7200RPM, 8MB cache, IDE Ultra ATA-133', 'NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor'])
 
-      expect(doc.has?(:cat, /^elec/)).to eq true
-      expect(doc.has?(:cat, 'elec')).not_to eq true
-      expect(doc.has?(:cat, 'electronics')).to eq true
+      expect(doc.has?(:cat, /^elec/)).to be true
+      expect(doc.has?(:cat, 'elec')).not_to be true
+      expect(doc.has?(:cat, 'electronics')).to be true
 
       expect(doc.fetch(:cat)).to eq ['electronics', 'hard drive']
       expect(doc.fetch(:xyz, nil)).to be_nil

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

@@ -153,33 +153,6 @@ RSpec.describe Blacklight::Solr::Repository, api: true do
         expect(JSON.parse(actual_params[:data]).with_indifferent_access).to include(query: { bool: {} })
         expect(actual_params[:headers]).to include({ 'Content-Type' => 'application/json' })
       end
-
-      context "without a json solr path configured" do
-        before do
-          blacklight_config.json_solr_path = nil
-        end
-
-        it "uses the default solr path" do
-          blacklight_config.solr_path = 'xyz'
-          allow(subject.connection).to receive(:send_and_receive) do |path|
-            expect(path).to eq 'xyz'
-          end
-          subject.search(input_params)
-        end
-      end
-
-      context "with a json solr path configured" do
-        before do
-          blacklight_config.json_solr_path = 'my-great-json'
-        end
-
-        it "uses the configured json_solr_path" do
-          allow(subject.connection).to receive(:send_and_receive) do |path|
-            expect(path).to eq 'my-great-json'
-          end
-          subject.search(input_params)
-        end
-      end
     end
   end
 

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

@@ -114,13 +114,13 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
 
       it "defaults to count if no value is found and the default limit is used" do
         expect(subject.aggregations['my_field'].sort).to eq 'count'
-        expect(subject.aggregations['my_field'].count?).to eq true
+        expect(subject.aggregations['my_field'].count?).to be true
       end
 
       it "defaults to index if no value is found and the limit is unlimited" do
         request_params['facet.limit'] = -1
         expect(subject.aggregations['my_field'].sort).to eq 'index'
-        expect(subject.aggregations['my_field'].index?).to eq true
+        expect(subject.aggregations['my_field'].index?).to be true
       end
     end
 
@@ -335,21 +335,21 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
     let(:response) do
       {
         facets: {
-          "count": 32,
-          "categories": {
-            "buckets": [
+          count: 32,
+          categories: {
+            buckets: [
               {
-                "val": "electronics",
-                "count": 12,
-                "max_price": 60
+                val: "electronics",
+                count: 12,
+                max_price: 60
               },
               {
-                "val": "currency",
-                "count": 4
+                val: "currency",
+                count: 4
               },
               {
-                "val": "memory",
-                "count": 3
+                val: "memory",
+                count: 3
               }
             ]
           }
@@ -375,25 +375,25 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
       let(:response) do
         {
           facets: {
-            "categories": {
-              "buckets": [
+            categories: {
+              buckets: [
                 {
-                  "val": "electronics",
-                  "count": 12,
-                  "top_manufacturer": {
-                    "buckets": [{
-                      "val": "corsair",
-                      "count": 3
+                  val: "electronics",
+                  count: 12,
+                  top_manufacturer: {
+                    buckets: [{
+                      val: "corsair",
+                      count: 3
                     }]
                   }
                 },
                 {
-                  "val": "currency",
-                  "count": 4,
-                  "top_manufacturer": {
-                    "buckets": [{
-                      "val": "boa",
-                      "count": 1
+                  val: "currency",
+                  count: 4,
+                  top_manufacturer: {
+                    buckets: [{
+                      val: "boa",
+                      count: 1
                     }]
                   }
                 }
@@ -413,7 +413,7 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
       let(:response) do
         {
           facets: {
-            "categories": {
+            categories: {
               "missing" => { "count" => 13 },
               "buckets" => [{ "val" => "India", "count" => 2 }, { "val" => "Iran", "count" => 2 }]
             }

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe Blacklight::Solr::Response::GroupResponse, api: true do

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe Blacklight::Solr::Response::Group, api: true do

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

@@ -43,7 +43,7 @@ RSpec.describe Blacklight::Solr::Response, api: true do
 
     expected = "electronics - 14, memory - 3, card - 2, connector - 2, drive - 2, graphics - 2, hard - 2, monitor - 2, search - 2, software - 2"
     received = first_facet.items.collect do |item|
-      item.value + ' - ' + item.hits.to_s
+      "#{item.value} - #{item.hits}"
     end.join(', ')
 
     expect(received).to eq expected
@@ -60,12 +60,19 @@ RSpec.describe Blacklight::Solr::Response, api: true do
     end
   end
 
+  it 'provides a null-object for facets that are not in the response' do
+    expect(r.aggregations).not_to include :some_null_object
+
+    expect(r.aggregations[:some_null_object]).to be_a Blacklight::Solr::Response::FacetField
+    expect(r.aggregations[:some_null_object].items).to be_blank
+  end
+
   it "provides kaminari pagination helpers" do
     expect(r.limit_value).to eq(r.rows)
     expect(r.offset_value).to eq(r.start)
     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.prev_page).to be_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

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

@@ -3,8 +3,8 @@
 RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
   subject { search_builder.with(user_params) }
 
-  let(:single_facet) { { format: 'Book' } }
-  let(:multi_facets) { { format: 'Book', language_ssim: 'Tibetan' } }
+  let(:single_facet) { { format: ['Book'] } }
+  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" } }
 
@@ -73,7 +73,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject[:pf]).to eq ""
     end
 
-    describe "should respect proper precedence of settings, " do
+    describe "should respect proper precedence of settings," do
       it "does not put :search_field in produced params" do
         expect(subject[:search_field]).to be_nil
       end
@@ -108,7 +108,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
     end
 
     it "generates a facet limit" do
-      expect(subject[:"f.subject_ssim.facet.limit"]).to eq 21
+      expect(subject[:'f.subject_ssim.facet.limit']).to eq 21
     end
 
     context 'with a negative facet limit' do
@@ -117,7 +117,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       end
 
       it 'is negative' do
-        expect(subject[:"f.subject_ssim.facet.limit"]).to eq -1
+        expect(subject[:'f.subject_ssim.facet.limit']).to eq -1
       end
     end
 
@@ -127,13 +127,13 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       end
 
       it 'is negative' do
-        expect(subject[:"f.subject_ssim.facet.limit"]).to eq 0
+        expect(subject[:'f.subject_ssim.facet.limit']).to eq 0
       end
     end
 
     it "handles no facet_limits in config" do
       blacklight_config.facet_fields = {}
-      expect(subject).not_to have_key(:"f.subject_ssim.facet.limit")
+      expect(subject).not_to have_key(:'f.subject_ssim.facet.limit')
     end
 
     describe "with max per page enforced" do
@@ -178,7 +178,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
 
       it 'has default facet fields' do
         # remove local params from the facet.field
-        expect(subject[:"facet.field"].map { |x| x.gsub(/\{![^}]+\}/, '') }).to match_array %w[format subject_ssim pub_date_ssim language_ssim lc_1letter_ssim subject_geo_ssim subject_era_ssim]
+        expect(subject[:'facet.field'].map { |x| x.gsub(/\{![^}]+\}/, '') }).to match_array %w[format subject_ssim pub_date_ssim language_ssim lc_1letter_ssim subject_geo_ssim subject_era_ssim]
       end
 
       it "does not have a default qt" do
@@ -224,7 +224,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
         expect(subject["spellcheck.q"]).to be_blank
 
         single_facet.each_value do |value|
-          Array(value).each do |v|
+          value.each do |v|
             expect(subject[:fq]).to include("{!term f=#{single_facet.keys[0]}}#{v}")
           end
         end
@@ -363,14 +363,14 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       end
 
       it "includes spellcheck.dictionary from field def solr_parameters" do
-        expect(subject[:"spellcheck.dictionary"]).to eq "subject"
+        expect(subject[:'spellcheck.dictionary']).to eq "subject"
       end
 
       it "adds on :solr_local_parameters using Solr LocalParams style" do
         # q == "{!pf=$subject_pf $qf=subject_qf} wome", make sure
         # the LocalParams are really there
         subject[:q] =~ /^\{!([^}]+)\}/
-        key_value_pairs = Regexp.last_match(1).split(" ")
+        key_value_pairs = Regexp.last_match(1).split
         expect(key_value_pairs).to include("pf=$subject_pf")
         expect(key_value_pairs).to include("qf=$subject_qf")
       end
@@ -406,24 +406,6 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       it 'includes addtional clause parameters for the field' do
         expect(subject.dig(:json, :query, :bool, :must, 0, :edismax)).to include another: :parameter
       end
-
-      context 'with an empty search' do
-        let(:subject_search_params) { { commit: "search", search_field: "subject", action: "index", controller: "catalog", rows: "10", q: nil } }
-
-        it 'does not add nil query value clauses to json query' do
-          expect(subject).not_to have_key :json
-        end
-      end
-    end
-
-    describe "overriding of qt parameter" do
-      let(:user_params) do
-        { qt: 'overridden' }
-      end
-
-      it "returns the correct overriden parameter" do
-        expect(subject[:qt]).to eq "overridden"
-      end
     end
 
     describe "sorting" do
@@ -508,7 +490,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
     describe 'the search field query_builder config' do
       let(:blacklight_config) do
         Blacklight::Configuration.new do |config|
-          config.add_search_field('built_query', query_builder: ->(builder, *_args) { [builder.blacklight_params[:q].reverse, qq1: 'xyz'] })
+          config.add_search_field('built_query', query_builder: ->(builder, *_args) { [builder.blacklight_params[:q].reverse, { qq1: 'xyz' }] })
         end
       end
 
@@ -600,6 +582,17 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
 
       expect(solr_parameters[:fq]).to be_a_kind_of Array
     end
+
+    context "facet not defined in config" do
+      let(:single_facet) { { unknown_facet_field: "foo" } }
+      let(:user_params) { { f: single_facet } }
+
+      it "does not add facet to solr_parameters" do
+        solr_parameters = Blacklight::Solr::Request.new
+        subject.add_facet_fq_to_solr(solr_parameters)
+        expect(solr_parameters[:fq]).to be_blank
+      end
+    end
   end
 
   describe "#add_solr_fields_to_query" do
@@ -751,7 +744,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
     end
 
     it 'sets facets requested to facet_field argument' do
-      expect(solr_parameters["facet.field".to_sym]).to eq facet_field
+      expect(solr_parameters[:'facet.field']).to eq facet_field
     end
 
     it 'defaults offset to 0' do

data/spec/models/blacklight/user_spec.rb

@@ -45,4 +45,26 @@ RSpec.describe "Blacklight::User", api: true do
       expect(subject.existing_bookmark_for(SolrDocument.new(id: 1))).to eq subject.bookmarks.first
     end
   end
+
+  describe '#to_s' do
+    it 'is the email by default' do
+      expect(subject.to_s).to eq subject.email
+    end
+
+    context 'when no email method is provided' do
+      let(:old_method) { subject.class.instance_method(:email) }
+
+      before do
+        subject.class.send(:undef_method, old_method.name)
+      end
+
+      after do
+        subject.class.send(:define_method, old_method.name, old_method)
+      end
+
+      it 'still provides a string' do
+        expect(subject.to_s).to be_a String
+      end
+    end
+  end
 end

data/spec/presenters/blacklight/clause_presenter_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Blacklight::ClausePresenter, type: :presenter do

data/spec/presenters/blacklight/document_presenter_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Blacklight::DocumentPresenter do
   describe '#fields_to_render' do
     subject { presenter.fields_to_render.to_a }
 
-    let(:field_config) { Blacklight::Configuration::Field.new(field: 'asdf') }
+    let(:field_config) { Blacklight::Configuration::DisplayField.new(field: 'asdf') }
 
     context 'when all of the fields have values' do
       before do
@@ -30,7 +30,7 @@ RSpec.describe Blacklight::DocumentPresenter do
 
   describe '#field_value' do
     let(:field_presenter) { instance_double(Blacklight::FieldPresenter, render: 'xyz') }
-    let(:field_config) { Blacklight::Configuration::Field.new }
+    let(:field_config) { Blacklight::Configuration::DisplayField.new }
     let(:options) { { a: 1 } }
 
     it 'calls the field presenter' do

data/spec/presenters/blacklight/facet_field_presenter_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetFieldPresenter, type: :presenter do
@@ -44,11 +45,11 @@ RSpec.describe Blacklight::FacetFieldPresenter, type: :presenter do
   describe '#active?' do
     it "checks if any value is selected for a given facet" do
       search_state.params[:f] = ActiveSupport::HashWithIndifferentAccess.new(key: [1])
-      expect(presenter.active?).to eq true
+      expect(presenter.active?).to be true
     end
 
     it "is false if no value for facet is selected" do
-      expect(presenter.active?).to eq false
+      expect(presenter.active?).to be false
     end
   end
 
@@ -59,12 +60,12 @@ RSpec.describe Blacklight::FacetFieldPresenter, type: :presenter do
       end
 
       it 'is true' do
-        expect(presenter.in_modal?).to eq true
+        expect(presenter.in_modal?).to be true
       end
     end
 
     it 'is false' do
-      expect(presenter.in_modal?).to eq false
+      expect(presenter.in_modal?).to be false
     end
   end
 
@@ -72,7 +73,9 @@ RSpec.describe Blacklight::FacetFieldPresenter, type: :presenter do
     let(:paginator) { Blacklight::FacetPaginator.new([{}, {}], limit: 1) }
 
     before do
-      allow(view_context).to receive(:facet_paginator).and_return(paginator)
+      # rubocop:disable RSpec/SubjectStub
+      allow(presenter).to receive(:paginator).and_return(paginator)
+      # rubocop:enable RSpec/SubjectStub
     end
 
     context 'with no additional data' do
@@ -97,13 +100,6 @@ RSpec.describe Blacklight::FacetFieldPresenter, type: :presenter do
     end
   end
 
-  describe '#html_id' do
-    it 'gets the id from a helper' do
-      allow(view_context).to receive(:html_id).with('key').and_return('facet-key')
-      expect(presenter.html_id).to eq 'facet-key'
-    end
-  end
-
   describe '#paginator' do
     subject(:paginator) { presenter.paginator }
 
@@ -112,4 +108,81 @@ RSpec.describe Blacklight::FacetFieldPresenter, type: :presenter do
       expect(paginator.total_count).to eq 0
     end
   end
+
+  describe "#facet_limit" do
+    subject(:facet_limit) { presenter.facet_limit }
+
+    let(:search_state) { Blacklight::SearchState.new({}, blacklight_config, controller) }
+    let(:blacklight_config) { CatalogController.blacklight_config }
+    let(:facet_field) { blacklight_config.facet_fields['subject_ssim'] }
+    let(:display_facet) do
+      instance_double(Blacklight::Solr::Response::Facets::FacetField, items: items, limit: nil, sort: :index, offset: 0, prefix: nil)
+    end
+    # let(:facet_field) { Blacklight::Configuration::FacetField.new(key: 'key') }
+    # let(:display_facet) do
+    #   instance_double(Blacklight::Solr::Response::Facets::FacetField, items: items, sort: :index, offset: 0, prefix: nil)
+    # end
+
+    it "returns specified value for facet_field specified" do
+      expect(facet_limit).to eq facet_field.limit
+    end
+
+    describe "for 'true' configured values" do
+      let(:blacklight_config) do
+        Blacklight::Configuration.new do |config|
+          config.add_facet_field "language_facet", limit: true
+        end
+      end
+      let(:facet_field) { blacklight_config.facet_fields['language_facet'] }
+
+      context 'when the limit in the response is nil' do
+        let(:display_facet) do
+          instance_double(Blacklight::Solr::Response::Facets::FacetField, items: items, limit: nil, sort: :index, offset: 0, prefix: nil)
+        end
+
+        it "uses the config setting" do
+          blacklight_config.facet_fields['language_facet'].limit = 10
+          expect(facet_limit).to eq 10
+        end
+      end
+
+      context 'when the limit in the response is provided' do
+        let(:display_facet) do
+          instance_double(Blacklight::Solr::Response::Facets::FacetField, items: items, limit: 16, sort: :index, offset: 0, prefix: nil)
+        end
+
+        it "gets the limit from the facet field in @response" do
+          expect(facet_limit).to eq 15
+        end
+      end
+
+      context 'when not in the display_facet' do
+        let(:display_facet) { nil }
+
+        it "defaults to 10" do
+          expect(facet_limit).to eq 10
+        end
+      end
+    end
+
+    context 'for facet fields with a key that is different from the field name' do
+      before do
+        allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
+      end
+
+      let(:blacklight_config) do
+        Blacklight::Configuration.new do |config|
+          config.add_facet_field 'some_key', field: 'x', limit: true
+        end
+      end
+      let(:facet_field) { blacklight_config.facet_fields['some_key'] }
+      let(:display_facet) do
+        instance_double(Blacklight::Solr::Response::Facets::FacetField, items: items, limit: 16, sort: :index, offset: 0, prefix: nil)
+      end
+
+      it 'gets the limit from the facet field in the @response' do
+        expect(facet_limit).to eq 15
+      end
+    end
+  end
 end

data/spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetGroupedItemPresenter, type: :presenter do

data/spec/presenters/blacklight/facet_item_presenter_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Blacklight::FacetItemPresenter, type: :presenter do
@@ -7,22 +8,22 @@ RSpec.describe Blacklight::FacetItemPresenter, type: :presenter do
   end
 
   let(:facet_item) { instance_double(Blacklight::Solr::Response::Facets::FacetItem) }
+  let(:filter_field) { instance_double(Blacklight::SearchState::FilterField, include?: true) }
   let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'key') }
   let(:facet_field) { instance_double(Blacklight::Solr::Response::Facets::FacetField) }
   let(:view_context) { controller.view_context }
-  let(:search_state) { instance_double(Blacklight::SearchState) }
+  let(:search_state) { instance_double(Blacklight::SearchState, filter: filter_field) }
 
   describe '#selected?' do
-    it 'works' do
-      allow(search_state).to receive(:has_facet?).and_return(true)
-      expect(presenter.selected?).to be true
-    end
+    subject { presenter.selected? }
+
+    it { is_expected.to be true }
   end
 
   describe '#label' do
-    it "is the facet value for an ordinary facet" do
+    it "is the stringified facet value for an ordinary facet" do
       allow(facet_config).to receive_messages(query: nil, date: nil, helper_method: nil, url_method: nil)
-      expect(presenter.label).to eq facet_item
+      expect(presenter.label).to eq facet_item.to_s
     end
 
     it "allows you to pass in a :helper_method argument to the configuration" do
@@ -63,9 +64,7 @@ RSpec.describe Blacklight::FacetItemPresenter, type: :presenter do
   end
 
   describe '#href' do
-    before do
-      allow(search_state).to receive(:has_facet?).and_return(false)
-    end
+    let(:filter_field) { instance_double(Blacklight::SearchState::FilterField, include?: false) }
 
     it 'is the url to apply the facet' do
       allow(search_state).to receive(:add_facet_params_and_redirect).with('key', facet_item).and_return(f: 'x')
@@ -87,11 +86,13 @@ RSpec.describe Blacklight::FacetItemPresenter, type: :presenter do
     end
 
     context 'with a selected facet' do
-      it 'is the url to remove the facet' do
-        allow(search_state).to receive(:has_facet?).and_return(true)
-        allow(search_state).to receive(:remove_facet_params).with('key', facet_item).and_return({})
+      let(:filter_field) { instance_double(Blacklight::SearchState::FilterField, include?: true, remove: {}) }
+
+      before do
         allow(view_context).to receive(:search_action_path).with({}).and_return('/catalog')
+      end
 
+      it 'is the url to remove the facet' do
         expect(presenter.href).to eq '/catalog'
       end
     end