blacklight 3.8.2 → 4.0.0.pre6

data/test_support/spec/helpers/catalog_helper_spec.rb

@@ -10,7 +10,7 @@ describe CatalogHelper do
     total = args[:total]
     start = (current_page - 1) * per_page
 
-    mock_response = mock("RSolr::Ext::Response")
+    mock_response = mock("Blacklight::SolrResponse")
     mock_response.stub!(:total).and_return(total)
     mock_response.stub!(:rows).and_return(per_page)
     mock_response.stub!(:start).and_return(start)
@@ -31,11 +31,19 @@ describe CatalogHelper do
       html.html_safe?.should == true
     end
 
+    it "with no results (and no entry_name provided)" do
+      @response = mock_response :total => 0
+
+      html = render_pagination_info(@response)
+      html.should == "No entries found"
+      html.html_safe?.should == true
+    end
+
     it "with a single result" do
       @response = mock_response :total => 1
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "Displaying <b>1</b> entry_name"
+      html.should == "<b>1</b> to <b>1</b> of <b>1</b>"
       html.html_safe?.should == true
     end
 
@@ -43,7 +51,7 @@ describe CatalogHelper do
       @response = mock_response :total => 7
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "Displaying <b>all 7</b> entry_names"
+      html.should == "<b>1</b> - <b>7</b> of <b>7</b>"
       html.html_safe?.should == true
     end
 
@@ -51,7 +59,7 @@ describe CatalogHelper do
       @response = mock_response :total => 15, :per_page => 10
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "Displaying entry_names <b>1 - 10</b> of <b>15</b>"
+      html.should == "<b>1</b> - <b>10</b> of <b>15</b>"
       html.html_safe?.should == true
     end
 
@@ -59,7 +67,7 @@ describe CatalogHelper do
       @response = mock_response :total => 47, :per_page => 10, :current_page => 2
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "Displaying entry_names <b>11 - 20</b> of <b>47</b>"
+      html.should == "<b>11</b> - <b>20</b> of <b>47</b>"
       html.html_safe?.should == true
     end
 
@@ -67,7 +75,7 @@ describe CatalogHelper do
       @response = mock_response :total => 47, :per_page => 10, :current_page => 5
 
       html = render_pagination_info(@response, { :entry_name => 'entry_name' })
-      html.should == "Displaying entry_names <b>41 - 47</b> of <b>47</b>"
+      html.should == "<b>41</b> - <b>47</b> of <b>47</b>"
       html.html_safe?.should == true
     end
 

data/test_support/spec/helpers/facets_helper_spec.rb

@@ -94,7 +94,7 @@ describe FacetsHelper do
 
       it"should convert the query facets into a mock RSolr FacetField" do
         field = helper.facet_by_field_name('my_query_facet_field')
-        field.should be_a_kind_of RSolr::Ext::Response::Facets::FacetField
+        field.should be_a_kind_of Blacklight::SolrResponse::Facets::FacetField
 
         field.name.should == 'my_query_facet_field'
         field.items.length.should == 2

data/test_support/spec/lib/blacklight_solr_document_more_like_this_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Blacklight::Solr::Document::MoreLikeThis do
+  before(:all) do
+    @mock_class = Class.new do
+      include Blacklight::Solr::Document
+    end
+  end
+  
+  it "should pluck the MoreLikeThis results from the Solr Response" do
+    mock_solr_response = mock(:more_like => [{'id' => 'abc'}])
+    result = @mock_class.new({:id => '123'}, mock_solr_response).more_like_this
+    result.should have(1).item
+    result.first.should be_a_kind_of(SolrDocument)
+    result.first.id.should == 'abc'
+    result.first.solr_response.should == mock_solr_response
+  end 
+end

data/test_support/spec/lib/blacklight_solr_document_spec.rb

@@ -18,11 +18,31 @@ describe "Blacklight::Solr::Document" do
         "override"
       end
     end
+
+    context "Hashy methods" do
+      it 'should create 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']})
+
+        doc.has?(:cat, /^elec/).should == true
+        doc.has?(:cat, 'elec').should_not == true
+        doc.has?(:cat, 'electronics').should == true
+
+        doc.get(:cat).should == 'electronics, hard drive'
+        doc.get(:xyz).should == nil
+        doc.get(:xyz, :default=>'def').should == 'def'
+      end
+    end
+
    
     context "Unique Key" do
