blacklight 6.14.0 → 7.0.0

data/spec/models/blacklight/configuration_spec.rb

@@ -1,25 +1,24 @@
 # frozen_string_literal: true
 
-describe "Blacklight::Configuration" do
-  
-  before(:each) do
-    @config = Blacklight::Configuration.new
+RSpec.describe "Blacklight::Configuration", api: true do
+  let(:config) do
+    Blacklight::Configuration.new
   end
 
   it "supports arbitrary configuration values" do
-    @config.a = 1
+    config.a = 1
 
-    expect(@config.a).to eq 1
-    expect(@config[:a]).to eq 1
+    expect(config.a).to eq 1
+    expect(config[:a]).to eq 1
   end
 
   describe "initialization" do
     it "is an OpenStructWithHashAccess" do
-      expect(@config).to be_a_kind_of Blacklight::OpenStructWithHashAccess
+      expect(config).to be_a_kind_of Blacklight::OpenStructWithHashAccess
     end
 
     it "accepts a block for configuration" do
-      config = Blacklight::Configuration.new(:a => 1) { |c| c.a = 2 }
+      config = Blacklight::Configuration.new(a: 1) { |c| c.a = 2 }
 
       expect(config.a).to eq 2
 
@@ -31,46 +30,46 @@ describe "Blacklight::Configuration" do
 
   describe "defaults" do
     it "has a hash of default rsolr query parameters" do
-      expect(@config.default_solr_params).to be_a_kind_of Hash
+      expect(config.default_solr_params).to be_a_kind_of Hash
     end
 
     it "has openstruct values for show and index parameters" do
-      expect(@config.show).to be_a_kind_of OpenStruct
-      expect(@config.index).to be_a_kind_of OpenStruct
+      expect(config.show).to be_a_kind_of OpenStruct
+      expect(config.index).to be_a_kind_of OpenStruct
     end
 
     it "has ordered hashes for field configuration" do
-      expect(@config.facet_fields).to be_a_kind_of ActiveSupport::OrderedHash
-      expect(@config.index_fields).to be_a_kind_of ActiveSupport::OrderedHash
-      expect(@config.show_fields).to be_a_kind_of ActiveSupport::OrderedHash
-      expect(@config.search_fields).to be_a_kind_of ActiveSupport::OrderedHash
-      expect(@config.show_fields).to be_a_kind_of ActiveSupport::OrderedHash
-      expect(@config.search_fields).to be_a_kind_of ActiveSupport::OrderedHash
-      expect(@config.sort_fields).to be_a_kind_of ActiveSupport::OrderedHash
+      expect(config.facet_fields).to be_a_kind_of ActiveSupport::OrderedHash
+      expect(config.index_fields).to be_a_kind_of ActiveSupport::OrderedHash
+      expect(config.show_fields).to be_a_kind_of ActiveSupport::OrderedHash
+      expect(config.search_fields).to be_a_kind_of ActiveSupport::OrderedHash
+      expect(config.show_fields).to be_a_kind_of ActiveSupport::OrderedHash
+      expect(config.search_fields).to be_a_kind_of ActiveSupport::OrderedHash
+      expect(config.sort_fields).to be_a_kind_of ActiveSupport::OrderedHash
     end
-
   end
 
   describe "#connection_config" do
     let(:custom_config) { double }
+
     it "has the global blacklight configuration" do
-      expect(@config.connection_config).to eq Blacklight.connection_config
+      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
+      config.connection_config = custom_config
+      expect(config.connection_config).to eq custom_config
     end
   end
 
   describe "config.index.respond_to" do
     it "has a list of additional formats for index requests to respond to" do
-      @config.index.respond_to.xml = true
+      config.index.respond_to.xml = true
 
-      @config.index.respond_to.csv = { :layout => false }
+      config.index.respond_to.csv = { layout: false }
 
-      @config.index.respond_to.yaml = lambda { render plain: "" }
+      config.index.respond_to.yaml = -> { render plain: "" }
 
