blacklight 6.2.0 → 6.3.0

data/spec/views/_user_util_links.html.erb_spec.rb

@@ -10,7 +10,7 @@ describe "_user_util_links" do
 
   end
 
-  it "should render the correct bookmark count" do
+  it "renders the correct bookmark count" do
     count = rand(99)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(controller).to receive(:render_bookmarks_control?).and_return true

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

@@ -8,13 +8,13 @@ describe "catalog/constraints" do
     end
   end
 
-  it "should render nothing if no constraints are set" do
+  it "renders nothing if no constraints are set" do
     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
+  it "renders a start over link" do
     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)
@@ -23,7 +23,7 @@ describe "catalog/constraints" do
     expect(rendered).to have_link("Start Over", :href => 'http://xyz')
   end
 
-  it "should render a start over link with the current view type" do
+  it "renders a start over link with the current view type" do
     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'

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

@@ -6,7 +6,7 @@ describe "catalog/_constraints_element.html.erb" do
     before do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value"}
     end
-    it "should render label and value" do
+    it "renders label and value" do
       expect(rendered).to have_selector("span.appliedFilter.constraint") do |s|
         expect(s).to have_css("span.constraint-value")
         expect(s).to_not have_css("a.constraint-value")
@@ -20,13 +20,13 @@ describe "catalog/_constraints_element.html.erb" do
     before do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:remove => "http://remove"}}
     end
-    it "should include remove link" do
+    it "includes remove link" do
       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
+    it "has an accessible remove label" do
       expect(rendered).to have_selector(".remove") do |s|
         expect(s).to have_content("Remove constraint my label: my value")
       end
@@ -37,7 +37,7 @@ describe "catalog/_constraints_element.html.erb" do
     before do
       render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:classes => ["class1", "class2"]}}
     end
-    it "should include them" do
+    it "includes them" do
       expect(rendered).to have_selector("span.appliedFilter.constraint.class1.class2")
     end
   end
@@ -46,7 +46,7 @@ describe "catalog/_constraints_element.html.erb" do
     before do
       render( :partial => "catalog/constraints_element", :locals => {:label => "<span class='custom_label'>my label</span>".html_safe, :value => "<span class='custom_value'>my value</span>".html_safe} )
     end
-    it "should not escape key and value" do
+    it "does not escape key and value" do
       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

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

@@ -15,7 +15,7 @@ describe "catalog/_document" do
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
   end
 
-  it "should render the header, thumbnail and index by default" do
+  it "renders the header, thumbnail and index by default" do
     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"
@@ -28,7 +28,7 @@ describe "catalog/_document" do
   end
 
 
-  it "should use the index.partials parameter to determine the partials to render" do
+  it "uses the index.partials parameter to determine the partials to render" do
     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/_document_list.html.erb_spec.rb

@@ -7,7 +7,7 @@ describe "catalog/_document_list", type: :view do
     allow(view).to receive_messages(document_index_view_type: "some-view", documents: [])
   end
 
-  it "should include a class for the current view" do
+  it "includes a class for the current view" do
     render
     expect(rendered).to have_selector(".documents-some-view")
   end

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

@@ -17,23 +17,23 @@ describe "catalog/facet_layout" do
     allow(view).to receive_messages(blacklight_config: blacklight_config)
   end
 
-  it "should have a facet-specific class" do
+  it "has a facet-specific class" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_selector '.blacklight-some_field' 
   end
 
-  it "should have a title with a link for a11y" do
+  it "has a title with a link for a11y" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_selector 'h3 a', text: 'Some Field'
   end
 
-  it "should be collapsable" do
+  it "is collapsable" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to have_selector '.panel-heading.collapsed'
     expect(rendered).to have_selector '.collapse .panel-body'
   end
 
-  it "should be configured to be open by default" do
+  it "is configured to be open by default" do
     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'

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

@@ -12,7 +12,7 @@ describe "catalog/_facets" do
   end
 
   context "without any facet fields" do
-    it "should not have a header if no facets are displayed" do
+    it "does not have a header if no facets are displayed" do
       allow(view).to receive_messages(:render_facet_partials => '')
       render
       expect(rendered).to_not have_selector('h4')
@@ -35,7 +35,7 @@ describe "catalog/_facets" do
         allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
     end
 
-    it "should have a header" do
+    it "has a header" do
       allow(view).to receive_messages(:render_facet_partials => '')
       render
       expect(rendered).to have_selector('.facets-heading')
@@ -43,12 +43,12 @@ describe "catalog/_facets" do
 
 
     describe "facet display" do
-      it "should have a(n accessible) header" do
+      it "has a(n accessible) header" do
         render
         expect(rendered).to have_selector('.facet-field-heading')
       end
 
-      it "should list values" do
+      it "lists values" do
         render
 
         # The .facet-content class is used by blacklight_range_limit js, and

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

@@ -9,6 +9,7 @@ describe "/catalog/_index_default.erb" do
   include CatalogHelper
 
   before(:each) do