-      it "should use a configuration-defined document unique key" do
+      before(:each) do
         MockDocument.unique_key = 'my_unique_key'
+      end
 
+      after(:each) do
+        MockDocument.unique_key = 'id'
+      end
+      it "should use a configuration-defined document unique key" do
         @document = MockDocument.new :id => 'asdf', :my_unique_key => '1234'
         @document.id.should == '1234'
       end
@@ -178,5 +198,38 @@ describe "Blacklight::Solr::Document" do
       
     end
 
+    context "highlighting" do
+
+      before(:all) do
+        @document = MockDocument.new({'id' => 'doc1', 'title_field' => 'doc1 title'}, {'highlighting' => { 'doc1' => { 'title_text' => ['doc <em>1</em>']}, 'doc2' => { 'title_text' => ['doc 2']}}})
+
+      end
+
+      describe "#has_highlight_field?" do
+        it "should be true if the highlight field is in the solr response" do
+          @document.should have_highlight_field 'title_text'
+          @document.should have_highlight_field :title_text
+        end
+
+        it "should be false if the highlight field isn't in the solr response" do
+           @document.should_not have_highlight_field 'nonexisting_field'
+        end
+      end
+
+      describe "#highlight_field" do
+        it "should return a value" do
+          @document.highlight_field('title_text').should include('doc <em>1</em>')
+        end
+
+
+        it "should return a value that is html safe" do
+          @document.highlight_field('title_text').first.should be_html_safe
+        end
+
+        it "should return nil when the field doesn't exist" do
+          @document.highlight_field('nonexisting_field').should be_nil
+        end
+      end
+    end
     
 end

data/test_support/spec/lib/blacklight_solr_response_spec.rb

