blacklight 6.3.1 → 6.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5f399d49a4b81d638fd3a6b7dd2a79595895ef6
-  data.tar.gz: 3ab2a5bfb36436d5c2febb62c6fa24f1b3026830
+  metadata.gz: fe529651eb30f40e0df003554a192dbc40d0ab30
+  data.tar.gz: d154c23eab23af0c127054df1e9ba245230ff620
 SHA512:
-  metadata.gz: e83719b79cde64ee06a25074789458719b414c34c9eee9b4ae693c8b1a0bbdfe321acd0002421331aec2725c8d1fd957175dc1dda11873d1d79f79096fbccff6
-  data.tar.gz: d90c449b77e6a30c0aee64967f6cb9b4048e131d1ff2e94b4238ad133505994606ce00da1ea90d5cc1359e39797d49d318d304550ebf9e4890fe15aad25e422b
+  metadata.gz: fad74eb425ca3df818b78d6b3e2f483b9b9b5250e549d487a1b467c4e4028649a844c10aee6487ac9b470754ce522a4444a7ddd3bf2a9c7aad86672831604363
+  data.tar.gz: 05301c63ff664355cd63125188c9d6e5aa1a0e22dbc2b1d63a4300825f5b71d696dd22a9bb0b768500285cbb75c2d88732afd316e048c03005914feb003d22d5

data/.rspec

@@ -1 +1,2 @@
---colour
+--color
+--require spec_helper

data/README.md

@@ -1,6 +1,6 @@
 # Blacklight
 
