blacklight 3.1.2 → 3.2.0pre1

data/test_support/spec/lib/tasks/solr_marc_task_spec.rb

@@ -50,7 +50,7 @@ describe "solr:marc:*" do
         
         java_cmd.should_not be_nil
         java_cmd.should match "java -Xmx512m"
-        java_cmd.should match "-jar #{Rails.root}/lib/SolrMarc.jar"
+        java_cmd.should match /-jar .*\/SolrMarc\.jar/
         java_cmd.should match "#{Rails.root}/config/SolrMarc/config-test.properties dummy.mrc"
         java_cmd.should match "-Dsolr.hosturl=http://127.0.0.1:[0-9]{4}/solr"
       end

data/test_support/spec/lib/utils_spec.rb

@@ -0,0 +1,58 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+describe 'Blacklight::Utils' do
+  describe Blacklight::OpenStructWithHashAccess do
+    it "should provide hash-like accessors for OpenStruct data" do
+      a = Blacklight::OpenStructWithHashAccess.new :foo => :bar, :baz => 1
+
+      a[:foo].should == :bar
+      a[:baz].should == 1
+      a[:asdf].should be_nil
+    end
+
+    it "should provide hash-like writers for OpenStruct data" do
+      a = Blacklight::OpenStructWithHashAccess.new :foo => :bar, :baz => 1
+
+      a[:asdf] = 'qwerty'
+      a.asdf.should == 'qwerty'
+
+    end
+    
+    it "should treat symbols and strings interchangeably in hash access" do
+      h = Blacklight::OpenStructWithHashAccess.new
+      
+      h["string"] = "value"
+      h[:string].should == "value"
+      h.string.should == "value"
+      
+      h[:symbol] = "value"
+      h["symbol"].should == "value"
+      h.symbol.should == "value"      
+    end
+
+    describe "internal hash table" do
+      before do
+        @h = Blacklight::OpenStructWithHashAccess.new
+
+        @h[:a] = 1
+        @h[:b] = 2
+
+
+      end
+      it "should expose the internal hash table" do
+        @h.to_h.should be_a_kind_of(Hash)
+        @h.to_h[:a].should == 1
+      end
+
+      it "should expose keys" do
+        @h.keys.should include(:a, :b)
+      end
+
+      it "should expose merge" do
+        @h.merge(:a => 'a')[:a].should == 'a'
+      end
+
+    end
+  end
+end

data/test_support/spec/models/solr_docment_spec.rb

@@ -60,6 +60,10 @@ end
     end
     
     describe "access methods" do
+
+      it "should have the right value for title_display" do
+        @solrdoc[:title_display].should_not be_nil
+      end
       
       it "should have the right value for format" do
         @solrdoc[:format][0].should == 'Book'
@@ -68,14 +72,6 @@ end
       it "should provide the item's solr id" do
         @solrdoc.id.should == '00282214'
       end
-
-      it "should have access methods for all special function fields named in initializer" do
-        # the fields specified in Blacklight.config[:show] that
-        Blacklight.config[:show].each_key do |function| 
-          @solrdoc[Blacklight.config[:show][function]].should_not be_nil
-        end
-      end
-      
     end
     
     describe "ruby marc creation" do

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

