blacklight 3.1.2 → 3.2.0pre1

data/test_support/spec/controllers/folder_controller_spec.rb

@@ -6,6 +6,12 @@ describe FolderController do
   end
   
   it "should add items to list" do
+    @mock_response = mock()
+    @mock_document = mock()
+    @mock_document2 = mock()
+    @mock_document.stub(:export_formats => {})
+    controller.stub(:get_solr_response_for_field_values => [@mock_response, [@mock_document, @mock_document2]])
+
     get :update, :id =>"77826928"
     session[:folder_document_ids].length.should == 1
     get :update, :id => "94120425"
@@ -13,7 +19,7 @@ describe FolderController do
     session[:folder_document_ids].should include("77826928")
     get :index
     assigns[:documents].length.should == 2
-    assigns[:documents].first.should be_instance_of(SolrDocument)
+    assigns[:documents].first.should == @mock_document
   end
   it "should delete an item from list" do
     get :update, :id =>"77826928"

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -62,10 +62,35 @@ def exportable_record
   </datafield>
 </record>"
 end
+
 describe BlacklightHelper do
   include ERB::Util
   include BlacklightHelper
-  
+  def blacklight_config
+    @config ||= Blacklight::Configuration.new.configure do |config| 
+      config.show.html_title = "title_display"
+      config.show.heading = "title_display"
+      config.show.display_type = 'format'
+      
+      config.index.show_link = 'title_display'
+      config.index.record_display_type = 'format'   
+    end
+    
+    #CatalogController.blacklight_config
+    #@config ||= {:show => {:html_title => 'title_display', :heading => 'title_display', :display_type => 'format'}, :index => { :show_link => 'title_display', :record_display_type => 'format' } }   
+  end
+
+  describe "#application_name", :test => true do
+    it "should use the Rails application config application_name if available" do
+      Rails.application.config.stub(:application_name => 'asdf')
+      Rails.application.config.should_receive(:respond_to?).with(:application_name).and_return(true)
+      application_name.should == 'asdf'
+    end
+    it "should default to 'Blacklight'" do
+      application_name.should == "Blacklight"
+    end
+  end
+
   describe "link_back_to_catalog" do
     before(:all) do
       @query_params = {:q => "query", :f => "facets", :per_page => "10", :page => "2"}
@@ -80,18 +105,6 @@ describe BlacklightHelper do
     end
   end
   
-  describe "link_to_with_data" do
-    it "should generate proper tag for :put and with single :data key and value" do
-      assert_dom_equal(
-        "<a href='http://www.example.com' onclick=\"var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;if(event.metaKey || event.ctrlKey){f.target = '_blank';};var d = document.createElement('input'); d.setAttribute('type', 'hidden'); d.setAttribute('name', 'key'); d.setAttribute('value', 'value'); f.appendChild(d);var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'put'); f.appendChild(m);f.submit();return false;\">Foo</a>",
-        link_to_with_data("Foo", "http://www.example.com", :method => :put, :data => {:key => "value"})
-      )
-    end
-    it "should be html_safe" do
-      link_to_with_data("Foo", "http://www.example.com", :method => :put, :data => {:key => "value"}).html_safe?.should == true
-    end
-  end
-  
   describe "link_to_query" do
     it "should build a link tag to catalog using query string (no other params)" do
       query = "brilliant"
@@ -122,13 +135,13 @@ describe BlacklightHelper do
     end
   end
 
-  describe "search_as_hidden_fields" do
+  describe "search_as_hidden_fields", :asdf => true do
     def params
-      {:q => "query", :sort => "sort", :per_page => "20", :search_field => "search_field", :page => 100, :arbitrary_key => "arbitrary_value", :f => {"field" => ["value1", "value2"]}, :controller => "catalog", :action => "index", :commit => "search"}
+      {:q => "query", :sort => "sort", :per_page => "20", :search_field => "search_field", :page => 100, :arbitrary_key => "arbitrary_value", :f => {"field" => ["value1", "value2"], "other_field" => ['asdf']}, :controller => "catalog", :action => "index", :commit => "search"}
     end
     describe "for default arguments" do
       it "should default to omitting :page" do
-        search_as_hidden_fields.should have_selector("input[type='hidden']", :count =>7)
+        search_as_hidden_fields.should have_selector("input[type='hidden']", :count =>8)
         search_as_hidden_fields.should_not have_selector("input[name='page']") 
       end
       it "should not return blacklisted elements" do
