blacklight 5.5.1 → 5.5.2

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

@@ -6,15 +6,15 @@ describe "/catalog/_show_sidebar.html.erb" do
 
   before(:each) do
 
-    view.stub(:blacklight_config).and_return(CatalogController.blacklight_config)
-    view.stub(:has_user_authentication_provider?).and_return(false)
-    view.stub(:current_search_session).and_return nil
-    view.stub(:search_session).and_return({})
+    allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+    allow(view).to receive(:has_user_authentication_provider?).and_return(false)
+    allow(view).to receive(:current_search_session).and_return nil
+    allow(view).to receive(:search_session).and_return({})
   end
 
   it "should show more-like-this titles in the sidebar" 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' })])
+  	allow(@document).to receive(:more_like_this).and_return([SolrDocument.new({ 'id' => '2', 'title_display' => 'Title of MLT Document' })])
     render
     expect(rendered).to include_text("More Like This")
     expect(rendered).to include_text("Title of MLT Document")

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

@@ -7,7 +7,7 @@ describe "catalog/_sort_and_per_page" do
   end
 
   before do
-    view.stub(blacklight_config: blacklight_config)
+    allow(view).to receive_messages(blacklight_config: blacklight_config)
   end
 
   it "should render the pagination, sort, per page and view type controls" do

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

@@ -18,10 +18,10 @@ describe "catalog/_thumbnail_default" do
 
   before do
     assign :response, double(:params => {})
-    view.stub(:render_grouped_response?).and_return false
-    view.stub(:blacklight_config).and_return(blacklight_config)
-    view.stub(:current_search_session).and_return nil
-    view.stub(:search_session).and_return({})
+    allow(view).to receive(:render_grouped_response?).and_return false
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:current_search_session).and_return nil
+    allow(view).to receive(:search_session).and_return({})
   end
 
   it "should render the thumbnail if the document has one" do

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

@@ -7,15 +7,17 @@ describe "catalog/_view_type_group" do
   end
 
   before do
-    view.stub(blacklight_config: blacklight_config)
+    allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
   end
 
   it "should not display the group when there's only one option" do
+    assign(:response, [])
     render partial: 'catalog/view_type_group'
     expect(rendered).to be_empty
   end
 
   it "should display the group" do
+    assign(:response, [double])
     blacklight_config.configure do |config|
       config.view.delete(:list)
       config.view.a 
@@ -31,6 +33,7 @@ describe "catalog/_view_type_group" do
 
 
   it "should set the current view to 'active'" do
+    assign(:response, [double])
     blacklight_config.configure do |config|
       config.view.delete(:list)
       config.view.a 
@@ -42,4 +45,4 @@ describe "catalog/_view_type_group" do
     expect(rendered).to have_selector('.btn', :text => 'B')
   end
 
-end
+end

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

@@ -5,26 +5,26 @@ describe 'catalog/facet.html.erb' do
   let(:blacklight_config) { Blacklight::Configuration.new }
   before :each do
     blacklight_config.add_facet_field 'xyz', label: "Facet title"
-    view.stub(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     stub_template 'catalog/_facet_pagination.html.erb' => 'pagination'
     assign :facet, blacklight_config.facet_fields['xyz']
     assign :display_facet, display_facet
   end
 
   it "should have the facet title" do
-    view.stub(:render_facet_limit)
+    allow(view).to receive(:render_facet_limit)
     render
     expect(rendered).to have_selector 'h3', text: "Facet title"
   end
 
   it "should render facet pagination" do
-    view.stub(:render_facet_limit)
+    allow(view).to receive(:render_facet_limit)
     render
     expect(rendered).to have_content 'pagination'
   end
 
   it "should render the facet limit" do
-    view.should_receive(:render_facet_limit).with(display_facet, layout: false)
+    allow(view).to receive(:render_facet_limit).with(display_facet, layout: false)
     render
   end
-end
+end

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

@@ -29,8 +29,8 @@ describe "catalog/index" do
     # but okay. 
 
     params.merge!( @params )
-    view.stub(:blacklight_config).and_return(@config)
-    view.stub(:search_field_options_for_select).and_return([])
+    allow(view).to receive(:blacklight_config).and_return(@config)
+    allow(view).to receive(:search_field_options_for_select).and_return([])
 
     render :template => 'catalog/index', :formats => [:atom] 
 

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

@@ -4,8 +4,8 @@ describe "catalog/index.html.erb" do
 
   describe "with no search parameters" do
     before do
-      view.stub(:has_search_parameters?).and_return(false)
-      view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
+      allow(view).to receive(:has_search_parameters?).and_return(false)
+      allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
     end
     it "should render the sidebar and content panes" do
       render
@@ -22,12 +22,12 @@ describe "catalog/index.html.erb" do
 
   describe "with search parameters" do
     before do
-      view.stub(:has_search_parameters?).and_return(true)
+      allow(view).to receive(:has_search_parameters?).and_return(true)
       stub_template "catalog/_results_pagination.html.erb" => ""
       stub_template "catalog/_search_header.html.erb" => "header_content"
 
-      view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
-      view.stub(:render_opensearch_response_metadata).and_return("")
+      allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
+      allow(view).to receive(:render_opensearch_response_metadata).and_return("")
       assign(:response, double(:empty? => true))
     end
     it "should render the search_header partial " do

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

@@ -11,14 +11,14 @@ describe "catalog/show.html.erb" do
   end
 
   before :each do
-    view.stub(:has_user_authentication_provider? => false)
-    view.stub(:render_document_sidebar_partial => "Sidebar")
+    allow(view).to receive_messages(:has_user_authentication_provider? => false)
+    allow(view).to receive_messages(:render_document_sidebar_partial => "Sidebar")
     assign :document, document
-    view.stub(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
   end
 
   it "should set the @page_title" do
-    view.stub(:document_show_html_title).and_return("Heading")
+    allow(view).to receive(:document_show_html_title).and_return("Heading")
     render
     page_title = view.instance_variable_get(:@page_title)
     expect(page_title).to eq "Heading - Blacklight"
@@ -26,8 +26,8 @@ describe "catalog/show.html.erb" do
   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')
+    allow(view).to receive(:document_show_html_title).and_return("Heading")
+    allow(document).to receive_messages(:itemtype => 'some-item-type-uri')
     render
 
     expect(rendered).to have_selector('div#document[@itemscope]')
@@ -35,7 +35,7 @@ describe "catalog/show.html.erb" do
   end
 
   it "should render the show_header and show partials by default" do
-    view.stub(:render_grouped_response?).and_return(false)
+    allow(view).to receive(:render_grouped_response?).and_return(false)
     stub_template "catalog/_show_header_default.html.erb" => "document_header"
     stub_template "catalog/_show_default.html.erb" => "show_default"
     
@@ -47,7 +47,7 @@ describe "catalog/show.html.erb" do
 
 
   it "should use the show.partials parameter to determine the partials to render" do
-    view.stub(:render_grouped_response?).and_return(false)
+    allow(view).to receive(:render_grouped_response?).and_return(false)
     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"

data/tasks/blacklight.rake

@@ -1,4 +1,4 @@
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.6.0.zip"
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.9.0.zip"
 
 require 'jettywrapper'
 require 'engine_cart/rake_task'
@@ -41,4 +41,3 @@ namespace :blacklight do
   task :generate => ['engine_cart:generate'] do
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.5.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement