blacklight 5.5.1 → 5.5.2

data/spec/features/alternate_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Alternate Controller Behaviors" do
   it "should have the correct per-page form" do
     visit alternate_index_path
-    page.should have_selector("form[action='#{alternate_index_url}']")
+    expect(page).to have_selector("form[action='#{alternate_index_url}']")
     fill_in "q", :with=>"history"
     click_button 'search'
     expect(current_path).to match /#{alternate_index_path}/
@@ -15,7 +15,7 @@ describe "Alternate Controller Behaviors" do
 
   it "should have the correct search field form" do
     visit alternate_index_path
-    page.should have_selector("form[action='#{alternate_index_url}']")
+    expect(page).to have_selector("form[action='#{alternate_index_url}']")
     fill_in "q", :with=>"history"
     click_button 'search'
     expect(current_path).to match /#{alternate_index_path}/
@@ -25,7 +25,7 @@ describe "Alternate Controller Behaviors" do
 
   it "should display document thumbnails" do
     visit alternate_index_path
-    page.should have_selector("form[action='#{alternate_index_url}']")
+    expect(page).to have_selector("form[action='#{alternate_index_url}']")
     fill_in "q", :with=>"history"
     click_button 'search'
     expect(page).to have_selector ".document-thumbnail"

data/spec/features/record_view_spec.rb

@@ -34,7 +34,7 @@ describe "Record View" do
   end
   it "should not display 404" do
     visit catalog_path('this_id_does_not_exist')
-    page.driver.status_code.should == 404
+    expect(page.driver.status_code).to eq 404
     expect(page).to have_content "The page you were looking for doesn't exist." 
   end
 end

data/spec/features/search_filters_spec.rb

@@ -167,14 +167,14 @@ describe "Facets" do
     end
   end
   it "should be collapsed when not selected", :js => true do
-    pending("Test passes locally but not on Travis.") if ENV['TRAVIS']
+    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
     within(".blacklight-subject_topic_facet") do
       expect(page).not_to have_selector(".panel-collapse", :visible => true)
     end
   end
   it "should expand when the heading is clicked", :js => true do
-    pending("Test passes locally but not on Travis.") if ENV['TRAVIS']
+    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
     within(".blacklight-subject_topic_facet") do
       expect(page).not_to have_selector(".panel-collapse", :visible => true)
@@ -183,7 +183,7 @@ describe "Facets" do
     end
   end
   it "should expand when the anchor is clicked", :js => true do
-    pending("Test passes locally but not on Travis.") if ENV['TRAVIS']
+    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
     within(".blacklight-subject_topic_facet") do
       expect(page).not_to have_selector(".panel-collapse", :visible => true)
@@ -192,7 +192,7 @@ describe "Facets" do
     end
   end
   it "should keep selected facets expanded on page load", :js => true do
-    pending("Test passes locally but not on Travis.") if ENV['TRAVIS']
+    skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
     within(".blacklight-subject_topic_facet") do
       click_link "Topic"

data/spec/features/search_results_spec.rb

@@ -5,33 +5,33 @@ require 'spec_helper'
 describe "Search Results" do
   it "should have for an empty query" do
     search_for ''
-    number_of_results_from_page(page).should == 30
-    page.should have_xpath("//a[contains(@href, #{2007020969})]")
+    expect(number_of_results_from_page(page)).to eq 30
+    expect(page).to have_xpath("//a[contains(@href, #{2007020969})]")
     search_for 'korea'
-    number_of_results_from_page(page).should == 4
+    expect(number_of_results_from_page(page)).to eq 4
   end
 
   it "should find same result set with or without diacritcs" do
     search_for 'inmul'
-    number_of_results_from_page(page).should == 1
-    page.should have_xpath("//a[contains(@href, #{77826928})]")
+    expect(number_of_results_from_page(page)).to eq 1
+    expect(page).to have_xpath("//a[contains(@href, #{77826928})]")
 
     search_for 'inmül'
