blacklight 5.0.0.pre1 → 5.0.0.pre2

data/spec/test_app_templates/Gemfile.extra

@@ -14,8 +14,7 @@ group :test do
   gem 'rspec-rails', '~> 2.13'
   gem 'generator_spec'
   gem 'poltergeist'
-  gem 'simplecov', :platform => :mri_19
-  gem 'simplecov-rcov', :platform => :mri_19
+  gem 'simplecov'
 end
 
 gem 'jettywrapper', '>= 1.2.0'

data/spec/views/catalog/_constraints_element.html.erb_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe "catalog/_constraints_element.html.erb" do
@@ -7,9 +6,9 @@ describe "catalog/_constraints_element.html.erb" do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value"}
     end
     it "should render label and value" do
-      rendered.should have_selector("span.appliedFilter.constraint") do |s|
-        s.should have_selector "span.filterName", :content => "my label"
-        s.should have_selector "span.filterValue", :content => "my value" 
+      expect(rendered).to have_selector("span.appliedFilter.constraint") do |s|
+        expect(s).to have_selector "span.filterName", :content => "my label"
+        expect(s).to have_selector "span.filterValue", :content => "my value" 
       end
     end
   end
@@ -19,14 +18,14 @@ describe "catalog/_constraints_element.html.erb" do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:remove => "http://remove"}}
     end
     it "should include remove link" do
-      rendered.should have_selector("span.appliedFilter") do |s|
-        s.should have_selector(".remove[href='http://remove']")
+      expect(rendered).to have_selector("span.appliedFilter") do |s|
+        expect(s).to have_selector(".remove[href='http://remove']")
       end    
     end
 
     it "should have an accessible remove label" do
-      rendered.should have_selector(".remove") do |s|
-        s.should have_content("Remove constraint my label: my value")
+      expect(rendered).to have_selector(".remove") do |s|
+        expect(s).to have_content("Remove constraint my label: my value")
       end
     end
   end
@@ -36,8 +35,8 @@ describe "catalog/_constraints_element.html.erb" do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:check => false}}
     end
     it "should not include checkmark" do
-      rendered.should have_selector("span.appliedFilter") do |s|
-        s.should_not have_selector("img[src$='checkmark.gif']")
+      expect(rendered).to have_selector("span.appliedFilter") do |s|
+        expect(s).to_not have_selector("img[src$='checkmark.gif']")
       end   
     end
   end
@@ -47,7 +46,7 @@ describe "catalog/_constraints_element.html.erb" do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:classes => ["class1", "class2"]}}
     end
     it "should include them" do
-      rendered.should have_selector("span.appliedFilter.constraint.class1.class2")
+      expect(rendered).to have_selector("span.appliedFilter.constraint.class1.class2")
     end
   end
 
@@ -56,8 +55,8 @@ describe "catalog/_constraints_element.html.erb" do
       render( :partial => "catalog/constraints_element", :locals => {:label => "<span class='custom_label'>my label</span>", :value => "<span class='custom_value'>my value</span>", :options => {:escape_label => false, :escape_value => false}} )
     end
     it "should not escape key and value" do
-      rendered.should have_selector("span.appliedFilter.constraint span.filterName span.custom_label")
-      rendered.should have_selector("span.appliedFilter.constraint span.filterValue span.custom_value")
+      expect(rendered).to have_selector("span.appliedFilter.constraint span.filterName span.custom_label")
+      expect(rendered).to have_selector("span.appliedFilter.constraint span.filterValue span.custom_value")
     end
 
   end

data/spec/views/catalog/_document.html.erb_spec.rb

@@ -9,14 +9,31 @@ describe "catalog/_document" do
     Blacklight::Configuration.new
   end
 
-  it "should render the header, thumbnail and index" do
+  it "should render the header, thumbnail and index by default" do
+    view.stub(:render_grouped_response?).and_return(false)
     view.stub(:blacklight_config).and_return(blacklight_config)
-    stub_template "catalog/_document_header.html.erb" => "document_header"
+    stub_template "catalog/_index_header_default.html.erb" => "document_header"
     stub_template "catalog/_thumbnail_default.html.erb" => "thumbnail_default"
     stub_template "catalog/_index_default.html.erb" => "index_default"
     render :partial => "catalog/document", :locals => {:document => document, :document_counter => 1}
     expect(rendered).to match /document_header/
     expect(rendered).to match /thumbnail_default/
     expect(rendered).to match /index_default/
