blacklight 6.14.0 → 7.0.0

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

@@ -1,26 +1,28 @@
 # frozen_string_literal: true
 
-describe "catalog/_constraints_element.html.erb" do
+RSpec.describe "catalog/_constraints_element.html.erb" do
   describe "for simple display" do
     before do
-      render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value"}
+      render partial: "catalog/constraints_element", locals: { label: "my label", value: "my value" }
     end
+
     it "renders label and value" do
-      expect(rendered).to have_selector("span.appliedFilter.constraint") do |s|
+      expect(rendered).to have_selector("span.applied-filter.constraint") do |s|
         expect(s).to have_css("span.constraint-value")
-        expect(s).to_not have_css("a.constraint-value")
-        expect(s).to have_selector "span.filterName", :content => "my label"
-        expect(s).to have_selector "span.filterValue", :content => "my value"
+        expect(s).not_to have_css("a.constraint-value")
+        expect(s).to have_selector "span.filter-name", content: "my label"
+        expect(s).to have_selector "span.filter-value", content: "my value"
       end
     end
   end
 
   describe "with remove link" do
     before do
-      render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:remove => "http://remove"}}
+      render partial: "catalog/constraints_element", locals: { label: "my label", value: "my value", options: { remove: "http://remove" } }
     end
+
     it "includes remove link" do
-      expect(rendered).to have_selector("span.appliedFilter") do |s|
+      expect(rendered).to have_selector("span.applied-filter") do |s|
         expect(s).to have_selector(".remove[href='http://remove']")
       end
     end
@@ -33,20 +35,22 @@ describe "catalog/_constraints_element.html.erb" do
 
   describe "with custom classes" do
     before do
-      render :partial => "catalog/constraints_element", :locals => {:label => "my label", :value => "my value", :options => {:classes => ["class1", "class2"]}}
+      render partial: "catalog/constraints_element", locals: { label: "my label", value: "my value", options: { classes: %w[class1 class2] } }
     end
+
     it "includes them" do
-      expect(rendered).to have_selector("span.appliedFilter.constraint.class1.class2")
+      expect(rendered).to have_selector("span.applied-filter.constraint.class1.class2")
     end
   end
 
   describe "with no escaping" 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} )
+      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 "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")
+      expect(rendered).to have_selector("span.applied-filter.constraint span.filter-name span.custom_label")
+      expect(rendered).to have_selector("span.applied-filter.constraint span.filter-value span.custom_value")
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-describe "catalog/_document" do
-  let(:document) { SolrDocument.new :id => 'xyz', :format => 'a' }
+RSpec.describe "catalog/_document" do
+  let(:document) { SolrDocument.new id: 'xyz', format: 'a' }
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
@@ -10,23 +10,23 @@ describe "catalog/_document" do
   end
 
   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_header.html.erb" => "document_header"
+    stub_template "catalog/_thumbnail.html.erb" => "thumbnail_default"
     stub_template "catalog/_index_default.html.erb" => "index_default"
-    render :partial => "catalog/document", :locals => {:document => document, :document_counter => 1}
+    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"]')
+    expect(rendered).to have_selector('.document[@itemscope]')
+    expect(rendered).to have_selector('.document[@itemtype="http://schema.org/Thing"]')
   end
 
   it "uses the index.partials parameter to determine the partials to render" do
-    blacklight_config.index.partials = ['a', 'b', 'c']
+    blacklight_config.index.partials = %w[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}
+    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/
@@ -35,12 +35,12 @@ describe "catalog/_document" do
   it 'has a css class with the document position' do
     allow(view).to receive(:render_document_partials)
     render partial: 'catalog/document', locals: { document: document, document_counter: 5 }
-    expect(rendered).to have_selector 'div.document-position-5'
+    expect(rendered).to have_selector '.document-position-5'
   end
 
   it 'has a data attribute with the document position' do
     allow(view).to receive(:render_document_partials)
     render partial: 'catalog/document', locals: { document: document, document_counter: 5 }
-    expect(rendered).to have_selector 'div.document[@data-document-counter="5"]'
+    expect(rendered).to have_selector '.document[@data-document-counter="5"]'
   end
 end

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

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-describe "catalog/_document_list", type: :view do
+RSpec.describe "catalog/_document_list", type: :view do
   before do
     allow(view).to receive_messages(document_index_view_type: "some-view", documents: [])
   end
+
   it "includes a class for the current view" do
     render
     expect(rendered).to have_selector(".documents-some-view")

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-describe 'catalog/_facet_index_navigation.html.erb', type: :view do
+RSpec.describe 'catalog/_facet_index_navigation.html.erb', type: :view do
   let(:pagination) { Blacklight::Solr::FacetPaginator.new([]) }