-    number_of_results_from_page(page).should == 1
+    expect(number_of_results_from_page(page)).to eq 1
   end
   it "should find same result set for a case-insensitive query " do
     search_for 'inmul'
-    number_of_results_from_page(page).should == 1
-    page.should have_xpath("//a[contains(@href, #{77826928})]")
+    expect(number_of_results_from_page(page)).to eq 1
+    expect(page).to have_xpath("//a[contains(@href, #{77826928})]")
 
     search_for 'INMUL'
-    number_of_results_from_page(page).should == 1
+    expect(number_of_results_from_page(page)).to eq 1
   end
 
   it "should order by relevancy" do
     search_for "Korea"
-    position_in_result_page(page, '77826928').should == 1
-    position_in_result_page(page, '94120425').should == 2
+    expect(position_in_result_page(page, '77826928')).to eq 1
+    expect(position_in_result_page(page, '94120425')).to eq 2
     
   end
 
@@ -39,7 +39,7 @@ describe "Search Results" do
     visit root_path
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
-    page.should have_xpath("//link[contains(@rel, 'search')]")
+    expect(page).to have_xpath("//link[contains(@rel, 'search')]")
     expect(page.find(:xpath, "//link[contains(@rel, 'search')]")[:href]).to eq "http://www.example.com/catalog/opensearch.xml"
     Capybara.ignore_hidden_elements = tmp_value
   end

data/spec/helpers/blacklight_helper_spec.rb

@@ -12,7 +12,7 @@ describe BlacklightHelper do
   end
 
   before(:each) do
-    helper.stub(:search_action_path) do |*args|
+    allow(helper).to receive(:search_action_path) do |*args|
       catalog_index_url *args
     end
   end
@@ -23,9 +23,8 @@ describe BlacklightHelper do
 
   describe "#application_name", :test => true do
     it "should use the Rails application config application_name if available" do
-      Rails.application.config.stub(:application_name => 'asdf')
-      Rails.application.config.should_receive(:respond_to?).with(:application_name).and_return(true)
-      expect(application_name).to eq 'asdf'
+      allow(Rails.application).to receive(:config).and_return(double(application_name: "asdf"))
+      expect(application_name).to eq "asdf"
     end
     it "should default to 'Blacklight'" do
       expect(application_name).to eq "Blacklight"
@@ -70,7 +69,7 @@ describe BlacklightHelper do
       @doc_id = "MOCK_ID1"
       @document = MockDocumentAppHelper.new(:id => @doc_id)
       render_params = {:controller => "controller", :action => "action"}
-      helper.stub(:params).and_return(render_params)
+      allow(helper).to receive(:params).and_return(render_params)
     end
     it "generates <link rel=alternate> tags" do
 
@@ -79,7 +78,7 @@ describe BlacklightHelper do
       tmp_value = Capybara.ignore_hidden_elements
       Capybara.ignore_hidden_elements = false
       @document.export_formats.each_pair do |format, spec|
-        response.should have_selector("link[href$='.#{ format  }']") do |matches|
+        expect(response).to have_selector("link[href$='.#{ format  }']") do |matches|
           expect(matches).to have(1).match
           tag = matches[0]
           expect(tag.attributes["rel"].value).to eq "alternate"
@@ -119,10 +118,10 @@ describe BlacklightHelper do
       end
 
       @document = SolrDocument.new('title_display' => "A Fake Document", 'id'=>'8')
-      helper.stub(:blacklight_config).and_return(@config)
-      helper.stub(:has_user_authentication_provider?).and_return(true)
-      helper.stub(:current_or_guest_user).and_return(User.new)
-      helper.stub(current_bookmarks: [])
+      allow(helper).to receive(:blacklight_config).and_return(@config)
+      allow(helper).to receive(:has_user_authentication_provider?).and_return(true)
+      allow(helper).to receive(:current_or_guest_user).and_return(User.new)
+      allow(helper).to receive_messages(current_bookmarks: [])
     end
     describe "render_index_doc_actions" do
       it "should render partials" do
