blacklight 5.5.1 → 5.5.2

data/spec/lib/document_presenter_spec.rb

@@ -22,71 +22,71 @@ describe Blacklight::DocumentPresenter do
       end
     end
     it "should check for an explicit value" do
-      document.should_not_receive(:get).with('asdf', :sep => nil)
+      expect(document).to_not receive(:get).with('asdf', :sep => nil)
       value = subject.render_index_field_value 'asdf', :value => 'asdf'
       expect(value).to eq 'asdf'
     end
 
     it "should check for a helper method to call" do
-      document.should_receive(:get).with('asdf', :sep => nil)
-      request_context.stub(:render_asdf_index_field).and_return('custom asdf value')
+      allow(document).to receive(:get).with('asdf', :sep => nil)
+      allow(request_context).to receive(:render_asdf_index_field).and_return('custom asdf value')
       value = subject.render_index_field_value 'asdf'
       expect(value).to eq 'custom asdf value'
     end
 
     it "should check for a link_to_search" do
-      document.should_receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
-      request_context.should_receive(:add_facet_params).and_return(:f => { :link_to_search_true => ['x'] })
-      request_context.should_receive(:search_action_path).with(:f => { :link_to_search_true => ['x'] }).and_return('/foo')
-      request_context.should_receive(:link_to).with("x", '/foo').and_return('bar')
+      allow(document).to receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
+      allow(request_context).to receive(:add_facet_params).and_return(:f => { :link_to_search_true => ['x'] })
+      allow(request_context).to receive(:search_action_path).with(:f => { :link_to_search_true => ['x'] }).and_return('/foo')
+      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       value = subject.render_index_field_value 'link_to_search_true'
       expect(value).to eq 'bar'
     end
 
     it "should check for a link_to_search with a field name" do
-      document.should_receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
-      request_context.should_receive(:add_facet_params).and_return(:f => { :some_field => ['x'] })
-      request_context.should_receive(:search_action_path).with(:f => { :some_field => ['x'] }).and_return('/foo')
-      request_context.should_receive(:link_to).with("x", '/foo').and_return('bar')
+      allow(document).to receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
+      allow(request_context).to receive(:add_facet_params).and_return(:f => { :some_field => ['x'] })
+      allow(request_context).to receive(:search_action_path).with(:f => { :some_field => ['x'] }).and_return('/foo')
+      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       value = subject.render_index_field_value 'link_to_search_named'
       expect(value).to eq 'bar'
     end
 
     it "should gracefully handle when no highlight field is available" do
-      document.should_not_receive(:get)
-      document.should_receive(:has_highlight_field?).and_return(false)
+      expect(document).to_not receive(:get)
+      allow(document).to receive(:has_highlight_field?).and_return(false)
       value = subject.render_index_field_value 'highlight'
       expect(value).to be_blank
     end
 
     it "should check for a highlighted field" do
-      document.should_not_receive(:get)
-      document.should_receive(:has_highlight_field?).and_return(true)
-      document.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      expect(document).to_not receive(:get)
+      allow(document).to receive(:has_highlight_field?).and_return(true)
+      allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = subject.render_index_field_value 'highlight'
       expect(value).to eq '<em>highlight</em>'
     end
 
     it "should check the document field value" do
-      document.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
+      allow(document).to receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = subject.render_index_field_value 'qwer'
       expect(value).to eq 'document qwer value'
     end
 
     it "should work with index fields that aren't explicitly defined" do
-      document.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
+      allow(document).to receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = subject.render_index_field_value 'mnbv'
       expect(value).to eq 'document mnbv value'
     end
 
     it "should call an accessor on the solr document" do
-      document.stub(:solr_doc_accessor => "123")
+      allow(document).to receive_messages(:solr_doc_accessor => "123")
       value = subject.render_index_field_value 'solr_doc_accessor'
       expect(value).to eq "123"
     end
 
     it "should call an explicit accessor on the solr document" do
-      document.stub(:solr_doc_accessor => "123")
+      allow(document).to receive_messages(:solr_doc_accessor => "123")
       value = subject.render_index_field_value 'explicit_accessor'
       expect(value).to eq "123"
     end
@@ -114,77 +114,77 @@ describe Blacklight::DocumentPresenter do
     end
 
     it "should check for an explicit value" do
-      document.should_not_receive(:get).with('asdf', :sep => nil)
-      request_context.should_not_receive(:render_asdf_document_show_field)
+      expect(document).to_not receive(:get).with('asdf', :sep => nil)
+      expect(request_context).to_not receive(:render_asdf_document_show_field)
       value = subject.render_document_show_field_value 'asdf', :value => 'val1'
       expect(value).to eq 'val1'
     end
 
     it "should check for a helper method to call" do
