blacklight 6.19.1 → 7.1.0

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,27 +2,24 @@
 
 # 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' })])
-    render
+    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 'catalog/show_sidebar', document: document
     expect(rendered).to include("More Like This")
     expect(rendered).to include("Title of MLT Document")
   end

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'

data/spec/views/catalog/{_thumbnail_default.erb_spec.rb → _thumbnail.html.erb_spec.rb}

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-describe "catalog/_thumbnail_default" do
-
+RSpec.describe "catalog/_thumbnail" do
   let :document_without_thumbnail_field do
-    SolrDocument.new :id => 'xyz', :format => 'a'
+    SolrDocument.new id: 'xyz', format: 'a'
   end
 
   let :document_with_thumbnail_field do
-    SolrDocument.new :id => 'xyz', :format => 'a', :thumbnail_url => 'http://localhost/logo.png'
+    SolrDocument.new id: 'xyz', format: 'a', thumbnail_url: 'http://localhost/logo.png'
   end
 
   let :blacklight_config do
@@ -21,18 +20,17 @@ describe "catalog/_thumbnail_default" do
     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 thumbnail if the document has one" do
-    render :partial => "catalog/thumbnail_default", :locals => {:document => document_with_thumbnail_field, :document_counter => 1}
+    render partial: "catalog/thumbnail", locals: { document: document_with_thumbnail_field, document_counter: 1 }
     expect(rendered).to match /document-thumbnail/
-    expect(rendered).to match /src="http:\/\/localhost\/logo.png"/
+    expect(rendered).to match %r{src="http://localhost/logo.png"}
   end
 
   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}
+    render partial: "catalog/thumbnail", locals: { document: document_without_thumbnail_field, document_counter: 1 }
     expect(rendered).to eq ""
   end
 end

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

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
-describe "catalog/_view_type_group" do
+RSpec.describe "catalog/_view_type_group" do
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:response) { instance_double(Blacklight::Solr::Response, empty?: false) }
+  let(:icon_instance) { instance_double(Blacklight::Icon) }
 
   before do
-    allow(view).to receive(:view_label) do |view|
-      view.to_s
-    end
+    allow(view).to receive(:view_label), &:to_s
+    allow(Blacklight::Icon).to receive(:new).and_return icon_instance
+    allow(icon_instance).to receive(:svg).and_return '<svg></svg>'
+    allow(icon_instance).to receive(:options).and_return({})
     allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
     controller.request.path_parameters[:action] = 'index'
     assign(:response, response)
@@ -28,9 +30,9 @@ describe "catalog/_view_type_group" do
     end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.btn-group.view-type-group')
-    expect(rendered).to have_selector('.view-type-a', :text => 'a')
-    expect(rendered).to have_selector('.view-type-b', :text => 'b')
-    expect(rendered).to have_selector('.view-type-c', :text => 'c')
+    expect(rendered).to have_selector('.view-type-a', text: 'a')
+    expect(rendered).to have_selector('.view-type-b', text: 'b')
+    expect(rendered).to have_selector('.view-type-c', text: 'c')
   end
 
   it "sets the current view to 'active'" do
@@ -40,8 +42,8 @@ describe "catalog/_view_type_group" do
       config.view.b
     end
     render partial: 'catalog/view_type_group'
-    expect(rendered).to have_selector('.active', :text => 'a')
-    expect(rendered).to_not have_selector('.active', :text => 'b')
-    expect(rendered).to have_selector('.btn', :text => 'b')
+    expect(rendered).to have_selector('.active', text: 'a')
+    expect(rendered).not_to have_selector('.active', text: 'b')
+    expect(rendered).to have_selector('.btn', text: 'b')
   end
 end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+RSpec.describe "catalog/email_success.html.erb" do
+  it "includes the data-blacklight-modal properties" do
+    render
+    expect(rendered).to have_selector "div[data-blacklight-modal=container]"
+  end
+end

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

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-describe 'catalog/facet.html.erb' do
+RSpec.describe 'catalog/facet.html.erb' do
   let(:display_facet) { double }
   let(:blacklight_config) { Blacklight::Configuration.new }
-  before :each do
+
+  before do
     blacklight_config.add_facet_field 'xyz', label: "Facet title"
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     stub_template 'catalog/_facet_pagination.html.erb' => 'pagination'
@@ -14,7 +15,7 @@ describe 'catalog/facet.html.erb' do
   it "has the facet title" do
     allow(view).to receive(:render_facet_limit)
     render
-    expect(rendered).to have_selector 'h3', text: "Facet title"
+    expect(rendered).to have_selector 'h1', text: "Facet title"
   end
 
   it "renders facet pagination" do