@@ -145,6 +158,12 @@ describe BlacklightHelper do
 
            generated.should have_selector("input[name=page]")
         end
+
+        it "should support hash-based deleting" do
+           generated = search_as_hidden_fields(:omit_keys => [{:f => 'field' }])
+           generated.should have_selector("input[name='f[other_field][]']")
+           generated.should_not have_selector("input[name='f[field][]']")
+        end
       end
     end
  end
@@ -169,8 +188,9 @@ describe BlacklightHelper do
    end
    
    describe "document_heading" do
+
      it "should consist of the show heading field when available" do
-      @document = SolrDocument.new(Blacklight.config[:show][:heading] => "A Fake Document")
+      @document = SolrDocument.new('title_display' => "A Fake Document")
 
       document_heading.should == "A Fake Document"
      end
@@ -183,7 +203,7 @@ describe BlacklightHelper do
 
    describe "render_document_heading" do
      it "should consist of #document_heading wrapped in a <h1>" do
-      @document = SolrDocument.new(Blacklight.config[:show][:heading] => "A Fake Document")
+      @document = SolrDocument.new('title_display' => "A Fake Document")
 
       render_document_heading.should have_selector("h1", :content => document_heading, :count => 1)
       render_document_heading.html_safe?.should == true
@@ -223,13 +243,7 @@ describe BlacklightHelper do
       @document = SolrDocument.new(data)
       link_to_document(@document, { :label => "title_display" }).should have_selector("a", :content => 'title_display', :count => 1)
      end