@@ -0,0 +1,153 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'blacklight'
+
+describe Blacklight::SolrResponse do
+
+  def create_response
+    raw_response = eval(mock_query_response)
+    Blacklight::SolrResponse.new(raw_response, raw_response['params'])
+  end
+
+  it 'should create a valid response' do
+    r = create_response
+    r.should respond_to(:header)
+  end
+
+  it 'should have accurate pagination numbers' do
+    r = create_response
+    r.rows.should == 11
+    r.total.should == 26
+    r.start.should == 0
+  end
+
+  it 'should create a valid response class' do
+    r = create_response
+
+    r.should respond_to(:response)
+    r.docs.size.should == 11
+    r.params[:echoParams].should == 'EXPLICIT'
+    
+    r.should be_a(Blacklight::SolrResponse::Facets)
+  end
+
+  it 'should provide facet helpers' do
+    r = create_response
+    r.facets.size.should == 2
+
+    field_names = r.facets.collect{|facet|facet.name}
+    field_names.include?('cat').should == true
+    field_names.include?('manu').should == true
+
+    first_facet = r.facets.select { |x| x.name == 'cat'}.first
+    first_facet.name.should == 'cat'
+
+    first_facet.items.size.should == 10
+
+    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
+    end.join(', ')
+
+    received.should == expected
+
+    r.facets.each do |facet|
+      facet.respond_to?(:name).should == true
+      facet.items.each do |item|
+        item.respond_to?(:value).should == true
+        item.respond_to?(:hits).should == true
+      end
+    end
+
+  end
+
+  it 'should return the correct value when calling facet_by_field_name' do
+    r = create_response
+    facet = r.facet_by_field_name('cat')
+    facet.name.should == 'cat'
+  end
+
+  it 'should provide the responseHeader params' do
+    raw_response = eval(mock_query_response)
+    raw_response['responseHeader']['params']['test'] = :test
+    r = Blacklight::SolrResponse.new(raw_response, raw_response['params'])
+    r.params['test'].should == :test
+  end
+
+  it 'should provide the solr-returned params and "rows" should be 11' do
+    raw_response = eval(mock_query_response)
+    r = Blacklight::SolrResponse.new(raw_response, {})
+    r.params[:rows].to_s.should == '11'
+  end
+
+  it 'should provide the ruby request params if responseHeader["params"] does not exist' do
+    raw_response = eval(mock_query_response)
+    raw_response.delete 'responseHeader'
+    r = Blacklight::SolrResponse.new(raw_response, :rows => 999)
+    r.params[:rows].to_s.should == '999'
+  end
+
+  it 'should provide spelling suggestions for regular spellcheck results' do
+    raw_response = eval(mock_response_with_spellcheck)
+    r = Blacklight::SolrResponse.new(raw_response,  {})
+    r.spelling.words.should include("dell")
+    r.spelling.words.should include("ultrasharp")
+  end
+
+  it 'should provide spelling suggestions for extended spellcheck results' do
+    raw_response = eval(mock_response_with_spellcheck_extended)
+    r = Blacklight::SolrResponse.new(raw_response, {})
+    r.spelling.words.should include("dell")
+    r.spelling.words.should include("ultrasharp")
+  end
+
+  it 'should provide no spelling suggestions when extended results and suggestion frequency is the same as original query frequency' do
+    raw_response = eval(mock_response_with_spellcheck_same_frequency)
+    r = Blacklight::SolrResponse.new(raw_response, {})
+    r.spelling.words.should == []
+  end
+
+  it 'should provide spelling suggestions for a regular spellcheck results with a collation' do
+    raw_response = eval(mock_response_with_spellcheck_collation)
+    r = Blacklight::SolrResponse.new(raw_response, {})
+    r.spelling.words.should include("dell")
+    r.spelling.words.should include("ultrasharp")
+  end
+
+  it 'should provide spelling suggestion collation' do
+    raw_response = eval(mock_response_with_spellcheck_collation)
+    r = Blacklight::SolrResponse.new(raw_response, {})
+    r.spelling.collation.should == 'dell ultrasharp'
+  end
+
+  it "should provide MoreLikeThis suggestions" do
+    raw_response = eval(mock_response_with_more_like_this)
+    r = Blacklight::SolrResponse.new(raw_response, {})
+    r.more_like(mock(:id => '79930185')).should have(2).items
+  end
+
+  def mock_query_response
+    %({'responseHeader'=>{'status'=>0,'QTime'=>5,'params'=>{'facet.limit'=>'10','wt'=>'ruby','rows'=>'11','facet'=>'true','facet.field'=>['cat','manu'],'echoParams'=>'EXPLICIT','q'=>'*:*','facet.sort'=>'true'}},'response'=>{'numFound'=>26,'start'=>0,'docs'=>[{'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']},{'id'=>'6H500F0','inStock'=>true,'manu'=>'Maxtor Corp.','name'=>'Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300','popularity'=>6,'price'=>350.0,'sku'=>'6H500F0','timestamp'=>'2009-03-20T14:42:49.877Z','cat'=>['electronics','hard drive'],'spell'=>['Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300'],'features'=>['SATA 3.0Gb/s, NCQ','8.5ms seek','16MB cache']},{'id'=>'F8V7067-APL-KIT','inStock'=>false,'manu'=>'Belkin','name'=>'Belkin Mobile Power Cord for iPod w/ Dock','popularity'=>1,'price'=>19.95,'sku'=>'F8V7067-APL-KIT','timestamp'=>'2009-03-20T14:42:49.937Z','weight'=>4.0,'cat'=>['electronics','connector'],'spell'=>['Belkin Mobile Power Cord for iPod w/ Dock'],'features'=>['car power adapter, white']},{'id'=>'IW-02','inStock'=>false,'manu'=>'Belkin','name'=>'iPod & iPod Mini USB 2.0 Cable','popularity'=>1,'price'=>11.5,'sku'=>'IW-02','timestamp'=>'2009-03-20T14:42:49.944Z','weight'=>2.0,'cat'=>['electronics','connector'],'spell'=>['iPod & iPod Mini USB 2.0 Cable'],'features'=>['car power adapter for iPod, white']},{'id'=>'MA147LL/A','inStock'=>true,'includes'=>'earbud headphones, USB cable','manu'=>'Apple Computer Inc.','name'=>'Apple 60 GB iPod with Video Playback Black','popularity'=>10,'price'=>399.0,'sku'=>'MA147LL/A','timestamp'=>'2009-03-20T14:42:49.962Z','weight'=>5.5,'cat'=>['electronics','music'],'spell'=>['Apple 60 GB iPod with Video Playback Black'],'features'=>['iTunes, Podcasts, Audiobooks','Stores up to 15,000 songs, 25,000 photos, or 150 hours of video','2.5-inch, 320x240 color TFT LCD display with LED backlight','Up to 20 hours of battery life','Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video','Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication']},{'id'=>'TWINX2048-3200PRO','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail','popularity'=>5,'price'=>185.0,'sku'=>'TWINX2048-3200PRO','timestamp'=>'2009-03-20T14:42:49.99Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail'],'features'=>['CAS latency 2,	2-3-3-6 timing, 2.75v, unbuffered, heat-spreader']},{'id'=>'VS1GB400C3','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail','popularity'=>7,'price'=>74.99,'sku'=>'VS1GB400C3','timestamp'=>'2009-03-20T14:42:50Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail']},{'id'=>'VDBDB1A16','inStock'=>true,'manu'=>'A-DATA Technology Inc.','name'=>'A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM','popularity'=>5,'sku'=>'VDBDB1A16','timestamp'=>'2009-03-20T14:42:50.004Z','cat'=>['electronics','memory'],'spell'=>['A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM'],'features'=>['CAS latency 3,	 2.7v']},{'id'=>'3007WFP','inStock'=>true,'includes'=>'USB cable','manu'=>'Dell, Inc.','name'=>'Dell Widescreen UltraSharp 3007WFP','popularity'=>6,'price'=>2199.0,'sku'=>'3007WFP','timestamp'=>'2009-03-20T14:42:50.017Z','weight'=>401.6,'cat'=>['electronics','monitor'],'spell'=>['Dell Widescreen UltraSharp 3007WFP'],'features'=>['30" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast']},{'id'=>'VA902B','inStock'=>true,'manu'=>'ViewSonic Corp.','name'=>'ViewSonic VA902B - flat panel display - TFT - 19"','popularity'=>6,'price'=>279.95,'sku'=>'VA902B','timestamp'=>'2009-03-20T14:42:50.034Z','weight'=>190.4,'cat'=>['electronics','monitor'],'spell'=>['ViewSonic VA902B - flat panel display - TFT - 19"'],'features'=>['19" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution']},{'id'=>'0579B002','inStock'=>true,'manu'=>'Canon Inc.','name'=>'Canon PIXMA MP500 All-In-One Photo Printer','popularity'=>6,'price'=>179.99,'sku'=>'0579B002','timestamp'=>'2009-03-20T14:42:50.062Z','weight'=>352.0,'cat'=>['electronics','multifunction printer','printer','scanner','copier'],'spell'=>['Canon PIXMA MP500 All-In-One Photo Printer'],'features'=>['Multifunction ink-jet color photo printer','Flatbed scanner, optical scan resolution of 1,200 x 2,400 dpi','2.5" color LCD preview screen','Duplex Copying','Printing speed up to 29ppm black, 19ppm color','Hi-Speed USB','memory card: CompactFlash, Micro Drive, SmartMedia, Memory Stick, Memory Stick Pro, SD Card, and MultiMediaCard']}]},'facet_counts'=>{'facet_queries'=>{},'facet_fields'=>{'cat'=>['electronics',14,'memory',3,'card',2,'connector',2,'drive',2,'graphics',2,'hard',2,'monitor',2,'search',2,'software',2],'manu'=>['inc',8,'apach',2,'belkin',2,'canon',2,'comput',2,'corp',2,'corsair',2,'foundat',2,'microsystem',2,'softwar',2]},'facet_dates'=>{}}})
+  end
+
+  # These spellcheck responses are all Solr 1.4 responses
+  def mock_response_with_spellcheck
+    %|{'responseHeader'=>{'status'=>0,'QTime'=>9,'params'=>{'spellcheck'=>'true','spellcheck.collate'=>'true','wt'=>'ruby','q'=>'hell ultrashar'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['dell']},'ultrashar',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'suggestion'=>['ultrasharp']},'collation','dell ultrasharp']}}|
+  end
+
+  def mock_response_with_spellcheck_extended
+     %|{'responseHeader'=>{'status'=>0,'QTime'=>8,'params'=>{'spellcheck'=>'true','spellcheck.collate'=>'true','wt'=>'ruby','spellcheck.extendedResults'=>'true','q'=>'hell ultrashar'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'origFreq'=>0,'suggestion'=>[{'word'=>'dell','freq'=>1}]},'ultrashar',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'origFreq'=>0,'suggestion'=>[{'word'=>'ultrasharp','freq'=>1}]},'correctlySpelled',false,'collation','dell ultrasharp']}}|
+  end
+
+  def mock_response_with_spellcheck_same_frequency
+    %|{'responseHeader'=>{'status'=>0,'QTime'=>8,'params'=>{'spellcheck'=>'true','spellcheck.collate'=>'true','wt'=>'ruby','spellcheck.extendedResults'=>'true','q'=>'hell ultrashar'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'origFreq'=>1,'suggestion'=>[{'word'=>'dell','freq'=>1}]},'ultrashard',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'origFreq'=>1,'suggestion'=>[{'word'=>'ultrasharp','freq'=>1}]},'correctlySpelled',false,'collation','dell ultrasharp']}}|
+  end
+
+  # it can be the case that extended results are off and collation is on
+  def mock_response_with_spellcheck_collation
+    %|{'responseHeader'=>{'status'=>0,'QTime'=>3,'params'=>{'spellspellcheck.build'=>'true','spellcheck'=>'true','q'=>'hell','spellcheck.q'=>'hell ultrashar','wt'=>'ruby','spellcheck.collate'=>'true'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['dell']},'ultrashar',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'suggestion'=>['ultrasharp']},'collation','dell ultrasharp']}}|
+  end
+  
+  def mock_response_with_more_like_this
+    %({'responseHeader'=>{'status'=>0,'QTime'=>8,'params'=>{'facet'=>'false','mlt.mindf'=>'1','mlt.fl'=>'subject_t','fl'=>'id','mlt.count'=>'3','mlt.mintf'=>'0','mlt'=>'true','q.alt'=>'*:*','qt'=>'search','wt'=>'ruby'}},'response'=>{'numFound'=>30,'start'=>0,'docs'=>[{'id'=>'00282214'},{'id'=>'00282371'},{'id'=>'00313831'},{'id'=>'00314247'},{'id'=>'43037890'},{'id'=>'53029833'},{'id'=>'77826928'},{'id'=>'78908283'},{'id'=>'79930185'},{'id'=>'85910001'}]},'moreLikeThis'=>{'00282214'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'00282371'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'00313831'=>{'numFound'=>1,'start'=>0,'docs'=>[{'id'=>'96933325'}]},'00314247'=>{'numFound'=>3,'start'=>0,'docs'=>[{'id'=>'2008543486'},{'id'=>'96933325'},{'id'=>'2009373513'}]},'43037890'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'53029833'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'77826928'=>{'numFound'=>1,'start'=>0,'docs'=>[{'id'=>'94120425'}]},'78908283'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'79930185'=>{'numFound'=>2,'start'=>0,'docs'=>[{'id'=>'94120425'},{'id'=>'2007020969'}]},'85910001'=>{'numFound'=>0,'start'=>0,'docs'=>[]}}})
+  end
+end