+    expect(rendered).to have_selector('div.document[@itemscope]')
+    expect(rendered).to have_selector('div.document[@itemtype="http://schema.org/Thing"]')
+  end
+
+
+  it "should use the index.partials parameter to determine the partials to render" do
+    view.stub(:render_grouped_response?).and_return(false)
+    view.stub(:blacklight_config).and_return(blacklight_config)
+    blacklight_config.index.partials = ['a', 'b', 'c']
+    stub_template "catalog/_a_default.html.erb" => "a_partial"
+    stub_template "catalog/_b_default.html.erb" => "b_partial"
+    stub_template "catalog/_c_default.html.erb" => "c_partial"
+    render :partial => "catalog/document", :locals => {:document => document, :document_counter => 1}
+    expect(rendered).to match /a_partial/
+    expect(rendered).to match /b_partial/
+    expect(rendered).to match /c_partial/
   end
 end

data/spec/views/catalog/_document_list.html.erb_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe "/catalog/_document_list.html.erb" do  

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

@@ -8,7 +8,7 @@ describe "catalog/_facets" do
   it "should not have a header if no facets are displayed" do
     view.stub(:render_facet_partials => '')
     render
-    rendered.should_not have_selector('h4')
+    expect(rendered).to_not have_selector('h4')
   end
 
   it "should have a header" do
@@ -24,7 +24,7 @@ describe "catalog/_facets" do
 
     view.stub(:render_facet_partials => '')
     render
-    rendered.should have_selector('h4')
+    expect(rendered).to have_selector('h4')
   end
 
   describe "facet display" do
@@ -42,13 +42,13 @@ describe "catalog/_facets" do
 
     it "should have a(n accessible) header" do
       render
-      rendered.should have_selector('h5')
+      expect(rendered).to have_selector('h5')
     end
 
     it "should list values" do
       render
-      rendered.should have_selector('a.facet_select')
-      rendered.should have_selector('.facet-count')
+      expect(rendered).to have_selector('a.facet_select')
+      expect(rendered).to have_selector('.facet-count')
     end
 
   end

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 # spec for default partial to display solr document fields 
@@ -45,21 +44,21 @@ describe "/catalog/_index_default.erb" do
   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)
+    expect(@rendered).to_not include_text("val_2")
+    expect(@rendered).to_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)
+    expect(@rendered).to_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)
+    expect(@rendered).to include_text(@flabel_1)
+    expect(@rendered).to include_text(@flabel_4)
     # classes    
-    @rendered.should include_text("blacklight-#{@fname_1}")
-    @rendered.should include_text("blacklight-#{@fname_4}")
+    expect(@rendered).to include_text("blacklight-#{@fname_1}")
+    expect(@rendered).to include_text("blacklight-#{@fname_4}")
   end
   
 # this test probably belongs in a Cucumber feature
@@ -68,9 +67,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")
+    expect(@rendered).to include_text("val_1")
+    expect(@rendered).to include_text("val_4")
+    expect(@rendered).to_not include_text("val_2")
   end
 
 end

data/spec/views/catalog/_paginate_compact.html.erb_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe "catalog/_paginate_compact.html.erb" do
+
+  describe "with a real solr response", :integration => true do  
+    def blacklight_config
+      @config ||= CatalogController.blacklight_config
+    end
+    
+    def blacklight_config=(config)
+      @config = config
+    end
+
+    def blacklight_solr
+      Blacklight.solr
+    end
+
+    def facet_limit_for *args
+      0
+    end
+
+    include Blacklight::SolrHelper
+
+    it "should render solr responses" do
+      solr_response, document_list = get_search_results(:q => '')
+
+      render :partial => 'catalog/paginate_compact', :object => solr_response
+      expect(rendered).to have_selector ".page_entries"
+      expect(rendered).to have_selector "a[@rel=next]"
+    end
+  end
+
+  it "should render paginatable arrays" do
+    render :partial => 'catalog/paginate_compact', :object => (Kaminari.paginate_array([], total_count: 145).page(1).per(10))
+    expect(rendered).to have_selector ".page_entries"
+    expect(rendered).to have_selector "a[@rel=next]"
+  end
+
+  it "should render ActiveRecord collections" do
+    50.times { b = Bookmark.new;  b.user_id = 1; b.save! }
+    render :partial => 'catalog/paginate_compact', :object => Bookmark.page(1).per(25)
+    expect(rendered).to have_selector ".page_entries"
+    expect(rendered).to have_selector "a[@rel=next]"
+  end
+end

data/spec/views/catalog/_search_header.erb_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 # spec for sidebar partial in catalog show view

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 # spec for default partial to display solr document fields 
@@ -47,21 +46,21 @@ describe "/catalog/_show_default.html.erb" do
   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)