-      document.should_receive(:get).with('asdf', :sep => nil)
-      request_context.stub(:render_asdf_document_show_field).and_return('custom asdf value')
+      allow(document).to receive(:get).with('asdf', :sep => nil)
+      allow(request_context).to receive(:render_asdf_document_show_field).and_return('custom asdf value')
       value = subject.render_document_show_field_value 'asdf'
       expect(value).to eq 'custom asdf value'
     end
 
     it "should check for a link_to_search" do
-      document.should_receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
-      request_context.should_receive(:search_action_path).with('').and_return('/foo')
-      request_context.should_receive(:link_to).with("x", '/foo').and_return('bar')
+      allow(document).to receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
+      allow(request_context).to receive(:search_action_path).with('').and_return('/foo')
+      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       value = subject.render_document_show_field_value 'link_to_search_true'
       expect(value).to eq 'bar'
     end
 
     it "should check for a link_to_search with a field name" do
-      document.should_receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
-      request_context.should_receive(:search_action_path).with('').and_return('/foo')
-      request_context.should_receive(:link_to).with("x", '/foo').and_return('bar')
+      allow(document).to receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
+      allow(request_context).to receive(:search_action_path).with('').and_return('/foo')
+      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
       value = subject.render_document_show_field_value 'link_to_search_named'
       expect(value).to eq 'bar'
     end
 
     it "should gracefully handle when no highlight field is available" do
-      document.should_not_receive(:get)
-      document.should_receive(:has_highlight_field?).and_return(false)
+      expect(document).to_not receive(:get)
+      allow(document).to receive(:has_highlight_field?).and_return(false)
       value = subject.render_document_show_field_value 'highlight'
       expect(value).to be_blank
     end
 
     it "should check for a highlighted field" do
-      document.should_not_receive(:get)
-      document.should_receive(:has_highlight_field?).and_return(true)
-      document.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      expect(document).to_not receive(:get)
+      allow(document).to receive(:has_highlight_field?).and_return(true)
+      allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = subject.render_document_show_field_value 'highlight'
       expect(value).to eq '<em>highlight</em>'
     end
 
 
     it "should check the document field value" do
-      document.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
+      allow(document).to receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = subject.render_document_show_field_value 'qwer'
       expect(value).to eq 'document qwer value'
     end
 
     it "should work with show fields that aren't explicitly defined" do
-      document.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
+      allow(document).to receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = subject.render_document_show_field_value 'mnbv'
       expect(value).to eq 'document mnbv value'
     end
 
     it "should call an accessor on the solr document" do
-      document.stub(:solr_doc_accessor => "123")
+      allow(document).to receive_messages(:solr_doc_accessor => "123")
       value = subject.render_document_show_field_value 'solr_doc_accessor'
       expect(value).to eq "123"
     end
 
     it "should call an explicit accessor on the solr document" do
-      document.stub(:solr_doc_accessor => "123")
+      allow(document).to receive_messages(:solr_doc_accessor => "123")
       value = subject.render_document_show_field_value 'explicit_accessor'
       expect(value).to eq "123"
     end
 
     it "should call an explicit array-style accessor on the solr document" do
-      document.stub(:solr_doc_accessor => double(:some_method => "123"))
+      allow(document).to receive_messages(:solr_doc_accessor => double(:some_method => "123"))
       value = subject.render_document_show_field_value 'explicit_array_accessor'
       expect(value).to eq "123"
     end
@@ -201,7 +201,7 @@ describe Blacklight::DocumentPresenter do
     end
 
     it "should join values using the field_value_separator" do
-      subject.stub(:field_value_separator).and_return(" -- ")
+      allow(subject).to receive(:field_value_separator).and_return(" -- ")
       expect(subject.render_field_value(['a', 'b'])).to eq "a -- b"
     end
 

data/spec/lib/tasks/blacklight_task_spec.rb

@@ -14,7 +14,7 @@ describe "blacklight:delete_old_searches" do
   
   it "should call Search.delete_old_searches" do
     days_old = 7
-    Search.should_receive(:delete_old_searches).with(days_old)  
+    allow(Search).to receive(:delete_old_searches).with(days_old)  
     @rake[@task_name].invoke(days_old)
   end
     

data/spec/models/record_mailer_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe RecordMailer do
   before(:each) do
-    RecordMailer.stub(:default) { { :from => 'no-reply@projectblacklight.org' } }
+    allow(RecordMailer).to receive(:default) { { :from => 'no-reply@projectblacklight.org' } }
     SolrDocument.use_extension( Blacklight::Solr::Document::Email )
     SolrDocument.use_extension( Blacklight::Solr::Document::Sms )
     document = SolrDocument.new({:id=>"123456", :format=>["book"], :title_display => "The horn", :language_facet => "English", :author_display => "Janetzky, Kurt"})