data/test_support/spec/lib/facet_paginator_spec.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe 'Blacklight::Solr::FacetPaginator' do
   before(:all) do
     require 'yaml'
-    @seven_facet_values = YAML::load("--- \n- !ruby/object:RSolr::Ext::Response::Facets::FacetItem \n  hits: 792\n  value: Book\n- !ruby/object:RSolr::Ext::Response::Facets::FacetItem \n  hits: 65\n  value: Musical Score\n- !ruby/object:RSolr::Ext::Response::Facets::FacetItem \n  hits: 58\n  value: Serial\n- !ruby/object:RSolr::Ext::Response::Facets::FacetItem \n  hits: 48\n  value: Musical Recording\n- !ruby/object:RSolr::Ext::Response::Facets::FacetItem \n  hits: 37\n  value: Microform\n- !ruby/object:RSolr::Ext::Response::Facets::FacetItem \n  hits: 27\n  value: Thesis\n- !ruby/object:RSolr::Ext::Response::Facets::FacetItem \n  hits: 0\n  value: \n")
+    @seven_facet_values = YAML::load("--- \n- !ruby/object:Blacklight::SolrResponse::Facets::FacetItem \n  hits: 792\n  value: Book\n- !ruby/object:Blacklight::SolrResponse::Facets::FacetItem \n  hits: 65\n  value: Musical Score\n- !ruby/object:Blacklight::SolrResponse::Facets::FacetItem \n  hits: 58\n  value: Serial\n- !ruby/object:Blacklight::SolrResponse::Facets::FacetItem \n  hits: 48\n  value: Musical Recording\n- !ruby/object:Blacklight::SolrResponse::Facets::FacetItem \n  hits: 37\n  value: Microform\n- !ruby/object:Blacklight::SolrResponse::Facets::FacetItem \n  hits: 27\n  value: Thesis\n- !ruby/object:Blacklight::SolrResponse::Facets::FacetItem \n  hits: 0\n  value: \n")
     @six_facet_values = @seven_facet_values.slice(1,6)
     @limit = 6
 