+    expect(@rendered).to_not include_text("val_2")
+    expect(@rendered).to_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)
+    expect(@rendered).to_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)
+    expect(@rendered).to include_text(@flabel_1)
+    expect(@rendered).to include_text(@flabel_4)
     # classes    
-    @rendered.should include_text("blacklight-#{@fname_1}")
-    @rendered.should include_text("blacklight-#{@fname_4}")
+    expect(@rendered).to include_text("blacklight-#{@fname_1}")
+    expect(@rendered).to include_text("blacklight-#{@fname_4}")
   end
   
 # this test probably belongs in a Cucumber feature
@@ -70,9 +69,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")
+    expect(@rendered).to include_text("val_1")
+    expect(@rendered).to include_text("val_4")
+    expect(@rendered).to_not include_text("val_2")
   end
 
 end

data/spec/views/catalog/_show_sidebar.erb_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 # spec for sidebar partial in catalog show view
@@ -20,7 +19,7 @@ describe "/catalog/_show_sidebar.html.erb" do
   	@document = SolrDocument.new :id => 1, :title_s => 'abc', :format => 'default'
   	@document.stub(:more_like_this).and_return([SolrDocument.new({ 'id' => '2', 'title_display' => 'Title of MLT Document' })])
     render
-    rendered.should include_text("More Like This")
-    rendered.should include_text("Title of MLT Document")
+    expect(rendered).to include_text("More Like This")
+    expect(rendered).to include_text("Title of MLT Document")
   end
 end

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'spec_helper'
 
 describe "catalog/index" do  
@@ -41,51 +40,51 @@ describe "catalog/index" do
   end
 
   it "should have contextual information" do
-    rendered.should have_selector("link[rel=self]")
-    rendered.should have_selector("link[rel=next]")
-    rendered.should have_selector("link[rel=previous]")
-    rendered.should have_selector("link[rel=first]")
-    rendered.should have_selector("link[rel=last]")
-    rendered.should have_selector("link[rel='alternate'][type='text/html']")
-    rendered.should have_selector("link[rel=search][type='application/opensearchdescription+xml']") 
+    expect(rendered).to have_selector("link[rel=self]")
+    expect(rendered).to have_selector("link[rel=next]")
+    expect(rendered).to have_selector("link[rel=previous]")
+    expect(rendered).to have_selector("link[rel=first]")
+    expect(rendered).to have_selector("link[rel=last]")
+    expect(rendered).to have_selector("link[rel='alternate'][type='text/html']")
+    expect(rendered).to have_selector("link[rel=search][type='application/opensearchdescription+xml']") 
   end
   
   it "should get paging data correctly from response" do
     # Can't use have_tag for namespaced elements, sorry.    
-    @response_xml.elements["/feed/opensearch:totalResults"].text.should == "30"
-    @response_xml.elements["/feed/opensearch:startIndex"].text.should == "10"
-    @response_xml.elements["/feed/opensearch:itemsPerPage"].text.should == "10"        
+    expect(@response_xml.elements["/feed/opensearch:totalResults"].text).to eq "30"
+    expect(@response_xml.elements["/feed/opensearch:startIndex"].text).to eq "10"
+    expect(@response_xml.elements["/feed/opensearch:itemsPerPage"].text).to eq "10"        
   end
   
   it "should include an opensearch Query role=request" do
         
-    @response_xml.elements.to_a("/feed/opensearch:itemsPerPage").length.should == 1
+    expect(@response_xml.elements.to_a("/feed/opensearch:itemsPerPage")).to have(1).item
     query_el = @response_xml.elements["/feed/opensearch:Query"]
-    query_el.should_not be_nil
-    query_el.attributes["role"].should == "request"
-    query_el.attributes["searchTerms"].should == ""
-    query_el.attributes["startPage"].should == "2"    
+    expect(query_el).to_not be_nil
+    expect(query_el.attributes["role"]).to eq "request"
+    expect(query_el.attributes["searchTerms"]).to eq ""
+    expect(query_el.attributes["startPage"]).to eq "2"    
   end
   
   it "should have ten entries" do
-    rendered.should have_selector("entry", :count => 10)
+    expect(rendered).to have_selector("entry", :count => 10)
   end
   
   describe "entries" do
     it "should have a title" do
-      rendered.should have_selector("entry > title")
+      expect(rendered).to have_selector("entry > title")
     end
     it "should have an updated" do
-      rendered.should have_selector("entry > updated")
+      expect(rendered).to have_selector("entry > updated")
     end
     it "should have html link" do