-      expect(@config.index.respond_to.keys).to eq [:xml, :csv, :yaml]
+      expect(config.index.respond_to.keys).to eq [:xml, :csv, :yaml]
     end
   end
 
@@ -78,31 +77,76 @@ describe "Blacklight::Configuration" do
     it "defaults to 5" do
       expect(Blacklight::Configuration.new.spell_max).to eq 5
     end
-    
+
     it "accepts config'd value" do
-      expect(Blacklight::Configuration.new(:spell_max => 10).spell_max).to eq 10
+      expect(Blacklight::Configuration.new(spell_max: 10).spell_max).to eq 10
+    end
+  end
+
+  describe "for_display_type" do
+    let(:image) { SolrDocument.new(format: 'Image') }
+    let(:sound) { SolrDocument.new(format: 'Sound') }
+
+    it "adds index fields just for a certain type" do
+      config.for_display_type "Image" do |c|
+        c.add_index_field :dimensions
+      end
+      config.add_index_field :title
+
+      expect(config.index_fields_for(image)).to have_key 'dimensions'
+      expect(config.index_fields_for(image)).to have_key 'title'
+      expect(config.index_fields_for(sound)).not_to have_key 'dimensions'
+      expect(config.index_fields_for(image)).to have_key 'title'
+      expect(config.index_fields).not_to have_key 'dimensions'
+    end
+
+    it "adds show fields just for a certain type" do
+      config.for_display_type "Image" do |c|
+        c.add_show_field :dimensions
+      end
+      config.add_show_field :title
+
+      expect(config.show_fields_for(image)).to have_key 'dimensions'
+      expect(config.show_fields_for(image)).to have_key 'title'
+      expect(config.show_fields_for(sound)).not_to have_key 'dimensions'
+      expect(config.show_fields_for(image)).to have_key 'title'
+      expect(config.show_fields).not_to have_key 'dimensions'
+    end
+
+    it 'calls the block on subsequent invocations' do
+      config.for_display_type "Image" do |c|
+        c.add_show_field :dimensions
+      end
+      config.for_display_type "Image" do |c|
+        c.add_show_field :photographer
+      end
+
+      expect(config.show_fields_for(image)).to have_key 'dimensions'
+      expect(config.show_fields_for(image)).to have_key 'photographer'
     end
   end
 
   describe "inheritable_copy" do
+    let(:klass) { Class.new }
+    let(:config_copy) { config.inheritable_copy(klass) }
+
     it "provides a deep copy of the configuration" do
-      config_copy = @config.inheritable_copy
       config_copy.a = 1
 
       @mock_facet = Blacklight::Configuration::FacetField.new
       config_copy.add_facet_field "dummy_field", @mock_facet
 
-      expect(@config.a).to be_nil
-      expect(@config.facet_fields).to_not include(@mock_facet)
+      expect(config.a).to be_nil
+      expect(config.facet_fields).not_to include(@mock_facet)
     end
 
     context "when model classes are customised" do
-      it "does not dup response_model or document_model" do
-        @config.response_model = Hash
-        @config.document_model = Array
-
-        config_copy = @config.inheritable_copy
+      before do
+        config.response_model = Hash
+        config.document_model = Array
+      end
 
+      it "does not dup response_model or document_model" do
         expect(config_copy.response_model).to eq Hash
         expect(config_copy.document_model).to eq Array
       end
@@ -110,33 +154,27 @@ describe "Blacklight::Configuration" do
 
     context "when model classes are not set" do
       it "leaves response_model and document_model empty" do
-        config_copy = @config.inheritable_copy
-
         expect(config_copy.fetch(:response_model, nil)).to be_nil
         expect(config_copy.fetch(:document_model, nil)).to be_nil
       end
 
       it "returns default classes" do
-        config_copy = @config.inheritable_copy
-
         expect(config_copy.response_model).to eq Blacklight::Solr::Response
         expect(config_copy.document_model).to eq SolrDocument
       end
     end
 
     it "provides cloned copies of mutable data structures" do