-  let(:facet) { Blacklight::Configuration::FacetField.new({ index_range: '0'..'9' })}
+  let(:facet) { Blacklight::Configuration::FacetField.new(index_range: '0'..'9') }
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
@@ -21,9 +21,9 @@ describe 'catalog/_facet_index_navigation.html.erb', type: :view do
     expect(rendered).to have_link '9'
   end
 
-  it 'renders a "clear filter" button' do
+  it 'renders an "all" button' do
     render
-    expect(rendered).to have_selector '.btn.disabled', text: 'Clear Filter'
+    expect(rendered).to have_selector '.page-link', text: 'All'
   end
 
   context 'with a selected index' do
@@ -35,7 +35,7 @@ describe 'catalog/_facet_index_navigation.html.erb', type: :view do
     end
     it 'enables the clear facets button' do
       render
-      expect(rendered).to have_link 'Clear Filter'
+      expect(rendered).to have_link 'All'
     end
   end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "catalog/facet_layout" do
+RSpec.describe "catalog/facet_layout" do
   let :blacklight_config do
     Blacklight::Configuration.new do |config|
       config.facet_fields[facet_field.field] = facet_field
@@ -22,19 +22,19 @@ describe "catalog/facet_layout" 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'
+    expect(rendered).to have_selector 'h3', text: 'Some Field'
   end
 
   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'
+    expect(rendered).to have_selector '.card-header.collapsed'
+    expect(rendered).to have_selector '.collapse.card-body'
   end
 
   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'
-    expect(rendered).to have_selector '.in .panel-body'
+    expect(rendered).not_to have_selector '.card-header.collapsed'
+    expect(rendered).to have_selector '.show.card-body'
   end
 end

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

@@ -1,38 +1,36 @@
 # frozen_string_literal: true
 
-describe "catalog/_facets" do
+RSpec.describe "catalog/_facets" do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
     allow(view).to receive_messages(blacklight_config: blacklight_config)
-    allow(view).to receive(:search_action_path) do |*args|
-      '/catalog'
-    end
+    allow(view).to receive(:search_action_path).and_return('/catalog')
   end
 
   context "without any facet fields" do
     it "does not have a header if no facets are displayed" do
-      allow(view).to receive_messages(:render_facet_partials => '')
+      allow(view).to receive_messages(render_facet_partials: '')
       render
-      expect(rendered).to_not have_selector('h4')
+      expect(rendered).not_to have_selector('h4')
     end
   end
-  context "with facet fields" do
 
+  context "with facet fields" do
     let :facet_field do
       Blacklight::Configuration::FacetField.new(field: 'facet_field_1', label: 'label').normalize!
     end
 
     before do
       blacklight_config.facet_fields['facet_field_1'] = facet_field