data/test_support/spec/lib/marc_export_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+# -*- encoding : utf-8 -*-
 # -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'rubygems'
@@ -676,12 +676,20 @@ describe Blacklight::Solr::Document::MarcExport do
       @music_record.export_as_refworks_marc_txt.should == "LEADER 01828cjm a2200409 a 4500001    a4768316\n003    SIRSI\n007    sd fungnnmmned\n008    020117p20011990xxuzz    h              d\n245 00 Music for horn |h[sound recording] / |cBrahms, Beethoven, von Krufft.\n260    [United States] : |bHarmonia Mundi USA, |cp2001.\n700 1  Greer, Lowell.\n700 1  Lubin, Steven.\n700 1  Chase, Stephanie, |d1957-\n700 12 Brahms, Johannes, |d1833-1897. |tTrios, |mpiano, violin, horn, |nop. 40, |rE? major.\n700 12 Beethoven, Ludwig van, |d1770-1827. |tSonatas, |mhorn, piano, |nop. 17, |rF major.\n700 12 Krufft, Nikolaus von, |d1779-1818. |tSonata, |mhorn, piano, |rF major.\n"
     end
     describe "for UTF-8 record" do
-      before do
-        @utf8_exported = @record_utf8_decomposed.export_as_refworks_marc_txt
-      end
       it "should export in Unicode normalized C form" do