-      @config.a = { value: 1 }
-      @config.b = [1,2,3]
-
-      config_copy = @config.inheritable_copy
+      config.a = { value: 1 }
+      config.b = [1, 2, 3]
 
       config_copy.a[:value] = 2
       config_copy.b << 5
 
-      expect(@config.a[:value]).to eq 1
+      expect(config.a[:value]).to eq 1
       expect(config_copy.a[:value]).to eq 2
-      expect(@config.b).to match_array [1,2,3]
-      expect(config_copy.b).to match_array [1,2,3,5]
+      expect(config.b).to match_array [1, 2, 3]
+      expect(config_copy.b).to match_array [1, 2, 3, 5]
     end
   end
 
@@ -145,352 +183,339 @@ describe "Blacklight::Configuration" do
       Blacklight::Configuration.define_field_access :my_custom_field
 
       config = Blacklight::Configuration.new do |config|
-        config.add_my_custom_field 'qwerty', :label => "asdf"
+        config.add_my_custom_field 'qwerty', label: "asdf"
       end
 
-      
-
       expect(config.my_custom_fields.keys).to include('qwerty')
     end
 
     it "lets you define a field accessor that uses an existing field-type" do
-
-      Blacklight::Configuration.define_field_access :my_custom_facet_field, :class => Blacklight::Configuration::FacetField
+      Blacklight::Configuration.define_field_access :my_custom_facet_field, class: Blacklight::Configuration::FacetField
 
       config = Blacklight::Configuration.new do |config|
-        config.add_my_custom_facet_field 'qwerty', :label => "asdf"
+        config.add_my_custom_facet_field 'qwerty', label: "asdf"
       end
 
-      
-
       expect(config.my_custom_facet_fields['qwerty']).to be_a_kind_of(Blacklight::Configuration::FacetField)
     end
-
   end
-  
+
   describe "add_facet_field" do
     it "accepts field name and hash form arg" do
-      @config.add_facet_field('format',  :label => "Format", :limit => true)
-      
-      expect(@config.facet_fields["format"]).to_not be_nil
-      expect(@config.facet_fields["format"]["label"]).to eq "Format"
-      expect(@config.facet_fields["format"]["limit"]).to be true
+      config.add_facet_field('format', label: "Format", limit: true)
+
+      expect(config.facet_fields["format"]).not_to be_nil
+      expect(config.facet_fields["format"]["label"]).to eq "Format"
+      expect(config.facet_fields["format"]["limit"]).to be true
     end
 
     it "accepts FacetField obj arg" do
-      @config.add_facet_field("format", Blacklight::Configuration::FacetField.new( :label => "Format"))
-      
-      expect(@config.facet_fields["format"]).to_not be_nil
-      expect(@config.facet_fields["format"]["label"]).to eq "Format"
+      config.add_facet_field("format", Blacklight::Configuration::FacetField.new(label: "Format"))
+
+      expect(config.facet_fields["format"]).not_to be_nil
+      expect(config.facet_fields["format"]["label"]).to eq "Format"
     end
-    
+
     it "accepts field name and block form" do
-      @config.add_facet_field("format") do |facet|        
+      config.add_facet_field("format") do |facet|
         facet.label = "Format"
         facet.limit = true
       end
-      
-      expect(@config.facet_fields["format"]).to_not be_nil
-      expect(@config.facet_fields["format"].limit).to be true
+
+      expect(config.facet_fields["format"]).not_to be_nil
+      expect(config.facet_fields["format"].limit).to be true
     end
 
     it "accepts block form" do
-      @config.add_facet_field do |facet|
+      config.add_facet_field do |facet|
         facet.field = "format"
         facet.label = "Format"
       end
 
-      expect(@config.facet_fields['format']).to_not be_nil
+      expect(config.facet_fields['format']).not_to be_nil
     end
 
     it "accepts a configuration hash" do
-      @config.add_facet_field :field => 'format', :label => 'Format'
-      expect(@config.facet_fields['format']).to_not be_nil
+      config.add_facet_field field: 'format', label: 'Format'
+      expect(config.facet_fields['format']).not_to be_nil
     end
 
     it "accepts array form" do