-      @mock_display_facet_1 = double(:name => 'facet_field_1', sort: nil, offset: nil, prefix: nil, :items => [Blacklight::Solr::Response::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
-      allow(view).to receive_messages(:facet_field_names => [:facet_field_1], :facet_limit_for => 10)
-      @response = double()
+      @mock_display_facet_1 = double(name: 'facet_field_1', sort: nil, offset: nil, prefix: nil, items: [Blacklight::Solr::Response::Facets::FacetItem.new(value: 'Value', hits: 1234)])
+      allow(view).to receive_messages(facet_field_names: [:facet_field_1], facet_limit_for: 10)
+      @response = double
       allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
     end
 
     it "has a header" do
-      allow(view).to receive_messages(:render_facet_partials => '')
+      allow(view).to receive_messages(render_facet_partials: '')
       render
       expect(rendered).to have_selector('.facets-heading')
     end
@@ -47,7 +45,7 @@ describe "catalog/_facets" do
         # The .facet-content class is used by blacklight_range_limit js, and
         # should be applied to the .panel-collapse div that contains the collapsible
         # facet content. Please make sure it remains if possible.
-        expect(rendered).to have_selector('.facet-content a.facet_select')
+        expect(rendered).to have_selector('.facet-content a.facet-select')
         expect(rendered).to have_selector('.facet-content .facet-count')
       end
     end

data/spec/views/catalog/{_index_default.erb_spec.rb → _index.html.erb_spec.rb}

@@ -2,24 +2,24 @@
 
 # spec for default partial to display solr document fields in catalog INDEX view
 
-describe "/catalog/_index_default.erb" do
+RSpec.describe "/catalog/_index" do
   include BlacklightHelper
   include CatalogHelper
 
-  before(:each) do
+  before 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:'
-      config.add_index_field 'empty_field', :label => 'Three:'
-      config.add_index_field 'four_field', :label => 'Four:'
+      config.add_index_field 'one_field', label: 'One:'
+      config.add_index_field 'empty_field', label: 'Three:'
+      config.add_index_field 'four_field', label: 'Four:'
     end
 
     @fname_1 = "one_field"
     @fname_2 = "solr_field_not_in_config"
     @fname_3 = "empty_field"
     @fname_4 = "four_field"
-    
+
     @document = SolrDocument.new(id: 1, @fname_1 => "val_1", @fname_2 => "val2", @fname_4 => "val_4")
 
     @flabel_1 = "One:"
@@ -32,12 +32,12 @@ describe "/catalog/_index_default.erb" do
   end
 
   it "only displays fields listed in the initializer" do
-    expect(@rendered).to_not include("val_2")
-    expect(@rendered).to_not include(@fname_2)
+    expect(@rendered).not_to include("val_2")
+    expect(@rendered).not_to include(@fname_2)
   end
 
   it "skips over fields listed in initializer that are not in solr response" do
-    expect(@rendered).to_not include(@fname_3)
+    expect(@rendered).not_to include(@fname_3)
   end
 
   it "displays field labels from initializer and raw solr field names in the class" do
@@ -49,15 +49,14 @@ describe "/catalog/_index_default.erb" do
     expect(@rendered).to include("blacklight-#{@fname_4}")
   end
 
-# this test probably belongs in a Cucumber feature
-#  it "should display fields in the order listed in the initializer" do
-#    pending
-#  end
+  # this test probably belongs in a Cucumber feature
+  #  it "should display fields in the order listed in the initializer" do
+  #    pending
+  #  end
 
   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")
+    expect(@rendered).not_to include("val_2")
   end
-
 end

data/spec/views/catalog/{_index_header_default.html.erb_spec.rb → _index_header.html.erb_spec.rb}

@@ -1,38 +1,35 @@
 # frozen_string_literal: true
 
-describe "catalog/_index_header_default" do
+RSpec.describe "catalog/_index_header" do
   let :document do
-    SolrDocument.new :id => 'xyz', :format => 'a'
+    SolrDocument.new id: 'xyz', format: 'a'
   end
 
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
-    allow(controller).to receive(:action_name).and_return('index')
     assign :response, instance_double(Blacklight::Solr::Response, start: 0)
     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({})
+    allow(view).to receive(:session_tracking_params).and_return({})
   end
 
   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}
+    render partial: "catalog/index_header", locals: { document: document, document_counter: 1 }
     expect(rendered).to have_selector('.document-counter', text: "2")
   end
 
   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}
+    render partial: "catalog/index_header", locals: { document: document, document_counter: 1 }
     expect(rendered).to have_selector '.index_title.col-md-12'
   end
 
   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}
+    render partial: "catalog/index_header", locals: { document: document, document_counter: 1 }
     expect(rendered).to have_selector '.index_title.col-sm-9'
     expect(rendered).to have_content "DOCUMENT ACTIONS"
   end
-
 end

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

@@ -1,45 +1,22 @@
 # frozen_string_literal: true
 
-describe "catalog/_paginate_compact.html.erb" do
-  let(:user) { User.new.tap { |u| u.save(validate: false) } }
+RSpec.describe "catalog/_paginate_compact.html.erb" do
+  let(:user) { User.new { |u| u.save(validate: false) } }
 
   before do
     controller.request.path_parameters[:action] = 'index'
   end
 
-  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 facet_limit_for *args
-      0
-    end
-
-    include Blacklight::SearchHelper
-
-    it "renders solr responses" do
-      solr_response, document_list = 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 "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"
+    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 "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"
+    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"
     expect(rendered).to have_selector "a[@rel=next]"
   end
 end

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

@@ -2,14 +2,12 @@
 
 # spec for sidebar partial in catalog show view
 
-describe "/catalog/_search_header.html.erb" do
+RSpec.describe "/catalog/_search_header.html.erb" 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"
     render
     expect(rendered).to match /did_you_mean/
-    expect(rendered).to match /constraints/
     expect(rendered).to match /sort_and_per_page/
   end
 end

data/spec/views/catalog/{_show_default.erb_spec.rb → _show.html.erb_spec.rb}

@@ -2,18 +2,17 @@
 
 # spec for default partial to display solr document fields in catalog show view
 