-        @utf8_exported.should_not include("\314\204\312\273") # decomposed
-        @utf8_exported.should include("\304\253\312\273") # C-form normalized
+
+        begin
+          require 'unicode'
+        rescue LoadError
+          Blacklight.logger.should_receive(:warn) unless defined? :JRUBY_VERSION
+        end
+
+        @utf8_exported = @record_utf8_decomposed.export_as_refworks_marc_txt
+
+        if defined? Unicode
+          @utf8_exported.should_not include("\314\204\312\273") # decomposed
+          @utf8_exported.should include("\304\253\312\273") # C-form normalized
+        end
       end
     end
   end

data/test_support/spec/lib/solr_helper_spec.rb

@@ -546,9 +546,13 @@ describe 'Blacklight::SolrHelper' do
       end
 
       it "should use the configured request handler " do
-        require 'ostruct'
         blacklight_config.stub(:solr_request_handler => 'custom_request_handler')
-        self.should_receive(:find).with('custom_request_handler', anything).and_return(OpenStruct.new( :docs => [{}] ))
+        Blacklight.solr.should_receive(:paginate) do |page, rows, path, params|
+          page.should == 1
+          rows.should == 10
+          path.should == 'select'
+          params[:params].should include(:qt=>"custom_request_handler", :q=>"", "spellcheck.q"=>"", :"facet.field"=>["format", "{!ex=pub_date_single}pub_date", "subject_topic_facet", "language_facet", "lc_1letter_facet", "subject_geo_facet", "subject_era_facet"], :"facet.query"=>["pub_date:[2007 TO *]", "pub_date:[2002 TO *]", "pub_date:[1987 TO *]"], :"f.subject_topic_facet.facet.limit"=>21, :sort=>"score desc, pub_date_sort desc, title_sort asc")
+        end.and_return({'response'=>{'docs'=>[]}})
         get_search_results(:q => @all_docs_query)
       end
 