@@ -140,43 +139,43 @@ describe BlacklightHelper do
   
   describe "#should_render_index_field?" do
     before do
-      helper.stub(should_render_field?: true, document_has_value?: true)
+      allow(helper).to receive_messages(should_render_field?: true, document_has_value?: true)
     end
     
     it "should be true" do
-      expect(helper.should_render_index_field?(double, double)).to be_true
+      expect(helper.should_render_index_field?(double, double)).to be true
     end
     
     it "should be false if the document doesn't have a value for the field" do
-      helper.stub(document_has_value?: false)
-      expect(helper.should_render_index_field?(double, double)).to be_false
+      allow(helper).to receive_messages(document_has_value?: false)
+      expect(helper.should_render_index_field?(double, double)).to be false
       
     end
     
     it "should be false if the configuration has the field disabled" do
-      helper.stub(should_render_field?: false)
-      expect(helper.should_render_index_field?(double, double)).to be_false
+      allow(helper).to receive_messages(should_render_field?: false)
+      expect(helper.should_render_index_field?(double, double)).to be false
     end
   end
 
   describe "#should_render_show_field?" do
     before do
-      helper.stub(should_render_field?: true, document_has_value?: true)
+      allow(helper).to receive_messages(should_render_field?: true, document_has_value?: true)
     end
     
     it "should be true" do
-      expect(helper.should_render_show_field?(double, double)).to be_true
+      expect(helper.should_render_show_field?(double, double)).to be true
     end
     
     it "should be false if the document doesn't have a value for the field" do
-      helper.stub(document_has_value?: false)
-      expect(helper.should_render_show_field?(double, double)).to be_false
+      allow(helper).to receive_messages(document_has_value?: false)
+      expect(helper.should_render_show_field?(double, double)).to be false
       
     end
     
     it "should be false if the configuration has the field disabled" do
-      helper.stub(should_render_field?: false)
-      expect(helper.should_render_show_field?(double, double)).to be_false
+      allow(helper).to receive_messages(should_render_field?: false)
+      expect(helper.should_render_show_field?(double, double)).to be false
     end
   end
 
@@ -192,65 +191,65 @@ describe BlacklightHelper do
         config.add_index_field 'explicit_accessor', :accessor => :solr_doc_accessor
         config.add_index_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
       end
-      helper.stub(:blacklight_config).and_return(@config)
+      allow(helper).to receive(:blacklight_config).and_return(@config)
     end
 
     it "should check for an explicit value" do
       doc = double()
-      doc.should_not_receive(:get).with('asdf', :sep => nil)
+      expect(doc).to_not receive(:get).with('asdf', :sep => nil)
       value = helper.render_index_field_value :value => 'asdf', :document => doc, :field => 'asdf'
       expect(value).to eq 'asdf'
     end
 
     it "should check for a helper method to call" do
       doc = double()
-      doc.should_receive(:get).with('asdf', :sep => nil)
-      helper.stub(:render_asdf_index_field).and_return('custom asdf value')
+      allow(doc).to receive(:get).with('asdf', :sep => nil)
+      allow(helper).to receive(:render_asdf_index_field).and_return('custom asdf value')
       value = helper.render_index_field_value :document => doc, :field => 'asdf'
       expect(value).to eq 'custom asdf value'
     end
 
     it "should check for a link_to_search" do
       doc = double()
-      doc.should_receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
+      allow(doc).to receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
       value = helper.render_index_field_value :document => doc, :field => 'link_to_search_true'
       expect(value).to eq helper.link_to("x", helper.search_action_path(:f => { :link_to_search_true => ['x'] }))
     end
 
     it "should check for a link_to_search with a field name" do
       doc = double()