-     it "should properly javascript escape the label value" do
-       data = {'id'=>'123456','title_display'=>['654321'] }
-       @document = SolrDocument.new(data)
-       link = link_to_document(@document, { :label => "Apple's Oranges" })
-       link.should match(/'Apple\\'s Oranges'/)
-       link.should_not match(/'Apple's Oranges'/)
-     end
+   
      it "should accept and return a Proc" do
       data = {'id'=>'123456','title_display'=>['654321'] }
       @document = SolrDocument.new(data)
@@ -246,6 +260,12 @@ describe BlacklightHelper do
       @document = SolrDocument.new(data)
       link_to_document(@document, { :label => :title_display }).html_safe?.should == true
      end
+
+     it "should convert the counter parameter into a data- attribute" do
+      data = {'id'=>'123456','title_display'=>['654321']}
+      @document = SolrDocument.new(data)
+      link_to_document(@document, { :label => :title_display, :counter => 5  }).should =~ /data-counter="5"/
+     end
    end
 
 
@@ -301,13 +321,4 @@ describe BlacklightHelper do
     
   end
   
-  describe "convenience methods" do
-    it "should handle the case where we don't have a spellmax set in the config" do
-      spell_check_max.should == 5
-      sm = Blacklight.config[:spell_max]
-      Blacklight.config[:spell_max] = nil
-      spell_check_max.should == 0
-      Blacklight.config[:spell_max] = sm
-    end
-  end
 end

data/test_support/spec/helpers/facets_helper_spec.rb

@@ -1,6 +1,74 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe FacetsHelper do
 
+  describe "render_facet_partials" do
+    it "should only render facets with items" do
+      a = mock(:items => [1,2])
+      b = mock(:items => ['b','c'])
+      empty = mock(:items => [])
+
+      fields = [a,b,empty]
+
+      helper.should_receive(:render_facet_limit).with(a, {})
+      helper.should_receive(:render_facet_limit).with(b, {})
+      helper.should_not_receive(:render_facet_limit).with(empty, {})
+      helper.render_facet_partials fields
+    end
+
+    it "should look up facet fields in the response when given strings or symbols" do
+
+      a = mock(:name => 'a', :items => [1,2])
+
+      @response = mock()
+      @response.should_receive(:facet_by_field_name).with('a') { a }
+      helper.should_receive(:render_facet_limit).with(a, {})
+
+      helper.render_facet_partials ['a']
+    end
+  end
+
+  describe "render_facet_limit" do
+    before do
+
+      @config = Blacklight::Configuration.new do |config|
+        config.add_facet_field 'basic_field'
+        config.add_facet_field 'my_facet_field_with_custom_partial', :partial => 'custom_facet_partial'
+      end
+
+      helper.stub(:blacklight_config => @config)
+      @response = mock()
+    end
+
+    it "should set basic local variables" do
+      @mock_facet = mock(:name => 'basic_field')
+      helper.should_receive(:render).with(hash_including(:partial => 'facet_limit', 
+                                                         :locals => { 
+                                                            :solr_field => 'basic_field', 
+                                                            :facet_field => helper.blacklight_config.facet_fields['basic_field'],
+                                                            :display_facet => @mock_facet  }
+                                                        ))
+      helper.render_facet_limit(@mock_facet)
+    end
+
+    it "should send a deprecation warning if the method is called using the old-style signature" do
+      helper.should_receive(:render_facet_partials).with(['asdf'])
+      $stderr.should_receive(:puts)
+      helper.render_facet_limit('asdf')
+    end
+
+    it "should render a facet _not_ declared in the configuration" do
+      @mock_facet = mock(:name => 'asdf')
+      helper.should_receive(:render).with(hash_including(:partial => 'facet_limit'))
+      helper.render_facet_limit(@mock_facet)
+    end
+
+    it "should get the partial name from the configuration" do
+      @mock_facet = mock(:name => 'my_facet_field_with_custom_partial')
+      helper.should_receive(:render).with(hash_including(:partial => 'custom_facet_partial'))
+      helper.render_facet_limit(@mock_facet)
+    end 
+  end
+
   describe "add_facet_params" do
     before do
       @params_no_existing_facet = {:q => "query", :search_field => "search_field", :per_page => "50"}

data/test_support/spec/helpers/html_head_helper_spec.rb

@@ -12,6 +12,7 @@ describe HtmlHeadHelper do
     end
     it "should include script tags specified in controller#javascript_includes" do
       html = helper.render_js_includes
+
       if use_asset_pipeline?
         html.should have_selector("script[src='/assets/some_js.js'][type='text/javascript']")
         html.should have_selector("script[src='/assets/other_js.js'][type='text/javascript']")
@@ -35,6 +36,7 @@ describe HtmlHeadHelper do
     end
     it "should render stylesheets specified in controller #stylesheet_links" do
       html = helper.render_stylesheet_includes      
+
       if use_asset_pipeline?
         html.should have_selector("link[href='/assets/my_stylesheet.css'][rel='stylesheet'][type='text/css']")
         html.should have_selector("link[href='/assets/other_stylesheet.css'][rel='stylesheet'][type='text/css']")
@@ -42,6 +44,7 @@ describe HtmlHeadHelper do
         html.should have_selector("link[href='/stylesheets/my_stylesheet.css'][rel='stylesheet'][type='text/css']")
         html.should have_selector("link[href='/stylesheets/other_stylesheet.css'][rel='stylesheet'][type='text/css']")
       end
+
       html.html_safe?.should == true
     end
   end
@@ -72,6 +75,40 @@ describe HtmlHeadHelper do
       end
     end
     describe "with methods defined" do
+      helper do 
+        def javascript_includes
+          [["my_js"]]
+        end
+        def stylesheet_links
+          [["my_css"]]
+        end
+        def extra_head_content
+          [
+            "<madeup_tag></madeup_tag>",
+            '<link rel="rel" type="type" href="href">' 
+          ]
+        end
+      end
+      before(:each) do
+        helper.should_receive(:content_for).with(:head).and_return("<meta keywords=\"foo bar\"/>".html_safe)
+        @output = helper.render_head_content
+      end
+      it "should include extra_head_content" do
+        @output.should have_selector("madeup_tag")
+        @output.should have_selector("link[rel=rel][type=type][href=href]")
+      end
+      it "should include render_javascript_includes" do
+        @output.should have_selector("script[src='/assets/my_js.js'][type='text/javascript']")
+        #@output.index( render_js_includes ).should_not be_nil
+      end
+      it "should include render_stylesheet_links" do
+        @output.should have_selector("link[href='/assets/my_css.css'][type='text/css']")
+        #@output.index( render_stylesheet_includes ).should_not be_nil
+      end
+      it "should include content_for :head" do
+        @output.should have_selector("meta[keywords]")
+      end
+
       it "should include all head content" do
         helper.should_receive(:render_extra_head_content).and_return("".html_safe)
         helper.should_receive(:render_js_includes).and_return("".html_safe)

data/test_support/spec/helpers/{render_constraints_helper_spec.rb → search_history_constraints_helper_spec.rb}

@@ -1,13 +1,29 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-# This is NOT currently spec'ing render_constraints_* methods, becuase
-# inflexibility in rspec makes it really hard to do so effectively. It would be
-# nice, the specs that are there for render_search_to_s could be a model. 
-#
-# We ARE spec'ing render_search_to_s* versions, which is feasible since they
-# don't call any template partials. 
-describe RenderConstraintsHelper do
+describe SearchHistoryConstraintsHelper do
+
+  before(:all) do
+    @config = Blacklight::Configuration.from_legacy_configuration({ 
+      :default_search_field => {
+       :key => 'default_search_field',
+       :display_label => "Default"
+     },
+     :facet => {
+       :field_names => [
+         'some_facet',
+         'other_facet'
+        ],
+        :labels => { 
+          'some_facet' => 'Some',
+          'other_facet' => 'Other'
+        },
+        :limits => {
+        }
+      }
+    })
+  end
+
 
   describe "render_search_to_s_*" do
     describe "render_search_to_s_element" do
@@ -49,6 +65,9 @@ describe RenderConstraintsHelper do
         @params = {:q => "history", :f => {"some_facet" => ["value1", "value1"],  "other_facet" => ["other1"]}}        
       end
       it "should call lesser methods" do
+        helper.stub!(:blacklight_config).and_return(@config)
+        helper.stub!(:default_search_field).and_return(Blacklight::Configuration::SearchField.new(:key => 'default_search_field', :display_label => 'Default'))
+        helper.should_receive(:label_for_search_field).with(nil).any_number_of_times.and_return('')
         # API hooks expect this to be so
         response = helper.render_search_to_s(@params)
 

data/test_support/spec/lib/blacklight_configurable_spec.rb

@@ -0,0 +1,92 @@
+#ste -*- encoding : utf-8 -*-
+# -*- coding: UTF-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Blacklight::Configurable" do
+
+  describe "inheritence" do
+    before(:all) do
+      module TestCaseInheritence
+        class Parent
+          include Blacklight::Configurable
+
+          blacklight_config.configure do |config|
+            config.list = [1,2,3]
+          end
+        end
+
+        class Child < Parent
+        end
+      end
+    end
+    it "should inherit the configuration when subclassed" do            
+      TestCaseInheritence::Child.blacklight_config.list.should include(1,2,3)
+    end
+    
+    it "inherited version should be a deep copy, not original" do      
+      TestCaseInheritence::Child.blacklight_config.should_not  be(TestCaseInheritence::Parent.blacklight_config)
+    
+      TestCaseInheritence::Child.blacklight_config.list << "child_only"
+
+
+      TestCaseInheritence::Child.blacklight_config.list.should include("child_only")      
+      TestCaseInheritence::Parent.blacklight_config.list.should_not include("child_only")
+    end    
+  end
+
+  describe "default configuration" do
+    before(:each) do
+      Blacklight::Configurable.default_configuration = nil
+    end
+
+    after do
+      Blacklight::Configurable.default_configuration = nil
+    end
+
+    it "should load an empty configuration" do
+      a = Class.new
+      a.send(:include, Blacklight::Configurable)
+
+      a.blacklight_config.default_solr_params.should be_empty
+    end
+
+    it "should allow the user to provide a default configuration" do
+      a = Class.new
+
+      Blacklight::Configurable.default_configuration = Blacklight::Configuration.new :a => 1
+
+      a.send(:include, Blacklight::Configurable)
+      a.blacklight_config.a.should == 1
+    end
+    
+    it "has configure_blacklight convenience method" do
+      klass = Class.new
+      klass.send(:include, Blacklight::Configurable)
+      
+      klass.configure_blacklight do |config|
+        config.my_key = 'value'
+      end 
+      
+      klass.blacklight_config.my_key.should == 'value'
+    end
+    
+    it "allows instance to set it's own config seperate from class" do
+      # this is built into class_attribute; we spec it both to document it,
+      # and to ensure we preserve this feature if we change implementation
+      # to not use class_attribute
+      klass = Class.new
+      klass.send(:include, Blacklight::Configurable)
+      klass.blacklight_config.foo = "bar"
+      
+      instance = klass.new
+      
+      instance.blacklight_config = Blacklight::Configuration.new
+      
+      instance.blacklight_config.should_not == klass.blacklight_config
+      instance.blacklight_config.foo.should be_nil
+      klass.blacklight_config.foo.should == "bar"
+    end
+    
+  end
+end
+  

data/test_support/spec/lib/blacklight_configuration_spec.rb

@@ -0,0 +1,295 @@
+#ste -*- encoding : utf-8 -*-
+# -*- coding: UTF-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Blacklight::Configuration" do
+  
+  before(:each) do
+    @config = Blacklight::Configuration.new
+  end
+
+  it "should support arbitrary configuration values" do
+    @config.a = 1
+
+    @config.a.should == 1
+    @config[:a].should == 1
+  end
+
+  describe "initialization" do
+    it "should be an OpenStructWithHashAccess" do
+      @config.should be_a_kind_of Blacklight::OpenStructWithHashAccess
+    end
+
+    it "should accept a block for configuration" do
+      config = Blacklight::Configuration.new(:a => 1) { |c| c.a = 2 }
+
+      config.a.should == 2
+
+      config.configure { |c| c.a = 3 }
+
+      config.a.should == 3
+    end
+  end
+
+  describe "defaults" do
+    it "should have a hash of default rsolr query parameters" do
+      @config.default_solr_params.should be_a_kind_of Hash
+    end
+    it "should have openstruct values for show and index parameters" do
+      @config.show.should be_a_kind_of OpenStruct
+      @config.index.should be_a_kind_of OpenStruct
+    end
+
+    it "should have ordered hashes for field configuration" do
+      @config.facet_fields.should be_a_kind_of ActiveSupport::OrderedHash
+      @config.index_fields.should be_a_kind_of ActiveSupport::OrderedHash
+      @config.show_fields.should be_a_kind_of ActiveSupport::OrderedHash
+      @config.search_fields.should be_a_kind_of ActiveSupport::OrderedHash
+      @config.show_fields.should be_a_kind_of ActiveSupport::OrderedHash
+      @config.search_fields.should be_a_kind_of ActiveSupport::OrderedHash
+      @config.sort_fields.should be_a_kind_of ActiveSupport::OrderedHash
+    end
+  end
+
+  describe "spell_max" do
+    it "should default to 5" do
+      Blacklight::Configuration.new.spell_max.should == 5
+    end
+    
+    it "should accept config'd value" do
+      Blacklight::Configuration.new(:spell_max => 10).spell_max.should == 10
+    end
+  end
+
+  describe "inheritable_copy" do
+    it "should provide 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
+
+      @config.a.should be_nil
+      @config.facet_fields.should_not include(@mock_facet)
+    end
+  end
+  
+  describe "add_facet_field" do
+    it "should accept field name and hash form arg" do
+      @config.add_facet_field('format',  :label => "Format", :limit => true)
+      
+      @config.facet_fields["format"].should_not be_nil
+      @config.facet_fields["format"]["label"].should == "Format"
+      @config.facet_fields["format"]["limit"].should == true
+    end
+
+    it "should accept FacetField obj arg" do
+      @config.add_facet_field("format", Blacklight::Configuration::FacetField.new( :label => "Format"))
+      
+      @config.facet_fields["format"].should_not be_nil
+      @config.facet_fields["format"]["label"].should == "Format"
+    end
+    
+    it "should accept field name and block form" do
+      @config.add_facet_field("format") do |facet|        
+        facet.label = "Format"
+        facet.limit = true
+      end
+      
+      @config.facet_fields["format"].should_not be_nil
+      @config.facet_fields["format"].limit.should == true
+    end
+
+    it "should accept block form" do
+      @config.add_facet_field do |facet|
+        facet.field = "format"
+        facet.label = "Format"
+      end
+
+      @config.facet_fields['format'].should_not be_nil
+    end
+
+    it "should accept a configuration hash" do
+      @config.add_facet_field :field => 'format', :label => 'Format'
+      @config.facet_fields['format'].should_not be_nil
+    end
+
+    it "should accept array form" do
+      @config.add_facet_field([{ :field => 'format', :label => 'Format'}, { :field => 'publication_date', :label => 'Publication Date' }])
+
+      @config.facet_fields.length.should == 2
+    end
+
+    it "should create default label from titleized solr field" do
+      @config.add_facet_field("publication_date")
+        
+      @config.facet_fields["publication_date"].label.should == "Publication Date"
+    end
+    
+    it "should raise on nil solr field name" do
+      lambda { @config.add_facet_field(nil) }.should raise_error ArgumentError
+    end
+    
+  end
+  
+  describe "add_index_field" do
+    it "takes hash form" do
+      @config.add_index_field("title_display", :label => "Title")
+      
+      @config.index_fields["title_display"].should_not be_nil
+      @config.index_fields["title_display"].label.should == "Title"
+    end
+    it "takes IndexField param" do
+      @config.add_index_field("title_display", Blacklight::Configuration::IndexField.new(:field => "title_display", :label => "Title"))
+      
+      @config.index_fields["title_display"].should_not be_nil
+      @config.index_fields["title_display"].label.should == "Title"
+    end
+    it "takes block form" do
+      @config.add_index_field("title_display") do |field|        
+        field.label = "Title"
+      end
+      @config.index_fields["title_display"].should_not be_nil
+      @config.index_fields["title_display"].label.should == "Title"
+    end
+    
+    it "creates default label from titleized field" do
+      @config.add_index_field("title_display")
+      
+      @config.index_fields["title_display"].label.should == "Title Display"
+    end
+    
+    it "should raise on nil solr field name" do
+      lambda { @config.add_index_field(nil) }.should raise_error ArgumentError
+    end
+
+  end
+  
+  describe "add_show_field" do
+    it "takes hash form" do
+      @config.add_show_field("title_display", :label => "Title")
+      
+      @config.show_fields["title_display"].should_not be_nil
+      @config.show_fields["title_display"].label.should == "Title"
+    end
+    it "takes ShowField argument" do
+      @config.add_show_field("title_display", Blacklight::Configuration::ShowField.new(:field => "title_display", :label => "Title"))
+      
+      @config.show_fields["title_display"].should_not be_nil
+      @config.show_fields["title_display"].label.should == "Title"
+    end
+    it "takes block form" do
+      @config.add_show_field("title_display") do |f|        
+        f.label = "Title"
+      end
+      
+      @config.show_fields["title_display"].should_not be_nil
+      @config.show_fields["title_display"].label.should == "Title"
+    end
+    
+    it "creates default label humanized from field" do
+      @config.add_show_field("my_custom_field")
+      
+      @config.show_fields["my_custom_field"].label.should == "My Custom Field"
+    end
+    
+    it "should raise on nil solr field name" do
+      lambda { @config.add_show_field(nil) }.should raise_error ArgumentError
+    end
+       
+  end
+    
+  
+  describe "add_search_field" do
+    it "should accept 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"})
+      
+      field = c.search_fields["my_search_type"]
+      
+      field.should_not be_nil
+      
+      
+      field.solr_parameters.should_not be_nil
+      field.solr_local_parameters.should_not be_nil  
+      
+      
+    end
+    
+    it "should accept 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"}
+      end
+      
+      f = c.search_fields["some_field"]
+      
+      f.should_not be_nil
+      f.solr_parameters.should_not be_nil
+      f.solr_local_parameters.should_not be_nil      
+    end
+    
+    it "should accept SearchField object" do
+      c = Blacklight::Configuration.new
+      
+      f = Blacklight::Configuration::SearchField.new( :foo => "bar")
+      
+      c.add_search_field("foo", f)
+      
+      c.search_fields["foo"].should_not be_nil
+    end
+    
+    it "should raise on nil key" do
+      lambda {@config.add_search_field(nil, :foo => "bar")}.should raise_error ArgumentError
+    end
+    
+    it "creates default label from titleized field key" do
+      @config.add_search_field("author_name")
+      
+      @config.search_fields["author_name"].label.should == "Author Name"
+    end
+                
+        
+  end
+  
+  describe "add_sort_field" do
+    it "should take a hash" do
+      @config.add_sort_field("score desc, pub_date_sort desc, title_sort asc", :label => "relevance") 
+
+      
+      @config.sort_fields.values.find{|f| f.label == "relevance"}.should_not be_nil
+    end
+    
+    it "should take a SortField object" do
+      @config.add_sort_field(Blacklight::Configuration::SortField.new(:label => "relevance", :sort => "score desc, pub_date_sort desc, title_sort asc"
+))     
+      @config.sort_fields.values.find{|f| f.label == "relevance"}.should_not be_nil
+    end
+    
+    it "should take block form" do
+      @config.add_sort_field do |field|
+        field.label = "relevance"
+        field.sort = "score desc, pub_date_sort desc, title_sort asc"
+      end
+      
+      @config.sort_fields.values.find{|f| f.label == "relevance"}.should_not be_nil
+
+    end
+  end
+  
+  describe "#default_search_field" do
+    it "should use the field with a :default key" do
+      @config.add_search_field('search_field_1')
+      @config.add_search_field('search_field_2', :default => true)
+
+      @config.default_search_field.key.should == 'search_field_2'
+    end
+  end
+  
+end