@@ -1,183 +1,40 @@
-# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "/catalog/_facets.html.erb" do
-  
-  before(:each) do
-
-    # create mock facets to be retrieved from the response
-    @solr_item00 = stub("solr_item00")
-    @solr_item00.stub!(:value).and_return("val_0_0")
-    @solr_item00.stub!(:hits).and_return("90")
-    @solr_item01 = stub("solr_item01")
-    @solr_item01.stub!(:value).and_return("val_0_1")
-    @solr_item01.stub!(:hits).and_return("91")
-    @facet0 = stub("facet0")
-    @solr_fname0 = Blacklight.config[:facet][:field_names].last
-    @facet0.stub!(:name).and_return(@solr_fname0);
-    @solr_items0 = [@solr_item00, @solr_item01]
-    @facet0.stub!(:items).and_return(@solr_items0);
-
-    @solr_item10 = stub("solr_item10")
-    @solr_item10.stub!(:value).and_return("val_1_0")
-    @solr_item10.stub!(:hits).and_return("10")
-    @solr_item11 = stub("solr_item11")
-    @solr_item11.stub!(:value).and_return("val_1_1")
-    @solr_item11.stub!(:hits).and_return("11")
-    @facet1 = stub("facet1")
-    @solr_fname1 = Blacklight.config[:facet][:field_names][1]
-    @facet1.stub!(:name).and_return(@solr_fname1);
-    @solr_items1 = [@solr_item10, @solr_item11]
-    @facet1.stub!(:items).and_return(@solr_items1);
-
-    @solr_item20 = stub("solr_item20")
-    @solr_item20.stub!(:value).and_return("val_2_0")
-    @solr_item20.stub!(:hits).and_return("20")
-    @solr_item21 = stub("solr_item21")
-    @solr_item21.stub!(:value).and_return("val_2_1")
-    @solr_item21.stub!(:hits).and_return("21")
-    @facet2 = stub("facet2")
-    @solr_fname2 = Blacklight.config[:facet][:field_names][0]
-    @facet2.stub!(:name).and_return(@solr_fname2);
-    @solr_items2 = [@solr_item20, @solr_item21]
-    @facet2.stub!(:items).and_return(@solr_items2);
-
-    @solr_item30 = stub("solr_item30")
-    @solr_item30.stub!(:value).and_return("val_3_0")
-    @solr_item30.stub!(:hits).and_return("30")
-    @solr_item31 = stub("solr_item31")
-    @solr_item31.stub!(:value).and_return("val_3_1")
-    @solr_item31.stub!(:hits).and_return("31")
-    @facet3 = stub("facet3")
-    @solr_fname3 = "solr_field_not_in_initializer_facet"
-    @facet3.stub!(:name).and_return(@solr_fname3);
-    @solr_items3 = [@solr_item30, @solr_item31]
-    @facet3.stub!(:items).and_return(@solr_items3);
-
-    @facets = [@facet0, @facet1, @facet2, @facet3]
-    @response.stub!(:facets).and_return(@facets) 
-
-    # one facet is selected
-    selected_facet = {@solr_fname1 => [@solr_item10.value]}
-    params[:f] = selected_facet
-
-    assigns[:response] = @response    
-
-    render :partial => 'catalog/facets'
-  end
-    
-# There is a problem with link_to and rspec-rails.  See:
-#  http://www.nabble.com/Rails:-View-specs-and-implicit-parameters-in-link_to()-td20011051.html
-# This spec will run cleanly if the implicit routes are added to the plugin
-#  level routes.rb file:   (at the bottom of the file)
-#
-#  map.connect ':controller/:action/:id'
-#  map.connect ':controller/:action/:id.:format'
-
-# If someone can find a better workaround, that would be mega-spiffy.
-#
-# For now, I am commenting out this spec because I'm not sure if adding those
-#  routes will affect anything else.  Similar comments are in routes.rb 
-#   - Naomi  2009-04-19
-
-=begin
-    
-  it "should have div tag with id=facets" do
-    response.should have_selector('div[id=facets]')
-  end
-  
-  it "should not have facets that aren't specified in initializer" do
-    response.should_not include_text(@solr_fname3)
+describe "catalog/_facets.html.erb" do
+  before do
+    @mock_config = Blacklight::Configuration.new
+    view.stub(:blacklight_config => @mock_config)
   end
-
-  it "should skip over facets specified in the initializer that aren't in the response" do
-    solr_field = Blacklight.config[:facet][:field_names][2]
-    label = Blacklight.config[:facet][:labels][solr_field]
-    response.should_not include_text(label)
+  it "should have a header" do
+    view.stub(:render_facet_partials => '')
+    render
+    rendered.should have_selector('h2')
   end
 
-  it "should have all facets specified in initializer that are included in solr response" do
-    solr_field1 = Blacklight.config[:facet][:field_names].last
-    response.should include_text(solr_field1)
-    
-    solr_field2 = Blacklight.config[:facet][:field_names][1]
-    response.should include_text(solr_field2)
+  describe "facet display" do
+    before do
+      @mock_field_1 = mock(:field => 'facet_field_1',
+                       :label => 'label')
+      @mock_display_facet_1 = mock(:name => 'facet_field_1', :items => [mock(:value => 'Value', :hits => 1234)])
+      view.stub(:facet_field_names => [:facet_field_1],
+                :facet_limit_for => 10 )
 