-      doc.should_receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
+      allow(doc).to receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
       value = helper.render_index_field_value :document => doc, :field => 'link_to_search_named'
       expect(value).to eq helper.link_to("x", helper.search_action_path(:f => { :some_field => ['x'] }))
     end
 
     it "should gracefully handle when no highlight field is available" do
       doc = double()
-      doc.should_not_receive(:get)
-      doc.should_receive(:has_highlight_field?).and_return(false)
+      expect(doc).to_not receive(:get)
+      allow(doc).to receive(:has_highlight_field?).and_return(false)
       value = helper.render_index_field_value :document => doc, :field => 'highlight'
       expect(value).to be_blank
     end
 
     it "should check for a highlighted field" do
       doc = double()
-      doc.should_not_receive(:get)
-      doc.should_receive(:has_highlight_field?).and_return(true)
-      doc.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      expect(doc).to_not receive(:get)
+      allow(doc).to receive(:has_highlight_field?).and_return(true)
+      allow(doc).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = helper.render_index_field_value :document => doc, :field => 'highlight'
       expect(value).to eq '<em>highlight</em>'
     end
 
     it "should check the document field value" do
       doc = double()
-      doc.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
+      allow(doc).to receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = helper.render_index_field_value :document => doc, :field => 'qwer'
       expect(value).to eq 'document qwer value'
     end
 
     it "should work with index fields that aren't explicitly defined" do
       doc = double()
-      doc.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
+      allow(doc).to receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = helper.render_index_field_value :document => doc, :field => 'mnbv'
       expect(value).to eq 'document mnbv value'
     end
@@ -289,52 +288,52 @@ describe BlacklightHelper do
         config.add_show_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
       end
 
-      helper.stub(:blacklight_config).and_return(@config)
+      allow(helper).to receive(:blacklight_config).and_return(@config)
     end
 
     it "should check for an explicit value" do
       doc = double()
-      doc.should_not_receive(:get).with('asdf', :sep => nil)
-      helper.should_not_receive(:render_asdf_document_show_field)
+      expect(doc).to_not receive(:get).with('asdf', :sep => nil)
+      expect(helper).to_not receive(:render_asdf_document_show_field)
       value = helper.render_document_show_field_value :value => 'asdf', :document => doc, :field => 'asdf'
       expect(value).to eq 'asdf'
     end
 
     it "should check for a helper method to call" do
       doc = double()
-      doc.should_receive(:get).with('asdf', :sep => nil)
-      helper.stub(:render_asdf_document_show_field).and_return('custom asdf value')
+      allow(doc).to receive(:get).with('asdf', :sep => nil)
+      allow(helper).to receive(:render_asdf_document_show_field).and_return('custom asdf value')
       value = helper.render_document_show_field_value :document => doc, :field => 'asdf'
       expect(value).to eq 'custom asdf value'
     end
 
     it "should check for a link_to_search" do
       doc = double()
-      doc.should_receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
+      allow(doc).to receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
       value = helper.render_document_show_field_value :document => doc, :field => 'link_to_search_true'
       expect(value).to eq helper.link_to("x", helper.search_action_path(:f => { :link_to_search_true => ['x'] }))
     end
 
     it "should check for a link_to_search with a field name" do
       doc = double()
-      doc.should_receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
+      allow(doc).to receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
       value = helper.render_document_show_field_value :document => doc, :field => 'link_to_search_named'
       expect(value).to eq helper.link_to("x", helper.search_action_path(:f => { :some_field => ['x'] }))
     end
 
     it "should gracefully handle when no highlight field is available" do
       doc = double()
-      doc.should_not_receive(:get)
-      doc.should_receive(:has_highlight_field?).and_return(false)
+      expect(doc).to_not receive(:get)
+      allow(doc).to receive(:has_highlight_field?).and_return(false)
       value = helper.render_document_show_field_value :document => doc, :field => 'highlight'
       expect(value).to be_blank
     end
 
     it "should check for a highlighted field" do
       doc = double()