-[![Build Status](https://travis-ci.org/projectblacklight/blacklight.png?branch=master)](https://travis-ci.org/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight)
+[![Build Status](https://travis-ci.org/projectblacklight/blacklight.png?branch=master)](https://travis-ci.org/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Coverage Status](https://coveralls.io/repos/github/projectblacklight/blacklight/badge.svg?branch=master)](https://coveralls.io/github/projectblacklight/blacklight?branch=master)
 
 Blacklight is an open source Solr user interface discovery platform.
 You can use Blacklight to enable searching and browsing of your collections.
@@ -19,7 +19,7 @@ gem "blacklight"
 
 Run the install generator which will copy over some initial templates, migrations, routes, and configuration:
 
-```
+```bash
 rails generate blacklight:install
 ```
 

data/VERSION

@@ -1 +1 @@
-6.3.1
+6.3.3

data/app/views/catalog/_bookmark_control.html.erb

@@ -7,13 +7,13 @@
   <% unless bookmarked? document %>
 
       <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
-        <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add") %>
+        <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add btn btn-default") %>
       <% end %>
 
   <% else %>
 
       <%= form_tag( bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
-        <%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove") %>
+        <%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove btn btn-default") %>
       <% end %>
 
   <% end %>

data/blacklight.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rsolr",     "~> 1.0", ">= 1.0.6"  # Library for interacting with rSolr.
   s.add_dependency "bootstrap-sass", "~> 3.2"
   s.add_dependency "deprecation"
-  s.add_dependency "twitter-typeahead-rails", '~> 0.11'
+  s.add_dependency "twitter-typeahead-rails", '0.11.1.pre.corejavascript'
 
   s.add_development_dependency "solr_wrapper"
   s.add_development_dependency "rspec-rails", "~> 3.5"

data/lib/generators/blacklight/solr5_generator.rb

@@ -13,7 +13,7 @@ module Blacklight
         gem 'solr_wrapper', '>= 0.3'
       end
 
-      append_to_file "Rakefile", "\nrequire 'solr_wrapper/rake_task'\n"
+      append_to_file "Rakefile", "\nrequire 'solr_wrapper/rake_task' unless Rails.env.production?\n"
     end
 
     def add_rsolr_gem

data/lib/generators/blacklight/user_generator.rb

@@ -23,7 +23,7 @@ module Blacklight
         else
           gem "devise"
         end
-        gem "devise-guests", "~> 0.3"
+        gem "devise-guests", "~> 0.5"
 
         Bundler.with_clean_env do
           run "bundle install"
@@ -58,7 +58,7 @@ module Blacklight
           "\n  include Blacklight::User\n"
         end
       else
-        say_status "warning", <<-EOS.strip_heredocs, :yellow
+        say_status "warning", <<-EOS.strip_heredoc, :yellow
           Blacklight authenticated user functionality not installed, as a user model
           could not be found at /app/models/user.rb. If you used a different name, 
           please re-run the migration and provide that name as an argument. E.g.:

data/spec/controllers/alternate_controller_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe AlternateController do
   describe "the search results tools" do

data/spec/controllers/application_controller_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe ApplicationController do
 

data/spec/controllers/blacklight/base_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Base do
   let(:controller) { (Class.new(ApplicationController) { include Blacklight::Base }).new }

data/spec/controllers/blacklight/catalog/component_configuration_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::DefaultComponentConfiguration do
   subject do

data/spec/controllers/blacklight/facet_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Facet do
   subject do

data/spec/controllers/blacklight/search_fields_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::SearchFields do
 

data/spec/controllers/blacklight/search_helper_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 # check the methods that do solr requests. Note that we are not testing if
 #  solr gives "correct" responses, as that's out of scope (it's a part of

data/spec/controllers/blacklight/suggest_search_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::SuggestSearch do
   let(:params) { {q: 'test'} }

data/spec/controllers/bookmarks_controller_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe BookmarksController do
   # jquery 1.9 ajax does error callback if 200 returns empty body. so use 204 instead. 

data/spec/controllers/catalog_controller_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe CatalogController do
 

data/spec/controllers/saved_searches_controller_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe SavedSearchesController do
   routes { Blacklight::Engine.routes }

data/spec/controllers/search_history_controller_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe SearchHistoryController do
   routes { Blacklight::Engine.routes }

data/spec/controllers/suggest_controller_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe SuggestController do
   routes { Blacklight::Engine.routes }

data/spec/features/alternate_controller_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Alternate Controller Behaviors" do
   it "has the correct per-page form" do

data/spec/features/bookmarks_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Bookmarks" do
   describe "navigating from the homepage" do

data/spec/features/did_you_mean_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Did You Mean" do
   before { visit root_path }

data/spec/features/facets_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Facets" do
   it "shows a single facet's values" do

data/spec/features/record_view_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Record View" do
   it "displays a normal record" do

data/spec/features/saved_searches_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Saved Searches" do
   before do

data/spec/features/search_context_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Search Results context", js: true do
   it "passes the current search id through" do

data/spec/features/search_filters_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Facets" do
   it "works without a search term" do

data/spec/features/search_formats_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Search Formats" do
   before do

data/spec/features/search_history_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Search History Page" do
   describe "navigating from the homepage" do

data/spec/features/search_pagination_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Search Pagination" do
   it "has results with pagination" do

data/spec/features/search_results_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Search Results" do
   it "has for an empty query" do

data/spec/features/search_sort_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Search Sort" do
   it "sorts on facet results with no search terms" do

data/spec/features/search_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Search Page" do
   it "shows welcome" do

data/spec/features/sitelinks_search_box.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 feature 'Sitelinks search box' do
   scenario 'is home page' do

data/spec/helpers/blacklight_helper_spec.rb

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
-require 'spec_helper'
-
 describe BlacklightHelper do
-  include ERB::Util
-  include BlacklightHelper
-  def blacklight_config
-    @config ||= Blacklight::Configuration.new.configure do |config|
-      config.index.title_field = 'title_display'
-      config.index.display_type_field = 'format'
-    end
-  end
-
   before(:each) do
     allow(helper).to receive(:current_or_guest_user).and_return(User.new)
     allow(helper).to receive(:search_action_path) do |*args|
@@ -18,18 +7,14 @@ describe BlacklightHelper do
     end
   end
 
-  def current_search_session
-
-  end
-
   describe "#application_name", :test => true do
+    it "defaults to 'Blacklight'" do
+      expect(application_name).to eq "Blacklight"
+    end
     it "uses the Rails application config application_name if available" do
       allow(Rails.application).to receive(:config).and_return(double(application_name: "asdf"))
       expect(application_name).to eq "asdf"
     end
-    it "defaults to 'Blacklight'" do
-      expect(application_name).to eq "Blacklight"
-    end
   end
 
   describe "#render_page_title" do
@@ -37,12 +22,10 @@ describe BlacklightHelper do
       helper.content_for(:page_title) { "xyz" }
       expect(helper.render_page_title).to eq "xyz"
     end
-
     it "looks in the @page_title ivar" do
       assign(:page_title, "xyz")
       expect(helper.render_page_title).to eq "xyz"
     end
-
     it "defaults to the application name" do
       expect(helper.render_page_title).to eq helper.application_name
     end
@@ -52,8 +35,17 @@ describe BlacklightHelper do
     let(:document) { double }
     let(:result) { double }
     let(:presenter) { Blacklight::DocumentPresenter.new(document, self) }
+    let(:blacklight_config) do
+      Blacklight::Configuration.new.configure do |config|
+        config.index.title_field = 'title_display'
+        config.index.display_type_field = 'format'
+      end
+    end
 
-    before { allow(helper).to receive(:presenter).and_return(presenter) }
+    before do
+      allow(helper).to receive(:presenter).and_return(presenter)
+      allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
+    end
 
     it "generates <link rel=alternate> tags" do
       expect(presenter).to receive(:link_rel_alternates).and_return(result)
@@ -73,7 +65,6 @@ describe BlacklightHelper do
         config.index.display_type_field = 'format'
       end
     end
-
     let(:document) { SolrDocument.new('title_display' => "A Fake Document", 'id'=>'8') }
 
     before do
@@ -128,13 +119,12 @@ describe BlacklightHelper do
     it "is true" do
       expect(helper.should_render_index_field?(double, double)).to be true
     end
-    
+
     it "is false if the document doesn't have a value for the field" do
       allow(helper).to receive_messages(document_has_value?: false)
       expect(helper.should_render_index_field?(double, double)).to be false
-      
     end
-    
+
     it "is false if the configuration has the field disabled" do
       allow(helper).to receive_messages(should_render_field?: false)
       expect(helper.should_render_index_field?(double, double)).to be false
@@ -145,93 +135,80 @@ describe BlacklightHelper do
     before do
       allow(helper).to receive_messages(should_render_field?: true, document_has_value?: true)
     end
-    
+
     it "is true" do
       expect(helper.should_render_show_field?(double, double)).to be true
     end
-    
+
     it "is false if the document doesn't have a value for the field" do
       allow(helper).to receive_messages(document_has_value?: false)
       expect(helper.should_render_show_field?(double, double)).to be false
-      
     end
-    
+
     it "is false if the configuration has the field disabled" do
       allow(helper).to receive_messages(should_render_field?: false)
       expect(helper.should_render_show_field?(double, double)).to be false
     end
   end
 
-  describe "#render_index_field_value" do
+  context "render methods" do
+    let(:field) { "some_field" }
+    let(:doc) { double }
     let(:presenter) { double }
     before do
-      allow(Deprecation).to receive(:warn)
+      allow(Deprecation).to receive(:warn) # TODO: purge Deprecations
       allow(helper).to receive(:presenter).with(doc).and_return(presenter)
     end
 
-    let(:doc) { double }
-    let(:field) { "some_field" }
-
-    it "passes the document and field through to the presenter" do
-      expect(presenter).to receive(:field_value).with(field, {})
-      helper.render_index_field_value(doc, field)
-    end
+    describe "#render_index_field_value" do
+      it "passes the document and field through to the presenter" do
+        expect(presenter).to receive(:field_value).with(field, {})
+        helper.render_index_field_value(doc, field)
+      end
 
-    it "allows the document and field to be passed as hash arguments" do
-      expect(presenter).to receive(:field_value).with(field, {})
-      helper.render_index_field_value(document: doc, field: field)
-    end
+      it "allows the document and field to be passed as hash arguments" do
+        expect(presenter).to receive(:field_value).with(field, {})
+        helper.render_index_field_value(document: doc, field: field)
+      end
 
-    it "allows additional options to be passed to the presenter" do
-      expect(presenter).to receive(:field_value).with(field, x: 1)
-      helper.render_index_field_value(document: doc, field: field, x: 1)
-    end
-  end
-  
-  describe "#render_document_show_field_value" do
-    let(:presenter) { double }
-    before do
-      allow(helper).to receive(:presenter).with(doc).and_return(presenter)
-      allow(Deprecation).to receive(:warn)
+      it "allows additional options to be passed to the presenter" do
+        expect(presenter).to receive(:field_value).with(field, x: 1)
+        helper.render_index_field_value(document: doc, field: field, x: 1)
+      end
     end
 
-    let(:doc) { double }
-    let(:field) { "some_field" }
-
-    it "passes the document and field through to the presenter" do
-      expect(presenter).to receive(:field_value).with(field, {})
-      helper.render_document_show_field_value(doc, field)
-    end
+    describe "#render_document_show_field_value" do
+      it "passes the document and field through to the presenter" do
+        expect(presenter).to receive(:field_value).with(field, {})
+        helper.render_document_show_field_value(doc, field)
+      end
 
-    it "allows the document and field to be passed as hash arguments" do
-      expect(presenter).to receive(:field_value).with(field, {})
-      helper.render_document_show_field_value(document: doc, field: field)
-    end
+      it "allows the document and field to be passed as hash arguments" do
+        expect(presenter).to receive(:field_value).with(field, {})
+        helper.render_document_show_field_value(document: doc, field: field)
+      end
 
-    it "allows additional options to be passed to the presenter" do
-      expect(presenter).to receive(:field_value).with(field, x: 1)
-      helper.render_document_show_field_value(document: doc, field: field, x: 1)
+      it "allows additional options to be passed to the presenter" do
+        expect(presenter).to receive(:field_value).with(field, x: 1)
+        helper.render_document_show_field_value(document: doc, field: field, x: 1)
+      end
     end
   end
-  
+
   describe "#document_has_value?" do
+    let(:doc) { double() }
     it "ifs the document has the field value" do
-      doc = double()
       allow(doc).to receive(:has?).with('asdf').and_return(true)
       field_config = double(:field => 'asdf')
       expect(helper.document_has_value?(doc, field_config)).to eq true
     end
-
     it "ifs the document has a highlight field value" do
-      doc = double()
       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)
       expect(helper.document_has_value?(doc, field_config)).to eq true
     end
-
     it "ifs the field has a model accessor" do
-      doc = double()
       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)
@@ -245,7 +222,6 @@ describe BlacklightHelper do
       expect(helper.render_grouped_response?).to be true
     end
 
-
     it "checks if the response param contains grouped data" do
       response = double("Solr::Response", :grouped? => true)
       expect(helper.render_grouped_response?(response)).to be true
@@ -253,45 +229,42 @@ describe BlacklightHelper do
   end
 
   describe "render_grouped_document_index" do
-
+    pending 'not implemented'
   end
 
   describe "should_show_spellcheck_suggestions?" do
-    before :each do
+    before do
       allow(helper).to receive_messages spell_check_max: 5
     end
     it "does not show suggestions if there are enough results" do
       response = double(total: 10)
       expect(helper.should_show_spellcheck_suggestions? response).to be false
     end
-
     it "onlies 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
     end
-
     it "shows 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
     end
   end
-  
+
   describe "#render_document_partials" do
     let(:doc) { double }
     before do
       allow(helper).to receive_messages(document_partial_path_templates: [])
       allow(helper).to receive_messages(document_index_view_type: 'index_header')
     end
-    
+
     it "gets the document format from document_partial_name" do
       allow(helper).to receive(:document_partial_name).with(doc, :xyz)
-      helper.render_document_partial(doc, :xyz)    
+      helper.render_document_partial(doc, :xyz)
     end
   end
 
   describe "#document_partial_name" do
     let(:blacklight_config) { Blacklight::Configuration.new }
-
     before do
       allow(helper).to receive_messages(blacklight_config: blacklight_config)
     end
@@ -305,7 +278,6 @@ describe BlacklightHelper do
 
     context "with a solr document with the display type field set" do
       let(:document) { SolrDocument.new 'my_field' => 'xyz'}
-
       before do
         blacklight_config.show.display_type_field = 'my_field'
       end
@@ -313,68 +285,60 @@ describe BlacklightHelper do
       it "uses the value in the configured display type field" do
         expect(helper.document_partial_name(document)).to eq 'xyz'
       end
-
       it "uses the value in the configured display type field if the action-specific field is empty" do
         expect(helper.document_partial_name(document, :some_action)).to eq 'xyz'
       end
     end
 
     context "with a solr doucment with an action-specific field set" do
-
       let(:document) { SolrDocument.new 'my_field' => 'xyz', 'other_field' => 'abc' }
-
       before do
         blacklight_config.show.media_display_type_field = 'my_field'
         blacklight_config.show.metadata_display_type_field = 'other_field'
       end
-
       it "uses the value in the action-specific fields" do
         expect(helper.document_partial_name(document, :media)).to eq 'xyz'
         expect(helper.document_partial_name(document, :metadata)).to eq 'abc'
       end
-
     end
   end
+
   describe "#type_field_to_partial_name" do
     let(:document) { double }
     context "with default value" do
       subject { helper.type_field_to_partial_name(document, 'default') }
-      it { should eq 'default' } 
+      it { should eq 'default' }
     end
     context "with spaces" do
       subject { helper.type_field_to_partial_name(document, 'one two three') }
-      it { should eq 'one_two_three' } 
+      it { should eq 'one_two_three' }
     end
     context "with hyphens" do
       subject { helper.type_field_to_partial_name(document, 'one-two-three') }
-      it { should eq 'one_two_three' } 
+      it { should eq 'one_two_three' }
     end
     context "an array" do
       subject { helper.type_field_to_partial_name(document, ['one', 'two', 'three']) }
-      it { should eq 'one_two_three' } 
+      it { should eq 'one_two_three' }
     end
   end
-  
+
   describe "#opensearch_description_tag" do
     subject { helper.opensearch_description_tag 'title', 'href' }
-    
     it "has a search rel" do
       expect(subject).to have_selector "link[rel='search']", visible: false
     end
-    
     it "has the correct mime type" do
       expect(subject).to have_selector "link[type='application/opensearchdescription+xml']", visible: false
     end
-    
     it "has a title attribute" do
       expect(subject).to have_selector "link[title='title']", visible: false
     end
-    
     it "has an href attribute" do
       expect(subject).to have_selector "link[href='href']", visible: false
     end
   end
-  
+
   describe "#render_document_index" do
     it "renders the document index with the current view type" do
       allow(helper).to receive_messages(document_index_view_type: :current_view)
@@ -382,10 +346,9 @@ describe BlacklightHelper do
       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("Solr::Response", grouped?: false, start: 0))
@@ -416,7 +379,7 @@ describe BlacklightHelper do
       allow(helper).to receive(:document_index_views).and_return(a: 1, b: 2)
       expect(helper.document_index_view_type(view: :c)).to eq :xyz
     end
-    
+
     context "when they have a preferred view" do
       before do
         session[:preferred_view] = :b
@@ -443,76 +406,55 @@ describe BlacklightHelper do
     end
   end
 
-  describe "#presenter_class" do
-    before do
-      allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
-    end
-
-    it "uses the value defined in the blacklight configuration" do
-      expect(Deprecation).to receive(:warn).exactly(4).times
-      blacklight_config.document_presenter_class = presenter_class
-      expect(helper.presenter_class).to eq presenter_class
-    end
-
-    it "defaults to Blacklight::DocumentPresenter" do
-      expect(Deprecation).to receive(:warn)
-      expect(helper.presenter_class).to eq Blacklight::DocumentPresenter
-    end
-  end
-
-  describe "#index_presenter_class" do
+  context "related classes" do
+    let(:presenter_class) { double }
+    let(:blacklight_config) { Blacklight::Configuration.new }
     before do
       allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
     end
 
-    let :blacklight_config do
-      Blacklight::Configuration.new
-    end
-
-    let :presenter_class do
-      double
-    end
-
-    it "uses the value defined in the blacklight configuration" do
-      blacklight_config.index.document_presenter_class = presenter_class
-      expect(helper.index_presenter_class(nil)).to eq presenter_class
-    end
-
-    it "defaults to Blacklight::IndexPresenter" do
-      expect(helper.index_presenter_class(nil)).to eq Blacklight::IndexPresenter
-    end
-  end
+    describe "#presenter_class" do
+      it "uses the value defined in the blacklight configuration" do
+        expect(Deprecation).to receive(:warn).exactly(2).times
+        blacklight_config.document_presenter_class = presenter_class
+        expect(helper.presenter_class).to eq presenter_class
+      end
 
-  describe "#show_presenter_class" do
-    before do
-      allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
+      it "defaults to Blacklight::DocumentPresenter" do
+        expect(Deprecation).to receive(:warn)
+        expect(helper.presenter_class).to eq Blacklight::DocumentPresenter
+      end
     end
 
-    let :blacklight_config do
-      Blacklight::Configuration.new
-    end
+    describe "#index_presenter_class" do
+      it "uses the value defined in the blacklight configuration" do
+        blacklight_config.index.document_presenter_class = presenter_class
+        expect(helper.index_presenter_class(nil)).to eq presenter_class
+      end
 
-    let :presenter_class do
-      double
+      it "defaults to Blacklight::IndexPresenter" do
+        expect(helper.index_presenter_class(nil)).to eq Blacklight::IndexPresenter
+      end
     end
 
-    it "uses the value defined in the blacklight configuration" do
-      blacklight_config.show.document_presenter_class = presenter_class
-      expect(helper.show_presenter_class(nil)).to eq presenter_class
-    end
+    describe "#show_presenter_class" do
+      it "uses the value defined in the blacklight configuration" do
+        blacklight_config.show.document_presenter_class = presenter_class
+        expect(helper.show_presenter_class(nil)).to eq presenter_class
+      end
 
-    it "defaults to Blacklight::DocumentPresenter" do
-      expect(helper.show_presenter_class(nil)).to eq Blacklight::ShowPresenter
+      it "defaults to Blacklight::DocumentPresenter" do
+        expect(helper.show_presenter_class(nil)).to eq Blacklight::ShowPresenter
+      end
     end
   end
 
   describe "#render_document_heading" do
+    let(:document) { double }
     before do
       allow(helper).to receive(:presenter).and_return(double(heading: "Heading"))
     end
 
-    let(:document) { double }
-
     it "accepts no arguments and render the document heading" do
       expect(helper.render_document_heading).to have_selector "h4", text: "Heading"
     end
@@ -525,7 +467,7 @@ describe BlacklightHelper do
       allow(helper).to receive(:presenter).with(document).and_return(double(heading: "Document Heading"))
       expect(helper.render_document_heading(document)).to have_selector "h4", text: "Document Heading"
     end
-    
+
     it "accepts the document with a tag option" do
       allow(helper).to receive(:presenter).with(document).and_return(double(heading: "Document Heading"))
       expect(helper.render_document_heading(document, tag: "h3")).to have_selector "h3", text: "Document Heading"