data/spec/models/search_spec.rb

@@ -14,7 +14,7 @@ describe Search do
     it "should return a Hash as the value" do
       @search.query_params = @query_params
       assert @search.save
-      Search.find(@search.id).query_params.should == @query_params
+      expect(Search.find(@search.id).query_params).to eq @query_params
     end
   end
   

data/spec/routing/catalog_routing_spec.rb

@@ -34,7 +34,7 @@ describe "Routing" do
       end
 
       it "should route url-like ids" do
-        pending "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
+        skip "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
         expect(:get => catalog_path(SolrDocument.new(:id => 'http://example.com'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'http://example.com')
       end
 
@@ -47,7 +47,7 @@ describe "Routing" do
       end
 
       it "should route ids with a literal '/" do
-        pending "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
+        skip "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
         expect(:get => catalog_path(SolrDocument.new(:id => 'and/or'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'and/or')
       end
     end

data/spec/spec_helper.rb

@@ -23,6 +23,7 @@ EngineCart.load_application!
 
 require 'rspec/rails'
 require 'rspec/its'
+require 'rspec/collection_matchers'
 require 'capybara/rspec'
 require 'capybara/poltergeist'
 

data/spec/support/include_text.rb

@@ -8,14 +8,13 @@ module RSpec::Rails
         @content.include?(text)
       end
 
-      failure_message_for_should do |text|
+      failure_message do |text|
         "expected '#{@content}' to contain '#{text}'"
       end
 
-      failure_message_for_should_not do |text|
+      failure_message_when_negated do |text|
         "expected #{@content} to not contain '#{text}'"
       end
     end
   end
 end
-

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

@@ -8,25 +8,25 @@ describe "catalog/constraints" do
   end
 
   it "should render nothing if no constraints are set" do
-    view.stub(query_has_constraints?: false)
+    allow(view).to receive_messages(query_has_constraints?: false)
     render partial: "catalog/constraints"
     expect(rendered).to be_empty
   end
 
   it "should render a start over link" do
-    view.should_receive(:search_action_path).with({}).and_return('http://xyz')
-    view.stub(query_has_constraints?: true)
-    view.stub(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:search_action_path).with({}).and_return('http://xyz')
+    allow(view).to receive_messages(query_has_constraints?: true)
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     render partial: "catalog/constraints"
     expect(rendered).to have_selector("#startOverLink")
     expect(rendered).to have_link("Start Over", :href => 'http://xyz')
   end
 
   it "should render a start over link with the current view type" do
-    view.should_receive(:search_action_path).with(view: :xyz).and_return('http://xyz?view=xyz')
-    view.stub(query_has_constraints?: true)
+    allow(view).to receive(:search_action_path).with(view: :xyz).and_return('http://xyz?view=xyz')
+    allow(view).to receive_messages(query_has_constraints?: true)
     params[:view] = 'xyz'
-    view.stub(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     render partial: "catalog/constraints"
     expect(rendered).to have_selector("#startOverLink")
     expect(rendered).to have_link("Start Over", :href => 'http://xyz?view=xyz')

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

@@ -10,8 +10,8 @@ describe "catalog/_document" do
   end
 
   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)
+    allow(view).to receive(:render_grouped_response?).and_return(false)
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     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"
@@ -25,8 +25,8 @@ describe "catalog/_document" do
 
 
   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)
+    allow(view).to receive(:render_grouped_response?).and_return(false)
+    allow(view).to receive(: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"

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

@@ -13,7 +13,7 @@ describe "catalog/facet_layout" do
   end
 
   before do
-    view.stub(blacklight_config: blacklight_config)
+    allow(view).to receive_messages(blacklight_config: blacklight_config)
   end
 
   it "should have a facet-specific class" do
@@ -33,7 +33,7 @@ describe "catalog/facet_layout" do
   end
 
   it "should be configured to be open by default" do
-    facet_field.stub(collapse: false)
+    allow(facet_field).to receive_messages(collapse: false)
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to_not have_selector '.panel-heading.collapsed'
     expect(rendered).to have_selector '.in .panel-body'

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

@@ -4,15 +4,15 @@ describe "catalog/_facets" do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
-    view.stub(blacklight_config: blacklight_config)
-    view.stub(:search_action_path) do |*args|
+    allow(view).to receive_messages(blacklight_config: blacklight_config)
+    allow(view).to receive(:search_action_path) do |*args|
       catalog_index_url *args
     end
   end
 
   context "without any facet fields" do
     it "should not have a header if no facets are displayed" do
-      view.stub(:render_facet_partials => '')
+      allow(view).to receive_messages(:render_facet_partials => '')
       render
       expect(rendered).to_not have_selector('h4')
     end
@@ -27,15 +27,15 @@ describe "catalog/_facets" do
       blacklight_config.facet_fields['facet_field_1'] = facet_field
 
         @mock_display_facet_1 = double(:name => 'facet_field_1', sort: nil, offset: nil, :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
-        view.stub(:facet_field_names => [:facet_field_1],
+        allow(view).to receive_messages(:facet_field_names => [:facet_field_1],
                   :facet_limit_for => 10 )
 
         @response = double()
-        @response.stub(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
+        allow(@response).to receive(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
     end
 
     it "should have a header" do
-      view.stub(:render_facet_partials => '')
+      allow(view).to receive_messages(:render_facet_partials => '')
       render
       expect(rendered).to have_selector('h4')
     end

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

@@ -21,24 +21,24 @@ describe "/catalog/_index_default.erb" do
     @fname_4 = "four_field"
     
     @document = double("solr_doc")
-    @document.stub(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
-    @document.stub(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
-    @document.stub(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
-    @document.stub(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
+    allow(@document).to receive(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
+    allow(@document).to receive(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
+    allow(@document).to receive(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
+    allow(@document).to receive(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
     
-    @document.stub(:has?).with(@fname_1).and_return(true)
-    @document.stub(:has?).with(@fname_2).and_return(true)
-    @document.stub(:has?).with(@fname_3).and_return(false)
-    @document.stub(:has?).with(@fname_4).and_return(true)
+    allow(@document).to receive(:has?).with(@fname_1).and_return(true)
+    allow(@document).to receive(:has?).with(@fname_2).and_return(true)
+    allow(@document).to receive(:has?).with(@fname_3).and_return(false)
+    allow(@document).to receive(:has?).with(@fname_4).and_return(true)
     
     # cover any remaining fields in initalizer
-    @document.stub(:[])
+    allow(@document).to receive(:[])
     
     @flabel_1 = "One:"
     @flabel_3 = "Three:"
     @flabel_4 = "Four:"
 
-    view.stub(:blacklight_config).and_return(@config)
+    allow(view).to receive(:blacklight_config).and_return(@config)
     assigns[:document] = @document
     @rendered = view.render_document_partial @document, :index
   end

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

@@ -11,11 +11,11 @@ describe "catalog/_index_header_default" do
 
   it "should render the document header" do
     assign :response, double(:params => {})
-    view.stub(:current_search_session).and_return nil
-    view.stub(:search_session).and_return({})
-    view.stub(:render_grouped_response?).and_return false
-    view.stub(:blacklight_config).and_return(blacklight_config)
-    view.stub(:render_bookmarks_control?).and_return false
+    allow(view).to receive(:current_search_session).and_return nil
+    allow(view).to receive(: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(:render_bookmarks_control?).and_return false
     render :partial => "catalog/index_header_default", :locals => {:document => document, :document_counter => 1}
     expect(rendered).to have_selector('.document-counter', text: "2")
   end

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

@@ -23,24 +23,24 @@ describe "/catalog/_show_default.html.erb" do
     @fname_4 = "four_field"
     
     @document = double("solr_doc")
-    @document.stub(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
-    @document.stub(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
-    @document.stub(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
-    @document.stub(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
+    allow(@document).to receive(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
+    allow(@document).to receive(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
+    allow(@document).to receive(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
+    allow(@document).to receive(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
     
-    @document.stub(:'has?').with(@fname_1).and_return(true)
-    @document.stub(:'has?').with(@fname_2).and_return(true)
-    @document.stub(:'has?').with(@fname_3).and_return(false)
-    @document.stub(:'has?').with(@fname_4).and_return(true)
+    allow(@document).to receive(:has?).with(@fname_1).and_return(true)
+    allow(@document).to receive(:has?).with(@fname_2).and_return(true)
+    allow(@document).to receive(:has?).with(@fname_3).and_return(false)
+    allow(@document).to receive(:has?).with(@fname_4).and_return(true)
     
     # cover any remaining fields in initalizer
-    @document.stub(:[])
+    allow(@document).to receive(:[])
     
     @flabel_1 = "One:"
     @flabel_3 = "Two:"
     @flabel_4 = "Four:"
 
-    view.stub(:blacklight_config).and_return(@config)
+    allow(view).to receive(:blacklight_config).and_return(@config)
     assigns[:document] = @document
     @rendered = view.render_document_partial @document, :show
   end