-      doc.should_not_receive(:get)
-      doc.should_receive(:has_highlight_field?).and_return(true)
-      doc.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      expect(doc).to_not receive(:get)
+      allow(doc).to receive(:has_highlight_field?).and_return(true)
+      allow(doc).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = helper.render_document_show_field_value :document => doc, :field => 'highlight'
       expect(value).to eq '<em>highlight</em>'
     end
@@ -342,14 +341,14 @@ describe BlacklightHelper do
 
     it "should check the document field value" do
       doc = double()
-      doc.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
+      allow(doc).to receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = helper.render_document_show_field_value :document => doc, :field => 'qwer'
       expect(value).to eq 'document qwer value'
     end
 
     it "should work with show fields that aren't explicitly defined" do
       doc = double()
-      doc.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
+      allow(doc).to receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = helper.render_document_show_field_value :document => doc, :field => 'mnbv'
       expect(value).to eq 'document mnbv value'
     end
@@ -383,38 +382,38 @@ describe BlacklightHelper do
   describe "#document_has_value?" do
     it "should if the document has the field value" do
       doc = double()
-      doc.stub(:has?).with('asdf').and_return(true)
+      allow(doc).to receive(:has?).with('asdf').and_return(true)
       field_config = double(:field => 'asdf')
-      helper.document_has_value?(doc, field_config).should == true
+      expect(helper.document_has_value?(doc, field_config)).to eq true
     end
 
     it "should if the document has a highlight field value" do
       doc = double()
-      doc.stub(:has?).with('asdf').and_return(false)
-      doc.stub(:has_highlight_field?).with('asdf').and_return(true)
+      allow(doc).to receive(:has?).with('asdf').and_return(false)
+      allow(doc).to receive(:has_highlight_field?).with('asdf').and_return(true)
       field_config = double(:field => 'asdf', :highlight => true)
-      helper.document_has_value?(doc, field_config).should == true
+      expect(helper.document_has_value?(doc, field_config)).to eq true
     end
 
     it "should if the field has a model accessor" do
       doc = double()
-      doc.stub(:has?).with('asdf').and_return(false)
-      doc.stub(:has_highlight_field?).with('asdf').and_return(false)
+      allow(doc).to receive(:has?).with('asdf').and_return(false)
+      allow(doc).to receive(:has_highlight_field?).with('asdf').and_return(false)
       field_config = double(:field => 'asdf', :highlight => true, :accessor => true)
-      helper.document_has_value?(doc, field_config).should == true
+      expect(helper.document_has_value?(doc, field_config)).to eq true
     end
   end
 
   describe "render_grouped_response?" do
     it "should check if the response ivar contains grouped data" do
       assign(:response, double("SolrResponse", :grouped? => true))
-      expect(helper.render_grouped_response?).to be_true
+      expect(helper.render_grouped_response?).to be true
     end
 
 
     it "should check if the response param contains grouped data" do
       response = double("SolrResponse", :grouped? => true)
-      expect(helper.render_grouped_response?(response)).to be_true
+      expect(helper.render_grouped_response?(response)).to be true
     end
   end
 
@@ -424,14 +423,14 @@ describe BlacklightHelper do
 
   describe "render_field_value" do
     before do
-      Deprecation.stub(:warn)
+      allow(Deprecation).to receive(:warn)
     end
     it "should join and html-safe values" do
       expect(helper.render_field_value(['a', 'b'])).to eq "a, b"
     end
 
     it "should join values using the field_value_separator" do
-      helper.stub(:field_value_separator).and_return(" -- ")
+      allow(helper).to receive(:field_value_separator).and_return(" -- ")
       expect(helper.render_field_value(['a', 'b'])).to eq "a -- b"
     end
 