-      @config.add_facet_field([{ :field => 'format', :label => 'Format'}, { :field => 'publication_date', :label => 'Publication Date' }])
+      config.add_facet_field([{ field: 'format', label: 'Format' }, { field: 'publication_date', label: 'Publication Date' }])
 
-      expect(@config.facet_fields).to have(2).fields
+      expect(config.facet_fields).to have(2).fields
     end
 
     it "accepts array form with a block" do
       expect do |b|
-        @config.add_facet_field([{ :field => 'format', :label => 'Format'}, { :field => 'publication_date', :label => 'Publication Date' }], &b)
+        config.add_facet_field([{ field: 'format', label: 'Format' }, { field: 'publication_date', label: 'Publication Date' }], &b)
       end.to yield_control.twice
     end
 
-
     it "creates default label from titleized solr field" do
-      @config.add_facet_field("publication_date")
-        
-      expect(@config.facet_fields["publication_date"].label).to eq "Publication Date"
+      config.add_facet_field("publication_date")
+
+      expect(config.facet_fields["publication_date"].label).to eq "Publication Date"
     end
 
     it "allows you to not show the facet in the facet bar" do
-      @config.add_facet_field("publication_date", :show=>false)
-        
-      expect(@config.facet_fields["publication_date"]['show']).to be false
+      config.add_facet_field("publication_date", show: false)
+
+      expect(config.facet_fields["publication_date"]['show']).to be false
     end
-    
+
     it "raises on nil solr field name" do
-      expect { @config.add_facet_field(nil) }.to raise_error ArgumentError
+      expect { config.add_facet_field(nil) }.to raise_error ArgumentError
     end
 
     it "looks up and match field names" do
-      allow(@config).to receive_messages(luke_fields: { 
-        "some_field_facet" => {}, 
+      allow(config).to receive(:reflected_fields).and_return(
+        "some_field_facet" => {},
         "another_field_facet" => {},
-        "a_facet_field" => {},
-        })
-      expect { |b| @config.add_facet_field match: /_facet$/, &b }.to yield_control.twice
+        "a_facet_field" => {}
+      )
+      expect { |b| config.add_facet_field match: /_facet$/, &b }.to yield_control.twice
 
-      expect(@config.facet_fields.keys).to eq ["some_field_facet", "another_field_facet"]
+      expect(config.facet_fields.keys).to eq %w[some_field_facet another_field_facet]
     end
 
     it "takes wild-carded field names and dereference them to solr fields" do
-      allow(@config).to receive_messages(luke_fields: {
+      allow(config).to receive(:reflected_fields).and_return(
         "some_field_facet" => {},
         "another_field_facet" => {},
-        "a_facet_field" => {},
-        })
-      expect { |b| @config.add_facet_field "*_facet", &b }.to yield_control.twice
+        "a_facet_field" => {}
+      )
+      expect { |b| config.add_facet_field "*_facet", &b }.to yield_control.twice
 
-      expect(@config.facet_fields.keys).to eq ["some_field_facet", "another_field_facet"]
+      expect(config.facet_fields.keys).to eq %w[some_field_facet another_field_facet]
     end
 
     describe "if/unless conditions with legacy show parameter" do
       it "is hidden if the if condition is false" do
-        expect(@config.add_facet_field("hidden", if: false).if).to eq false
-        expect(@config.add_facet_field("hidden_with_legacy", if: false, show: true).if).to eq false
+        expect(config.add_facet_field("hidden", if: false).if).to eq false
+        expect(config.add_facet_field("hidden_with_legacy", if: false, show: true).if).to eq false
       end
 
       it "is true if the if condition is true" do
-        expect(@config.add_facet_field("hidden", if: true).if).to eq true
-        expect(@config.add_facet_field("hidden_with_legacy", if: true, show: false).if).to eq true
+        expect(config.add_facet_field("hidden", if: true).if).to eq true
+        expect(config.add_facet_field("hidden_with_legacy", if: true, show: false).if).to eq true
       end
 
       it "is true if the if condition is missing" do