-    solr_field3 = Blacklight.config[:facet][:field_names][0]
-    response.should include_text(solr_field3)
-  end 
+      @response = mock()
+      @response.should_receive(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
 
-  it "should use the labels specified in initializer" do
-    label1 = Blacklight.config[:facet][:labels][@solr_fname0]
-    response.should include_text(label1)
-    
-    label2 = Blacklight.config[:facet][:labels][@solr_fname1]
-    response.should include_text(label2)
-
-    label3 = Blacklight.config[:facet][:labels][@solr_fname2]
-    response.should include_text(label3)
-  end
-  
-# TODO:  check the display order of the facets.  Naomi can't figure this out
-#  it "should display the facets in the order specified in the initializer" do
-#    pending
-#  end
-#
-#    output is:
-#    <div id="facets">
-#      <div>
-#        <h3>Format</h3>
-#        <ul>
-#          <li>Book</li>
-#          <li>Online</li>
-#        </ul>
-#      </div>
-#      <div>
-#        <h3>Language</h3>
-#        <ul>
-#          <li>English</li>
-#          <li>Urdu/li>
-#        </ul>
-#      </div>
-#    </div>
-#
-#   can't test for ordering of h3 contents:
-#     they are not immediate children of  <div id="facets">
-#
-#   perhaps use Cucumber?
+    end 
 
-  
-  it "should have values for displayed facets" do
-    response.should have_selector("li") do
-      with_tag("a", @solr_item00.value)
-      with_tag("a", @solr_item01.value)
-#      with_tag("a", @solr_item10.value)  # this facet is selected
-      with_tag("a", @solr_item11.value)
-      with_tag("a", @solr_item20.value)
-      with_tag("a", @solr_item21.value)
+    it "should have a header" do
+      render
+      rendered.should have_selector('h3')
     end
-  end
 
-  it "should have numbers of hits for displayed facets" do
-    response.should include_text(@solr_item00.hits)
-    response.should include_text(@solr_item01.hits)
-    response.should include_text(@solr_item10.hits)
-    response.should include_text(@solr_item11.hits)
-    response.should include_text(@solr_item20.hits)
-    response.should include_text(@solr_item21.hits)
-  end
-  
-  it "should have links to include facet values in solr query" do
-    response.should have_selector("a", :text => @solr_item00.value)
-    response.should include_text("f%5B"+@solr_fname0 + "%5D%5B%5D=" + @solr_item00.value)
-    response.should have_selector("a", :text => @solr_item11.value)
-    response.should include_text("f%5B"+@solr_fname1 + "%5D%5B%5D=" + @solr_item11.value)
-  end
+    it "should list values" do
+      render
+      rendered.should have_selector('a.label')
+      rendered.should have_selector('.count')
+    end
 
-  it "should display selected facets properly" do
-      response.should have_selector("span[class=selected]", :text => /#{@solr_item10.value}/)
   end
-  
-=end
-  
 end
+

data/test_support/spec/views/catalog/_index_default.erb_spec.rb

@@ -5,15 +5,32 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 #  in catalog INDEX view
 
 describe "/catalog/_index_default.erb" do
-  
   include BlacklightHelper
   include CatalogHelper
-  
+
   before(:each) do
-    @fname_1 = Blacklight.config[:index_fields][:field_names].last
-    @fname_2 = "solr_field_not_in_initializer"
-    @fname_3 = Blacklight.config[:index_fields][:field_names][1]
-    @fname_4 = Blacklight.config[:index_fields][:field_names][0]
+    @config = Blacklight::Configuration.from_legacy_configuration({
+      :show => {
+        :display_type => 'asdf'
+      },
+      :index_fields => {
+        :field_names => [
+          'one_field',
+          'empty_field',
+          'four_field'
+        ],
+        :labels => {
+          'one_field' => 'One:',
+          'empty_field' => 'Three:',
+          'four_field' => 'Four:'
+        }
+      }
+    })
+
+    @fname_1 = "one_field"
+    @fname_2 = "solr_field_not_in_config"
+    @fname_3 = "empty_field"
+    @fname_4 = "four_field"
     
     @document = mock("solr_doc")
     @document.should_receive(:get).with(@fname_1, hash_including(:sep => nil)).any_number_of_times.and_return("val_1")
@@ -31,30 +48,31 @@ describe "/catalog/_index_default.erb" do
     @document.should_receive(:get).with(anything(), hash_including(:sep => nil)).any_number_of_times.and_return("bleah")
     @document.should_receive(:[]).any_number_of_times
     
-    @flabel_1 = Blacklight.config[:index_fields][:labels][@fname_1]
-    @flabel_3 = Blacklight.config[:index_fields][:labels][@fname_3]
-    @flabel_4 = Blacklight.config[:index_fields][:labels][@fname_4]
+    @flabel_1 = "One:"
+    @flabel_3 = "Three:"
+    @flabel_4 = "Four:"
 
+    view.stub!(:blacklight_config).and_return(@config)
     assigns[:document] = @document
-    render_document_partial @document, :index
+    @rendered = view.render_document_partial @document, :index
   end
 
   it "should only display fields listed in the initializer" do
-    rendered.should_not include_text("val_2")
-    rendered.should_not include_text(@fname_2)
+    @rendered.should_not include_text("val_2")
+    @rendered.should_not include_text(@fname_2)
   end
   
   it "should skip over fields listed in initializer that are not in solr response" do
-    rendered.should_not include_text(@fname_3)
+    @rendered.should_not include_text(@fname_3)
   end
 
   it "should display field labels from initializer and raw solr field names in the class" do
     # labels
-    rendered.should include_text(@flabel_1)
-    rendered.should include_text(@flabel_4)
+    @rendered.should include_text(@flabel_1)
+    @rendered.should include_text(@flabel_4)
     # classes    
-    rendered.should include_text("blacklight-#{@fname_1}")
-    rendered.should include_text("blacklight-#{@fname_4}")
+    @rendered.should include_text("blacklight-#{@fname_1}")
+    @rendered.should include_text("blacklight-#{@fname_4}")
   end
   
 # this test probably belongs in a Cucumber feature
@@ -63,9 +81,9 @@ describe "/catalog/_index_default.erb" do
 #  end
 
   it "should have values for displayed fields" do
-    rendered.should include_text("val_1")
-    rendered.should include_text("val_4")
-    rendered.should_not include_text("val_2")
+    @rendered.should include_text("val_1")
+    @rendered.should include_text("val_4")
+    @rendered.should_not include_text("val_2")
   end
 
 end

data/test_support/spec/views/catalog/_show_default.erb_spec.rb

@@ -8,12 +8,30 @@ describe "/catalog/_show_default.html.erb" do
   
   include BlacklightHelper
   include CatalogHelper
-  
+
+
   before(:each) do
-    @fname_1 = Blacklight.config[:show_fields][:field_names].last
-    @fname_2 = "solr_field_not_in_initializer"
-    @fname_3 = Blacklight.config[:show_fields][:field_names][2]
-    @fname_4 = Blacklight.config[:show_fields][:field_names][0]
+    @config = Blacklight::Configuration.from_legacy_configuration({
+      :show => {
+        :display_type => 'asdf'
+      },
+      :show_fields => {
+        :field_names => [
+          'one_field',
+          'empty_field',
+          'four_field'
+        ],
+        :labels => {
+          'one_field' => 'One:',
+          'empty_field' => 'Three:',
+          'four_field' => 'Four:'
+        }
+      }
+    })
+    @fname_1 = "one_field"
+    @fname_2 = "solr_field_not_in_config"
+    @fname_3 = "empty_field"
+    @fname_4 = "four_field"
     
     @document = mock("solr_doc")
     @document.should_receive(:get).with(@fname_1, hash_including(:sep => nil)).any_number_of_times.and_return("val_1")
@@ -31,30 +49,31 @@ describe "/catalog/_show_default.html.erb" do
     @document.should_receive(:get).with(any_args()).any_number_of_times.and_return("bleah")
     @document.should_receive(:[]).any_number_of_times
     
-    @flabel_1 = Blacklight.config[:show_fields][:labels][@fname_1]
-    @flabel_3 = Blacklight.config[:show_fields][:labels][@fname_3]
-    @flabel_4 = Blacklight.config[:show_fields][:labels][@fname_4]
+    @flabel_1 = "One:"
+    @flabel_3 = "Two:"
+    @flabel_4 = "Four:"
 
+    view.stub!(:blacklight_config).and_return(@config)
     assigns[:document] = @document
-    render_document_partial @document, :show
+    @rendered = view.render_document_partial @document, :show
   end
 
   it "should only display fields listed in the initializer" do
-    rendered.should_not include_text("val_2")
-    rendered.should_not include_text(@fname_2)
+    @rendered.should_not include_text("val_2")
+    @rendered.should_not include_text(@fname_2)
   end
   
   it "should skip over fields listed in initializer that are not in solr response" do
-    rendered.should_not include_text(@fname_3)
+    @rendered.should_not include_text(@fname_3)
   end
 
   it "should display field labels from initializer and raw solr field names in the class" do
     # labels
-    rendered.should include_text(@flabel_1)
-    rendered.should include_text(@flabel_4)
+    @rendered.should include_text(@flabel_1)
+    @rendered.should include_text(@flabel_4)
     # classes    
-    rendered.should include_text("blacklight-#{@fname_1}")
-    rendered.should include_text("blacklight-#{@fname_4}")
+    @rendered.should include_text("blacklight-#{@fname_1}")
+    @rendered.should include_text("blacklight-#{@fname_4}")
   end
   
 # this test probably belongs in a Cucumber feature
@@ -63,9 +82,9 @@ describe "/catalog/_show_default.html.erb" do
 #  end
 
   it "should have values for displayed fields" do
-    rendered.should include_text("val_1")
-    rendered.should include_text("val_4")
-    rendered.should_not include_text("val_2")
+    @rendered.should include_text("val_1")
+    @rendered.should include_text("val_4")
+    @rendered.should_not include_text("val_2")
   end
 
 end