@@ -446,40 +445,40 @@ describe BlacklightHelper do
 
   describe "should_show_spellcheck_suggestions?" do
     before :each do
-      helper.stub spell_check_max: 5
+      allow(helper).to receive_messages spell_check_max: 5
     end
     it "should not show suggestions if there are enough results" do
       response = double(total: 10)
-      expect(helper.should_show_spellcheck_suggestions? response).to be_false
+      expect(helper.should_show_spellcheck_suggestions? response).to be false
     end
 
     it "should only show suggestions if there are very few results" do
       response = double(total: 4, spelling: double(words: [1]))
-      expect(helper.should_show_spellcheck_suggestions? response).to be_true
+      expect(helper.should_show_spellcheck_suggestions? response).to be true
     end
 
     it "should show suggestions only if there are spelling suggestions available" do
       response = double(total: 4, spelling: double(words: []))
-      expect(helper.should_show_spellcheck_suggestions? response).to be_false
+      expect(helper.should_show_spellcheck_suggestions? response).to be false
     end
   end
   
   describe "#render_document_partials" do
     let(:doc) { double }
     before do
-      helper.stub(document_partial_path_templates: [])
+      allow(helper).to receive_messages(document_partial_path_templates: [])
     end
     
     it "should get the document format from document_partial_name" do
-      helper.should_receive(:document_partial_name).with(doc, :xyz)
+      allow(helper).to receive(:document_partial_name).with(doc, :xyz)
       helper.render_document_partial(doc, :xyz)    
     end
     
     context "with a 1-arg form of document_partial_name" do
       it "should only call the 1-arg form of the document_partial_name" do
-        helper.should_receive(:method).with(:document_partial_name).and_return(double(arity: 1))
-        helper.should_receive(:document_partial_name).with(doc)
-        Deprecation.should_receive(:warn)
+        allow(helper).to receive(:method).with(:document_partial_name).and_return(double(arity: 1))
+        allow(helper).to receive(:document_partial_name).with(doc)
+        allow(Deprecation).to receive(:warn)
         helper.render_document_partial(doc, nil)
       end
     end
@@ -489,7 +488,7 @@ describe BlacklightHelper do
     let(:blacklight_config) { Blacklight::Configuration.new }
 
     before do
-      helper.stub(blacklight_config: blacklight_config)
+      allow(helper).to receive_messages(blacklight_config: blacklight_config)
     end
 
     context "with a solr document with empty fields" do
@@ -573,24 +572,25 @@ describe BlacklightHelper do
   
   describe "#render_document_index" do
     it "should render the document index with the current view type" do
-      helper.stub(document_index_view_type: :current_view)
-      helper.should_receive(:render_document_index_with_view).with(:current_view, [], a: 1, b: 2)
+      allow(helper).to receive_messages(document_index_view_type: :current_view)
+      allow(helper).to receive(:render_document_index_with_view).with(:current_view, [], a: 1, b: 2)
       helper.render_document_index [], a: 1, b: 2
     end
   end
   
   describe "#render_document_index_with_view" do
+    let(:obj1) { SolrDocument.new }
+
+    before do
+      allow(helper).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+      assign(:response, double("SolrResponse", grouped?: false, params: {}))
+      allow(helper).to receive(:link_to_document).and_return('<a/>')
+      allow(helper).to receive(:render_index_doc_actions).and_return('<div/>')
+    end
+
     it "should ignore missing templates" do
-      helper.stub(:render) do |options|
-        if options[:partial] == "document_view_type"
-          raise ActionView::MissingTemplate.new [], '', '', '', ''
-        else
-          options[:partial]
-        end
-      end
-      
-      response = helper.render_document_index_with_view :view_type, [double, double]
-      expect(response).to eq "catalog/document_view_type"
+      response = helper.render_document_index_with_view :view_type, [obj1, obj1]
+      expect(response).to match /<div id="documents">/
     end
   end
 end