-        expect(@config.add_facet_field("hidden", show: true).if).to eq true
+        expect(config.add_facet_field("hidden", show: true).if).to eq true
       end
     end
   end
-  
+
   describe "add_index_field" do
     it "takes hash form" do
-      @config.add_index_field("title_display", :label => "Title")
-      
-      expect(@config.index_fields["title_display"]).to_not be_nil
-      expect(@config.index_fields["title_display"].label).to eq "Title"
+      config.add_index_field("title_tsim", 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 IndexField param" do
-      @config.add_index_field("title_display", Blacklight::Configuration::IndexField.new(:field => "title_display", :label => "Title"))
-      
-      expect(@config.index_fields["title_display"]).to_not be_nil
-      expect(@config.index_fields["title_display"].label).to eq "Title"
+      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_display") do |field|        
+      config.add_index_field("title_tsim") do |field|
         field.label = "Title"
       end
-      expect(@config.index_fields["title_display"]).to_not be_nil
-      expect(@config.index_fields["title_display"].label).to eq "Title"
+      expect(config.index_fields["title_tsim"]).not_to be_nil
+      expect(config.index_fields["title_tsim"].label).to eq "Title"
     end
-    
+
     it "creates default label from titleized field" do
-      @config.add_index_field("title_display")
-      
-      expect(@config.index_fields["title_display"].label).to eq "Title Display"
+      config.add_index_field("title_tsim")
+
+      expect(config.index_fields["title_tsim"].label).to eq "Title Tsim"
     end
-    
+
     it "raises on nil solr field name" do
-      expect { @config.add_index_field(nil) }.to raise_error ArgumentError
+      expect { config.add_index_field(nil) }.to raise_error ArgumentError
     end
 
     it "takes wild-carded field names and dereference them to solr fields" do
-      allow(@config).to receive_messages(luke_fields: { 
-        "some_field_display" => {}, 
+      allow(config).to receive(:reflected_fields).and_return(
+        "some_field_display" => {},
         "another_field_display" => {},
-        "a_facet_field" => {},
-        })
-      @config.add_index_field "*_display"
+        "a_facet_field" => {}
+      )
+      config.add_index_field "*_display"
 
-      expect(@config.index_fields.keys).to eq ["some_field_display", "another_field_display"]
+      expect(config.index_fields.keys).to eq %w[some_field_display another_field_display]
     end
 
     it "queries solr and get live values for match fields", integration: true do
-      @config.add_index_field match: /title.+display/
-      expect(@config.index_fields.keys).to include "subtitle_display", "subtitle_vern_display", "title_display", "title_vern_display"
+      config.add_index_field match: /title.+sim/
+      expect(config.index_fields.keys).to include "subtitle_tsim", "subtitle_vern_ssim", "title_tsim", "title_vern_ssim"
     end
   end
-  
+
   describe "add_show_field" do
     it "takes hash form" do
-      @config.add_show_field("title_display", :label => "Title")
-      
-      expect(@config.show_fields["title_display"]).to_not be_nil
-      expect(@config.show_fields["title_display"].label).to eq "Title"
+      config.add_show_field("title_tsim", 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 ShowField argument" do
-      @config.add_show_field("title_display", Blacklight::Configuration::ShowField.new(:field => "title_display", :label => "Title"))
-      
-      expect(@config.show_fields["title_display"]).to_not be_nil
-      expect(@config.show_fields["title_display"].label).to eq  "Title"
+      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_display") do |f|        
+      config.add_show_field("title_tsim") do |f|
         f.label = "Title"
       end
-      
-      expect(@config.show_fields["title_display"]).to_not be_nil
-      expect(@config.show_fields["title_display"].label).to eq  "Title"
+
+      expect(config.show_fields["title_tsim"]).not_to be_nil
+      expect(config.show_fields["title_tsim"].label).to eq "Title"
     end
-    
+
     it "creates default label humanized from field" do
-      @config.add_show_field("my_custom_field")
-      
-      expect(@config.show_fields["my_custom_field"].label).to eq  "My Custom Field"
+      config.add_show_field("my_custom_field")
+
+      expect(config.show_fields["my_custom_field"].label).to eq "My Custom Field"
     end
-    
+
     it "raises on nil solr field name" do
-      expect { @config.add_show_field(nil) }.to raise_error ArgumentError
+      expect { config.add_show_field(nil) }.to raise_error ArgumentError
     end
-       
+
     it "takes wild-carded field names and dereference them to solr fields" do
-      allow(@config).to receive_messages(luke_fields: { 
-        "some_field_display" => {}, 
+      allow(config).to receive(:reflected_fields).and_return(
+        "some_field_display" => {},
         "another_field_display" => {},
-        "a_facet_field" => {},
-        })
-      @config.add_show_field "*_display"
+        "a_facet_field" => {}
+      )
+      config.add_show_field "*_display"
 
-      expect(@config.show_fields.keys).to eq ["some_field_display", "another_field_display"]
+      expect(config.show_fields.keys).to eq %w[some_field_display another_field_display]
     end
-
   end
-    
-  
+
   describe "add_search_field" do
     it "accepts hash form" do
       c = Blacklight::Configuration.new
-      c.add_search_field(:key => "my_search_key")
-      expect(c.search_fields["my_search_key"]).to_not be_nil
+      c.add_search_field(key: "my_search_key")
+      expect(c.search_fields["my_search_key"]).not_to be_nil
     end
 
     it "accepts two-arg hash form" do
       c = Blacklight::Configuration.new
-      
+
       c.add_search_field("my_search_type",
-          :key => "my_search_type",
-          :solr_parameters => { :qf => "my_field_qf^10" }, 
-          :solr_local_parameters => { :pf=>"$my_field_pf"})
-      
+                         key: "my_search_type",
+                         solr_parameters: { qf: "my_field_qf^10" },
+                         solr_local_parameters: { pf: "$my_field_pf" })
+
       field = c.search_fields["my_search_type"]
-      
-      expect(field).to_not be_nil
-      
-      
-      expect(field.solr_parameters).to_not be_nil
-      expect(field.solr_local_parameters).to_not be_nil  
-      
-      
-    end
-    
+
+      expect(field).not_to be_nil
+
+      expect(field.solr_parameters).not_to be_nil
+      expect(field.solr_local_parameters).not_to be_nil
+    end
+
     it "accepts block form" do
       c = Blacklight::Configuration.new
-      
-      c.add_search_field("some_field") do |field|        
-        field.solr_parameters = {:qf => "solr_field^10"}
-        field.solr_local_parameters = {:pf => "$some_field_pf"}
+
+      c.add_search_field("some_field") do |field|
+        field.solr_parameters = { qf: "solr_field^10" }
+        field.solr_local_parameters = { pf: "$some_field_pf" }
       end
-      
+
       f = c.search_fields["some_field"]
-      
-      expect(f).to_not be_nil
-      expect(f.solr_parameters).to_not be_nil
-      expect(f.solr_local_parameters).to_not be_nil      
+
+      expect(f).not_to be_nil
+      expect(f.solr_parameters).not_to be_nil
+      expect(f.solr_local_parameters).not_to be_nil
     end
-    
+
     it "accepts SearchField object" do
       c = Blacklight::Configuration.new
-      
-      f = Blacklight::Configuration::SearchField.new( :foo => "bar")
-      
+
+      f = Blacklight::Configuration::SearchField.new(foo: "bar")
+
       c.add_search_field("foo", f)
-      
-      expect(c.search_fields["foo"]).to_not be_nil
+
+      expect(c.search_fields["foo"]).not_to be_nil
     end
-    
+
     it "raises on nil key" do
-      expect {@config.add_search_field(nil, :foo => "bar")}.to raise_error ArgumentError
+      expect { config.add_search_field(nil, foo: "bar") }.to raise_error ArgumentError
     end
-    
+
     it "creates default label from titleized field key" do
-      @config.add_search_field("author_name")
-      
-      expect(@config.search_fields["author_name"].label).to eq "Author Name"
+      config.add_search_field("author_name")
+
+      expect(config.search_fields["author_name"].label).to eq "Author Name"
     end
 
     describe "if/unless conditions with legacy include_in_simple_search" do
       it "is hidden if the if condition is false" do
-        expect(@config.add_search_field("hidden", if: false).if).to eq false
-        expect(@config.add_search_field("hidden_with_legacy", if: false, include_in_simple_search: true).if).to eq false
+        expect(config.add_search_field("hidden", if: false).if).to eq false
+        expect(config.add_search_field("hidden_with_legacy", if: false, include_in_simple_search: true).if).to eq false
       end
 
       it "is true if the if condition is true" do
-        expect(@config.add_search_field("hidden", if: true).if).to eq true
-        expect(@config.add_search_field("hidden_with_legacy", if: true, include_in_simple_search: false).if).to eq true
+        expect(config.add_search_field("hidden", if: true).if).to eq true
+        expect(config.add_search_field("hidden_with_legacy", if: true, include_in_simple_search: false).if).to eq true
       end
 
       it "is true if the if condition is missing" do
-        expect(@config.add_search_field("hidden", include_in_simple_search: true).if).to eq true
+        expect(config.add_search_field("hidden", include_in_simple_search: true).if).to eq true
       end
     end
   end
-  
+
   describe "add_sort_field" do
     it "takes a hash" do
       c = Blacklight::Configuration.new
-      c.add_sort_field(:key => "my_sort_key", :sort => "score desc")
-      expect(c.sort_fields["my_sort_key"]).to_not be_nil
+      c.add_sort_field(key: "my_sort_key", sort: "score desc")
+      expect(c.sort_fields["my_sort_key"]).not_to be_nil
     end
 
     it "takes a two-arg form with a hash" do
-      @config.add_sort_field("score desc, pub_date_sort desc, title_sort asc", :label => "relevance") 
-
-      
-      expect(@config.sort_fields.values.find{|f| f.label == "relevance"}).to_not be_nil
+      config.add_sort_field("score desc, pub_date_si desc, title_si asc", label: "relevance")
+      expect(config.sort_fields.values.find { |f| f.label == "relevance" }).not_to be_nil
     end
-    
+
     it "takes a SortField object" do
-      @config.add_sort_field(Blacklight::Configuration::SortField.new(:label => "relevance", :sort => "score desc, pub_date_sort desc, title_sort asc"
-))     
-      expect(@config.sort_fields.values.find{|f| f.label == "relevance"}).to_not be_nil
+      config.add_sort_field(
+        Blacklight::Configuration::SortField.new(label: "relevance",
+                                                 sort: "score desc, pub_date_sort desc, title_sort asc")
+      )
+      expect(config.sort_fields.values.find { |f| f.label == "relevance" }).not_to be_nil
     end
-    
+
     it "takes block form" do
-      @config.add_sort_field do |field|
+      config.add_sort_field do |field|
         field.label = "relevance"
-        field.sort = "score desc, pub_date_sort desc, title_sort asc"
+        field.sort = "score desc, pub_date_si desc, title_si asc"
       end
-      
-      expect(@config.sort_fields.values.find{|f| f.label == "relevance"}).to_not be_nil
 
+      expect(config.sort_fields.values.find { |f| f.label == "relevance" }).not_to be_nil
     end
   end
-  
+
   describe "#default_search_field" do
     it "uses the field with a :default key" do
-      @config.add_search_field('search_field_1')
-      @config.add_search_field('search_field_2', :default => true)
+      config.add_search_field('search_field_1')
+      config.add_search_field('search_field_2', default: true)
 
-      expect(@config.default_search_field.key).to eq 'search_field_2'
+      expect(config.default_search_field.key).to eq 'search_field_2'
     end
   end
 
   describe "#facet_paginator_class" do
     it "defaults to Blacklight::Solr::FacetPaginator" do
-      expect(@config.facet_paginator_class).to eq Blacklight::Solr::FacetPaginator
+      expect(config.facet_paginator_class).to eq Blacklight::Solr::FacetPaginator
     end
   end
 end