-      rendered.should have_selector("entry > link[rel=alternate][type='text/html']")
+      expect(rendered).to have_selector("entry > link[rel=alternate][type='text/html']")
     end
     it "should have an id" do
-      rendered.should have_selector("entry > id")
+      expect(rendered).to have_selector("entry > id")
     end
     it "should have a summary" do
-      rendered.should have_selector("entry > summary") 
+      expect(rendered).to have_selector("entry > summary") 
     end
     
     describe "with an author" do
@@ -93,7 +92,7 @@ describe "catalog/index" do
         @entry = @response_xml.elements.to_a("/feed/entry")[0]
       end
       it "should have author tag" do
-        @entry.elements["author/name"].should_not be_nil              
+        expect(@entry.elements["author/name"]).not_to be_nil              
       end
     end
     
@@ -102,7 +101,7 @@ describe "catalog/index" do
         @entry = @response_xml.elements.to_a("/feed/entry")[1]
       end
       it "should not have an author tag" do
-        @entry.elements["author/name"].should be_nil
+        expect(@entry.elements["author/name"]).to be_nil
       end
     end
   end
@@ -113,10 +112,10 @@ describe "catalog/index" do
         @entry = @response_xml.elements.to_a("/feed/entry")[0]
       end
       it "should include a link rel tag" do
-        @entry.to_s.should have_selector("link[rel=alternate][type='application/marc']")
+        expect(@entry.to_s).to have_selector("link[rel=alternate][type='application/marc']")
       end
       it "should have content embedded" do
-        @entry.to_s.should have_selector("content")
+        expect(@entry.to_s).to have_selector("content")
       end
     end
     describe "for an entry with NO content available" do
@@ -124,7 +123,7 @@ describe "catalog/index" do
         @entry = @response_xml.elements.to_a("/feed/entry")[5]
       end
       it "should include content" do
-        @entry.to_s.should_not have_selector("content[type='application/marc']")
+        expect(@entry.to_s).to_not have_selector("content[type='application/marc']")
       end
     end
   end

data/spec/views/catalog/index.html.erb_spec.rb

@@ -23,7 +23,7 @@ describe "catalog/index.html.erb" do
     view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
     view.stub(:has_search_parameters?).and_return(true)
     view.stub(:render_opensearch_response_metadata).and_return("")
-    view.stub(:response_has_no_search_results?).and_return(true)
+    assign(:response, double(:empty? => true))
     render
     expect(rendered).to match /header_content/
   end

data/spec/views/catalog/show.html.erb_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe "catalog/show.html.erb" do
+
+  let :document do
+    SolrDocument.new :id => 'xyz', :format => 'a'
+  end
+
+  let :blacklight_config do
+    Blacklight::Configuration.new
+  end
+
+  before :each do
+    view.stub(:has_user_authentication_provider? => false)
+    view.stub(:render_document_sidebar_partial => "Sidebar")
+  end
+
+  it "should include schema.org itemscope/type properties" do
+    view.stub(:document_show_html_title).and_return("Heading")
+    document.stub(:itemtype => 'some-item-type-uri')
+    assign :document, document
+    view.stub(:blacklight_config).and_return(blacklight_config)
+    render
+
+    expect(rendered).to have_selector('div#document[@itemscope]')
+    expect(rendered).to have_selector('div#document[@itemtype="some-item-type-uri"]')
+  end
+
+  it "should render the show_header and show partials by default" do
+    view.stub(:render_grouped_response?).and_return(false)
+    view.stub(:blacklight_config).and_return(blacklight_config)
+    stub_template "catalog/_show_header_default.html.erb" => "document_header"
+    stub_template "catalog/_show_default.html.erb" => "show_default"
+    
+    assign :document, document
+    render
+
+    expect(rendered).to match /document_header/
+    expect(rendered).to match /show_default/
+  end
+
+
+  it "should use the show.partials parameter to determine the partials to render" do
+    view.stub(:render_grouped_response?).and_return(false)
+    view.stub(:blacklight_config).and_return(blacklight_config)
+    blacklight_config.show.partials = ['a', 'b', 'c']
+    stub_template "catalog/_a_default.html.erb" => "a_partial"
+    stub_template "catalog/_b_default.html.erb" => "b_partial"
+    stub_template "catalog/_c_default.html.erb" => "c_partial"
+    assign :document, document
+    render
+    expect(rendered).to match /a_partial/
+    expect(rendered).to match /b_partial/
+    expect(rendered).to match /c_partial/
+  end
+end