-describe "/catalog/_show_default.html.erb" do
-
+RSpec.describe "/catalog/_show" do
   include BlacklightHelper
   include CatalogHelper
 
-  before(:each) do
+  before do
     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:'
-      config.add_show_field 'four_field', :label => 'Four:'
+      config.add_show_field 'one_field', label: 'One:'
+      config.add_show_field 'empty_field', label: 'Three:'
+      config.add_show_field 'four_field', label: 'Four:'
     end
 
     @fname_1 = "one_field"
@@ -33,12 +32,12 @@ describe "/catalog/_show_default.html.erb" do
   end
 
   it "only displays fields listed in the initializer" do
-    expect(@rendered).to_not include("val_2")
-    expect(@rendered).to_not include(@fname_2)
+    expect(@rendered).not_to include("val_2")
+    expect(@rendered).not_to include(@fname_2)
   end
 
   it "skips over fields listed in initializer that are not in solr response" do
-    expect(@rendered).to_not include(@fname_3)
+    expect(@rendered).not_to include(@fname_3)
   end
 
   it "displays field labels from initializer and raw solr field names in the class" do
@@ -50,14 +49,14 @@ describe "/catalog/_show_default.html.erb" do
     expect(@rendered).to include("blacklight-#{@fname_4}")
   end
 
-# this test probably belongs in a Cucumber feature
-#  it "should display fields in the order listed in the initializer" do
-#    pending
-#  end
+  # this test probably belongs in a Cucumber feature
+  #  it "should display fields in the order listed in the initializer" do
+  #    pending
+  #  end
 
   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")
+    expect(@rendered).not_to include("val_2")
   end
 end

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

@@ -2,26 +2,23 @@
 
 # spec for sidebar partial in catalog show view
 
-describe "/catalog/_show_sidebar.html.erb" do
-
+RSpec.describe "/catalog/_show_sidebar.html.erb" do
   let(:blacklight_config) do
     Blacklight::Configuration.new do |config|
-      config.index.title_field = 'title_display'
+      config.index.title_field = 'title_tsim'
     end
   end
 
-  before(:each) do
-    allow(controller).to receive(:action_name).and_return('show')
+  before do
     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
-    allow(view).to receive(:search_session).and_return({})
     allow(view).to receive(:document_actions).and_return([])
+    allow(view).to receive(:session_tracking_params).and_return({})
   end
 
   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' })])
+    @document = SolrDocument.new id: 1, title_s: 'abc', format: 'default'
+    allow(@document).to receive(:more_like_this).and_return([SolrDocument.new('id' => '2', 'title_tsim' => 'Title of MLT Document')])
     render
     expect(rendered).to include("More Like This")
     expect(rendered).to include("Title of MLT Document")

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-describe "catalog/_show_tools.html.erb" do
-  let(:document) { SolrDocument.new :id => 'xyz', :format => 'a' }
+RSpec.describe "catalog/_show_tools.html.erb" do
+  let(:document) { SolrDocument.new id: 'xyz', format: 'a' }
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
@@ -37,7 +37,7 @@ describe "catalog/_show_tools.html.erb" 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" }
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', if: proc { |_config, doc| doc.id == "xyz" }
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
@@ -60,14 +60,14 @@ describe "catalog/_show_tools.html.erb" 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"
+      expect(rendered).to have_selector '.some_action > a[data-blacklight-modal="trigger"]', text: "Some action"
     end
 
     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'
-      expect(rendered).not_to have_selector '.some_action > a[data-ajax-modal="trigger"]', text: "Some action"
+      expect(rendered).not_to have_selector '.some_action > a[data-blacklight-modal="trigger"]', text: "Some action"
     end
 
     context 'without any document actions defined' do

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "catalog/_sort_and_per_page" do
+RSpec.describe "catalog/_sort_and_per_page" do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
@@ -32,5 +32,4 @@ describe "catalog/_sort_and_per_page" do
     render
     expect(rendered).not_to match /paginate_compact/
   end
-
 end

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

@@ -21,6 +21,7 @@ RSpec.describe "catalog/_sort_widget" do
     before do
       blacklight_config.add_sort_field 'one'
     end
+
     it 'renders nothing' do
       render
       expect(rendered).to be_blank
@@ -32,9 +33,10 @@ RSpec.describe "catalog/_sort_widget" do
       blacklight_config.add_sort_field 'one'
       blacklight_config.add_sort_field 'two'
     end
+
     it 'renders a dropdown with the various options' do
       render
-      
+
       expect(rendered).to have_button 'One'
       expect(rendered).to have_link 'One'
       expect(rendered).to have_link 'Two'