+    allow(view).to receive(:action_name).and_return('index')
     @config = Blacklight::Configuration.new do |config|
       config.show.display_type_field = 'asdf'
       config.add_index_field 'one_field', :label => 'One:'
@@ -33,16 +34,16 @@ describe "/catalog/_index_default.erb" do
     @rendered = view.render_document_partial @document, :index
   end
 
-  it "should only display fields listed in the initializer" do
+  it "only displays fields listed in the initializer" do
     expect(@rendered).to_not include("val_2")
     expect(@rendered).to_not include(@fname_2)
   end
   
-  it "should skip over fields listed in initializer that are not in solr response" do
+  it "skips over fields listed in initializer that are not in solr response" do
     expect(@rendered).to_not include(@fname_3)
   end
 
-  it "should display field labels from initializer and raw solr field names in the class" do
+  it "displays field labels from initializer and raw solr field names in the class" do
     # labels
     expect(@rendered).to include(@flabel_1)
     expect(@rendered).to include(@flabel_4)
@@ -56,7 +57,7 @@ describe "/catalog/_index_default.erb" do
 #    pending
 #  end
 
-  it "should have values for displayed fields" do
+  it "has values for displayed fields" do
     expect(@rendered).to include("val_1")
     expect(@rendered).to include("val_4")
     expect(@rendered).to_not include("val_2")

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

@@ -11,6 +11,7 @@ describe "catalog/_index_header_default" do
   end
 
   before do
+    allow(controller).to receive(:action_name).and_return('index')
     assign :response, double(start: 0)
     allow(view).to receive(:render_grouped_response?).and_return false
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
@@ -18,19 +19,19 @@ describe "catalog/_index_header_default" do
     allow(view).to receive(:search_session).and_return({})
   end
 
-  it "should render the document header" do
+  it "renders the document header" do
     allow(view).to receive(:render_index_doc_actions)
     render partial: "catalog/index_header_default", locals: {document: document, document_counter: 1}
     expect(rendered).to have_selector('.document-counter', text: "2")
   end
 
-  it "should allow the title to take the whole space if no document tools are rendered" do
+  it "allows the title to take the whole space if no document tools are rendered" do
     allow(view).to receive(:render_index_doc_actions)
     render partial: "catalog/index_header_default", locals: {document: document, document_counter: 1}
     expect(rendered).to have_selector '.index_title.col-md-12'
   end
   
-  it "should give the document actions space if present" do
+  it "gives the document actions space if present" do
     allow(view).to receive(:render_index_doc_actions).and_return("DOCUMENT ACTIONS")
     render partial: "catalog/index_header_default", locals: {document: document, document_counter: 1}
     expect(rendered).to have_selector '.index_title.col-sm-9'

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

@@ -23,7 +23,7 @@ describe "catalog/_paginate_compact.html.erb" do
 
     include Blacklight::SearchHelper
 
-    it "should render solr responses" do
+    it "renders solr responses" do
       solr_response, document_list = search_results(q: '')
 
       render :partial => 'catalog/paginate_compact', :object => solr_response
@@ -32,13 +32,13 @@ describe "catalog/_paginate_compact.html.erb" do
     end
   end
 
-  it "should render paginatable arrays" do
+  it "renders 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
+  it "renders ActiveRecord collections" do
     50.times { b = Bookmark.new;  b.user = user; b.save! }
     render :partial => 'catalog/paginate_compact', :object => Bookmark.page(1).per(25)
     expect(rendered).to have_selector ".page_entries"

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

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe "/catalog/_search_header.html.erb" do
 
-  it "should render the default search header partials" do
+  it "renders the default search header partials" do
     stub_template "_did_you_mean.html.erb" => "did_you_mean"
     stub_template "_constraints.html.erb" => "constraints"
     stub_template "_sort_and_per_page.html.erb" => "sort_and_per_page"

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

@@ -11,7 +11,8 @@ describe "/catalog/_show_default.html.erb" do
 
 
   before(:each) do
-     @config = Blacklight::Configuration.new do |config|
+    allow(controller).to receive(:action_name).and_return('show')
+    @config = Blacklight::Configuration.new do |config|
       config.show.display_type_field = 'asdf'
       config.add_show_field 'one_field', :label => 'One:'
       config.add_show_field 'empty_field', :label => 'Three:'
@@ -34,16 +35,16 @@ describe "/catalog/_show_default.html.erb" do
     @rendered = view.render_document_partial @document, :show
   end
 
-  it "should only display fields listed in the initializer" do
+  it "only displays fields listed in the initializer" do
     expect(@rendered).to_not include("val_2")
     expect(@rendered).to_not include(@fname_2)
   end
   
-  it "should skip over fields listed in initializer that are not in solr response" do
+  it "skips over fields listed in initializer that are not in solr response" do
     expect(@rendered).to_not include(@fname_3)
   end
 
-  it "should display field labels from initializer and raw solr field names in the class" do
+  it "displays field labels from initializer and raw solr field names in the class" do
     # labels
     expect(@rendered).to include(@flabel_1)
     expect(@rendered).to include(@flabel_4)