@@ -570,6 +574,13 @@ describe 'Blacklight::SolrHelper' do
       end
     end
 
+    describe '#query_solr' do
+      it 'should have results' do
+        solr_response = query_solr(:q => @single_word_query)
+        solr_response.docs.size.should > 0
+      end
+    end
+
     describe 'for All Docs Query, No Facets' do
       it 'should have non-nil values for required doc fields set in initializer' do
         (solr_response, document_list) = get_search_results(:q => @all_docs_query)
@@ -583,6 +594,12 @@ describe 'Blacklight::SolrHelper' do
 
 
     describe "Single Word Query with no Facets" do
+    	
+      it 'should have results' do
+        solr_response = query_solr(:q => @single_word_query)
+        solr_response.docs.size.should > 0
+      end
+
       it 'should have results' do
         (solr_response, document_list) = get_search_results(:q => @single_word_query)
         solr_response.docs.size.should == document_list.size
@@ -781,10 +798,9 @@ describe 'Blacklight::SolrHelper' do
     end
 
     it "should use a provided document request handler " do
-      require 'ostruct'
       blacklight_config.stub(:document_solr_request_handler => 'document')
-      self.should_receive(:find).with('document', anything).and_return(OpenStruct.new( :docs => [{}] ))
-      get_solr_response_for_doc_id(@doc_id)
+      Blacklight.solr.should_receive(:get).with('select', kind_of(Hash)).and_return({'response'=>{'docs'=>[]}})
+      lambda { get_solr_response_for_doc_id(@doc_id)}.should raise_error Blacklight::Exceptions::InvalidSolrID
     end
 
     it "should have a non-nil result for a known id" do
@@ -1013,7 +1029,7 @@ describe 'Blacklight::SolrHelper' do
 #  more like this
 #  nearby on shelf
   it "should raise a Blacklight exception if RSolr can't connect to the Solr instance" do
-    Blacklight.solr.stub!(:find).and_raise(Errno::ECONNREFUSED)
+    Blacklight.solr.stub!(:get).and_raise(Errno::ECONNREFUSED)
     expect { find(:a => 123) }.to raise_exception(/Unable to connect to Solr instance/)
   end
 end

data/test_support/spec/models/solr_docment_spec.rb

@@ -9,9 +9,6 @@ require 'marc'
 # values in an after() block so other tests get expected results. 
 # Blacklight is a Singleton for application configuration.
 
-# NOTE the helper methods below that return hashes and call to_mash.
-# this will NOT be needed if using RSolr::Ext >= version 0.9.6.3
-
 ## TODO: ALL these specs probably really ought to be on the modules
 # being tested, not on the bare SolrDocument class that has no logic
 # of it's own, it just includes modules. No? jrochkind 29 Mar 2010
@@ -47,7 +44,7 @@ end
       # count on the initializer to register the extension, need to re-register
       # it.
       SolrDocument.registered_extensions = nil
-      SolrDocument.use_extension( Blacklight::Solr::Document::Marc ) { |document| document.key?(:marc_display)}
+      SolrDocument.use_extension( Blacklight::Solr::Document::Marc ) { |document| document.has_key?(:marc_display)}
       
       @solrdoc = SolrDocument.new(@hash_with_marcxml)
 

data/test_support/spec/{features → requests}/alternate_controller_spec.rb

@@ -4,12 +4,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "controllers that are not catalog controller" do
 
   it "should have the correct search form" do
+  	pending
     visit alternate_index_path
     page.should have_selector("form[action='#{alternate_index_path}']")
     fill_in "q", :with=>"history"
     click_button 'search'
-    page.should have_link("startOverLink", :href=>alternate_index_path)
+  #  page.should have_link("startOverLink", :href=>alternate_index_path)
     page.should have_selector("form.per_page[action='#{alternate_index_path}']")
-    page.should have_selector("form#sort_form[action='#{alternate_index_path}']")
+    page.should have_selector("form.sort[action='#{alternate_index_path}']")
   end
 end