@@ -57,7 +58,7 @@ describe "/catalog/_show_default.html.erb" do
 #    pending
 #  end
 
-  it "should have values for displayed fields" do
+  it "has values for displayed fields" do
     expect(@rendered).to include("val_1")
     expect(@rendered).to include("val_4")
     expect(@rendered).to_not include("val_2")

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

@@ -12,6 +12,7 @@ describe "/catalog/_show_sidebar.html.erb" do
   end
 
   before(:each) do
+    allow(controller).to receive(:action_name).and_return('show')
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:has_user_authentication_provider?).and_return(false)
     allow(view).to receive(:current_search_session).and_return nil
@@ -19,7 +20,7 @@ describe "/catalog/_show_sidebar.html.erb" do
     allow(view).to receive(:document_actions).and_return([])
   end
 
-  it "should show more-like-this titles in the sidebar" do
+  it "shows more-like-this titles in the sidebar" do
   	@document = SolrDocument.new :id => 1, :title_s => 'abc', :format => 'default'
   	allow(@document).to receive(:more_like_this).and_return([SolrDocument.new({ 'id' => '2', 'title_display' => 'Title of MLT Document' })])
     render

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

@@ -24,56 +24,56 @@ describe "catalog/_show_tools.html.erb" do
     end
 
 
-    it "should render a document action" do
+    it "renders a document action" do
       allow(view).to receive(:some_action_solr_document_path).with(document).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_link "Some action", href: "x"
     end
 
-    it "should use the provided label" do
+    it "uses the provided label" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new label: "Some label", partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_selector '.some_action', text: "Some label"
     end
 
-    it "should evaluate a document action's if configurations" do
+    it "evaluates a document action's if configurations" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new if: false, partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
-    it "should evaluate a document action's if configuration with a proc" do
+    it "evaluates a document action's if configuration with a proc" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', if: Proc.new { |config, doc| doc.id == "xyz" }
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
-    it "should evaluate a document action's unless configurations" do
+    it "evaluates a document action's unless configurations" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', unless: true
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
-    it "should allow the tool to have a custom id" do
+    it "allows the tool to have a custom id" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', id: "some_action"
       render partial: 'catalog/show_tools'
       expect(rendered).to have_selector '#some_action', text: "Some action"
     end
 
-    it "should default to modal behavior" do
+    it "defaults to modal behavior" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_selector '.some_action > a[data-ajax-modal="trigger"]', text: "Some action"
     end
 
-    it "should allow configuration to opt out of modal behavior" do
+    it "allows configuration to opt out of modal behavior" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', modal: false
       render partial: 'catalog/show_tools'

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

@@ -14,7 +14,7 @@ describe "catalog/_sort_and_per_page" do
     allow(view).to receive_messages(blacklight_config: blacklight_config)
   end
 
-  it "should render the pagination, sort, per page and view type controls" do
+  it "renders the pagination, sort, per page and view type controls" do
     assign(:response, double("Solr::Response", limit_value: 1))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
@@ -27,7 +27,7 @@ describe "catalog/_sort_and_per_page" do
     expect(rendered).to match /view_type_group/
   end
 
-  it "should not render the pagination controls with bad limit values" do
+  it "does not render the pagination controls with bad limit values" do
     assign(:response, double("Solr::Response", limit_value: 0))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"

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

@@ -18,6 +18,7 @@ describe "catalog/_thumbnail_default" do
   end
 
   before do
+    allow(controller).to receive(:action_name).and_return('index')
     assign :response, double(start: 0)
     allow(view).to receive(:render_grouped_response?).and_return false
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
@@ -25,13 +26,13 @@ describe "catalog/_thumbnail_default" do
     allow(view).to receive(:search_session).and_return({})
   end
 
-  it "should render the thumbnail if the document has one" do
+  it "renders the thumbnail if the document has one" do
     render :partial => "catalog/thumbnail_default", :locals => {:document => document_with_thumbnail_field, :document_counter => 1}
     expect(rendered).to match /document-thumbnail/
     expect(rendered).to match /src="http:\/\/localhost\/logo.png"/
   end
 
-  it "should not render a thumbnail if the document does not have one" do
+  it "does not render a thumbnail if the document does not have one" do
     render :partial => "catalog/thumbnail_default", :locals => {:document => document_without_thumbnail_field, :document_counter => 1}
     expect(rendered).to eq ""
   end

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

@@ -17,13 +17,13 @@ describe "catalog/_view_type_group" do
     controller.request.path_parameters[:action] = 'index'
   end
 
-  it "should not display the group when there's only one option" do
+  it "does 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
+  it "displays the group" do
     assign(:response, [double])
     blacklight_config.configure do |config|
       config.view.delete(:list)
@@ -39,7 +39,7 @@ describe "catalog/_view_type_group" do
   end
 
 
-  it "should set the current view to 'active'" do
+  it "sets the current view to 'active'" do
     assign(:response, [double])
     blacklight_config.configure do |config|
       config.view.delete(:list)