blacklight 6.2.0 → 6.3.0

data/app/views/catalog/_document_default.atom.builder

@@ -1,6 +1,5 @@
 xml.entry do
-
-  xml.title presenter(document).render_document_index_label(document_show_link_field(document))
+  xml.title index_presenter(document).label(document_show_link_field(document))
   
   # updated is required, for now we'll just set it to now, sorry
   xml.updated Time.current.iso8601
@@ -8,7 +7,7 @@ xml.entry do
   xml.link    "rel" => "alternate", "type" => "text/html", "href" => polymorphic_url(url_for_document(document))
   # add other doc-specific formats, atom only lets us have one per
   # content type, so the first one in the list wins.
-  xml << render_link_rel_alternates(document, :unique => true)      
+  xml << show_presenter(document).link_rel_alternates(unique: true)      
   
   xml.id polymorphic_url(url_for_document(document))
   

data/app/views/catalog/_document_default.rss.builder

@@ -1,5 +1,5 @@
 xml.item do  
-  xml.title(presenter(document).render_document_index_label(document_show_link_field(document)) || (document.to_semantic_values[:title].first if document.to_semantic_values.key?(:title)))
+  xml.title(index_presenter(document).label(document_show_link_field(document)) || (document.to_semantic_values[:title].first if document.to_semantic_values.key?(:title)))
   xml.link(polymorphic_url(url_for_document(document)))
   xml.author( document.to_semantic_values[:author].first ) if document.to_semantic_values.key? :author
-end
+end

data/app/views/kaminari/blacklight/_next_page.html.erb

@@ -6,6 +6,12 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="<%= 'disabled' if current_page.last? %>">
-  <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
-</li>
+<% if current_page.last? %>
+    <li class="disabled">
+      <%= link_to raw(t 'views.pagination.next'), '#', :rel => 'next', :onclick=>'return false;' %>
+    </li>
+<% else %>
+    <li>
+      <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+    </li>
+<% end %>

data/app/views/kaminari/blacklight/_prev_page.html.erb

@@ -6,6 +6,13 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="<%= 'disabled' if current_page.first? %>">
-  <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
-</li>
+<% if current_page.first? %>
+    <li class="disabled">
+      <%= link_to raw(t 'views.pagination.previous'), '#', :rel => 'prev', :onclick=>'return false;' %>
+    </li>
+<% else %>
+    <li>
+      <%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+    </li>
+<% end %>
+

data/lib/blacklight/configuration.rb

@@ -16,6 +16,7 @@ module Blacklight
     # XXX this isn't very pretty, but it works.
     require_dependency 'blacklight/configuration/fields'
     require_dependency 'blacklight/configuration/field'
+    require_dependency 'blacklight/configuration/null_field'
     require_dependency 'blacklight/configuration/search_field'
     require_dependency 'blacklight/configuration/facet_field'
     require_dependency 'blacklight/configuration/sort_field'
@@ -69,7 +70,7 @@ module Blacklight
           # the model to use for each response document
           document_model: nil,
           # document presenter class used by helpers and views
-          document_presenter_class: nil,
+          document_presenter_class: nil, # deprecated
           # Class for paginating long lists of facet fields
           facet_paginator_class: nil,
           # repository connection configuration
@@ -80,6 +81,8 @@ module Blacklight
           navbar: OpenStructWithHashAccess.new(partials: { }),
           # General configuration for all views
           index: ViewConfig::Index.new(
+            # document presenter class used by helpers and views
+            document_presenter_class: nil,
             # solr field to use to render a document title
             title_field: nil,
             # solr field to use to render format-specific partials
@@ -95,6 +98,8 @@ module Blacklight
             ),
           # Additional configuration when displaying a single document
           show: ViewConfig::Show.new(
+            # document presenter class used by helpers and views
+            document_presenter_class: nil,
             # default route parameters for 'show' requests
             # set this to a hash with additional arguments to merge into 
             # the route, or set `controller: :current` to route to the 
@@ -186,13 +191,20 @@ module Blacklight
       super
     end
 
+    def response_model
+      super || Blacklight::Solr::Response
+    end
+
+    # @deprecated
     def document_presenter_class
       super || Blacklight::DocumentPresenter
     end
 
-    def response_model
-      super || Blacklight::Solr::Response
+    # @deprecated
+    def document_presenter_class=(klass)
+      super
     end
+    deprecation_deprecate :document_presenter_class= => "replaced by show.presenter_class and index.presenter_class"
 
     def response_model= *args
       super

data/lib/blacklight/configuration/null_field.rb

@@ -0,0 +1,13 @@
+module Blacklight
+  # Returned if no config is defined for the field in the Blacklight::Configuration
+  class Configuration::NullField < Blacklight::Configuration::Field
+    def initialize(field_or_hash = nil)
+      case field_or_hash
+      when String, Symbol
+        super(field: field_or_hash)
+      else
+        super
+      end
+    end
+  end
+end

data/lib/blacklight/configuration/view_config.rb

@@ -2,9 +2,15 @@
 class Blacklight::Configuration
   class ViewConfig < Blacklight::OpenStructWithHashAccess
     class Show < ViewConfig
+      def document_presenter_class
+        super || Blacklight::ShowPresenter
+      end
     end
 
     class Index < ViewConfig
+      def document_presenter_class
+        super || Blacklight::IndexPresenter
+      end
     end
   end
 end

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -31,7 +31,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
     #  qt: 'document',
     #  ## These are hard-coded in the blacklight 'document' requestHandler
     #  # fl: '*',
-    #  # rows: 1
+    #  # rows: 1,
     #  # q: '{!term f=id v=$id}'
     #}
 

data/lib/generators/blacklight/templates/config/blacklight.yml

@@ -15,7 +15,7 @@ development:
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>
 test: &test
   adapter: solr
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8888}/solr/blacklight-core" %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/blacklight-core" %>
 production:
   adapter: solr
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>

data/lib/generators/blacklight/templates/config/jetty.yml

@@ -4,7 +4,7 @@ development:
   java_version: ">= 1.7"
 test:
   startup_wait: 60
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8983 %>
   <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
   java_version: ">= 1.7"
 production:

data/spec/controllers/alternate_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe AlternateController do
   describe "the search results tools" do
-    it "should inherit tools from CatalogController" do
+    it "inherits tools from CatalogController" do
       expect(AlternateController.blacklight_config.index.document_actions).to have_key(:bookmark)
     end
 
@@ -11,7 +11,7 @@ describe AlternateController do
       before do
         AlternateController.blacklight_config.index.document_actions.delete(:bookmark)
       end
-      it "should not affect the CatalogController" do
+      it "does not affect the CatalogController" do
         expect(AlternateController.blacklight_config.index.document_actions).to be_empty
         expect(CatalogController.blacklight_config.index.document_actions).to have_key(:bookmark)
       end

data/spec/controllers/application_controller_spec.rb

@@ -5,7 +5,7 @@ describe ApplicationController do
 
   describe "#blacklight_config" do
 
-    it "should provide a default blacklight_config everywhere" do
+    it "provides a default blacklight_config everywhere" do
       expect(controller.blacklight_config).to eq CatalogController.blacklight_config
     end
   end

data/spec/controllers/blacklight/facet_spec.rb

@@ -16,17 +16,17 @@ describe Blacklight::Facet do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   describe "#facet_configuration_for_field" do
-    it "should look up fields by key" do
+    it "looks up fields by key" do
       blacklight_config.add_facet_field 'a'
       expect(subject.facet_configuration_for_field('a')).to eq blacklight_config.facet_fields['a']
     end
 
-    it "should look up fields by field name" do
+    it "looks up fields by field name" do
       blacklight_config.add_facet_field 'a', field: 'b'
       expect(subject.facet_configuration_for_field('b')).to eq blacklight_config.facet_fields['a']
     end
 
-    it "should support both strings and symbols" do
+    it "supports both strings and symbols" do
       blacklight_config.add_facet_field 'a', field: :b
       expect(subject.facet_configuration_for_field('b')).to eq blacklight_config.facet_fields['a']
     end

data/spec/controllers/blacklight/search_fields_spec.rb

@@ -24,25 +24,25 @@ describe Blacklight::SearchFields do
     allow(@search_field_obj).to receive(:blacklight_config).and_return(@config)
   end
 
-  it "should return search field list with calculated :label when needed" do
+  it "returns search field list with calculated :label when needed" do
      @search_field_obj.search_field_list.each do |hash|        
         expect(hash.label).not_to be_blank
      end
   end
 
-  it "should fill in default qt where needed" do
+  it "fills in default qt where needed" do
     expect(@search_field_obj.search_field_def_for_key("all_fields").qt).to eq @config.default_solr_params[:qt]
   end
 
-  it "should lookup field definitions by key" do
+  it "lookups field definitions by key" do
     expect(@search_field_obj.search_field_def_for_key("title").key).to eq "title"
   end
 
-  it "should find label by key" do
+  it "finds label by key" do
     expect(@search_field_obj.label_for_search_field("title")).to eq "Title"
   end
 
-  it "should supply default label for key not found" do
+  it "supplies default label for key not found" do
     expect(@search_field_obj.label_for_search_field("non_existent_key")).to eq "Keyword"
   end
 
@@ -50,7 +50,7 @@ describe Blacklight::SearchFields do
     before do
       @bad_config = MockConfig.new
     end
-    it "should raise exception on #search_field_list" do
+    it "raises exception on #search_field_list" do
       expect { allow(@bad_config).to receive(:blacklight_config).and_return(Blacklight::Configuration.new { |config|
            config.add_search_field :label => 'All Fields', :qt => 'all_fields'
            config.add_search_field 'title', :qt => 'title_search'
@@ -62,7 +62,7 @@ describe Blacklight::SearchFields do
     before do
       @bad_config = MockConfig.new
     end
-    it "should raise on #search_field_list" do
+    it "raises on #search_field_list" do
       expect { allow(@bad_config).to receive(:blacklight_config).and_return(Blacklight::Configuration.new { |config|
         config.add_search_field 'my_key', :label => 'All Fields'
         config.add_search_field 'my_key', :label => 'title'

data/spec/controllers/blacklight/search_helper_spec.rb

@@ -59,7 +59,7 @@ describe Blacklight::SearchHelper do
         (@solr_response, @document_list) = subject.search_results(q: @all_docs_query)
       end
 
-      it "should use the configured request handler " do
+      it "uses the configured request handler" do
         allow(blacklight_config).to receive(:default_solr_params).and_return({:qt => 'custom_request_handler'})
         allow(blacklight_solr).to receive(:send_and_receive) do |path, params|
           expect(path).to eq 'select'
@@ -70,11 +70,11 @@ describe Blacklight::SearchHelper do
         subject.search_results(q: @all_docs_query)
       end
 
-      it 'should have a @response.docs list of the same size as @document_list' do
+      it 'has a @response.docs list of the same size as @document_list' do
         expect(@solr_response.docs).to have(@document_list.length).docs
       end
 
-      it 'should have @response.docs list representing same documents as SolrDocuments in @document_list' do
+      it 'has @response.docs list representing same documents as SolrDocuments in @document_list' do
         @solr_response.docs.each_index do |index|
           mash = @solr_response.docs[index]
           solr_document = @document_list[index]
@@ -96,11 +96,11 @@ describe Blacklight::SearchHelper do
         (@solr_response, @document_list) = subject.search_results(q: @all_docs_query)
       end
 
-      it "should have an empty document list" do
+      it "has an empty document list" do
         expect(@document_list).to be_empty
       end
 
-      it "should return a grouped response" do
+      it "returns a grouped response" do
         expect(@solr_response).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
 
       end
@@ -116,11 +116,11 @@ describe Blacklight::SearchHelper do
         (@solr_response, @document_list) = subject.search_results(q: @all_docs_query)
       end
 
-      it "should have an empty document list" do
+      it "has an empty document list" do
         expect(@document_list).to be_empty
       end
 
-      it "should return a grouped response" do
+      it "returns a grouped response" do
         expect(@solr_response).to be_a_kind_of Blacklight::Solr::Response::GroupResponse
         expect(@solr_response.group_field).to eq "title_sort"
       end
@@ -128,7 +128,7 @@ describe Blacklight::SearchHelper do
 
 
     describe "for All Docs Query and One Facet" do
-      it 'should have results' do
+      it 'has results' do
         (solr_response, document_list) = subject.search_results(q: @all_docs_query, f: @single_facet)
         expect(solr_response.docs).to have(document_list.size).results
         expect(solr_response.docs).to have_at_least(1).result
@@ -138,7 +138,7 @@ describe Blacklight::SearchHelper do
     end
 
     describe "for Query Without Results and No Facet" do
-      it 'should have no results and not raise error' do
+      it 'has no results and not raise error' do
         (solr_response, document_list) = subject.search_results(q: @no_docs_query)
         expect(document_list).to have(0).results
         expect(solr_response.docs).to have(0).results
@@ -146,7 +146,7 @@ describe Blacklight::SearchHelper do
     end
 
     describe "for Query Without Results and One Facet" do
-      it 'should have no results and not raise error' do
+      it 'has no results and not raise error' do
         (solr_response, document_list) = subject.search_results(q: @no_docs_query, f: @single_facet)
         expect(document_list).to have(0).results
         expect(solr_response.docs).to have(0).results
@@ -154,7 +154,7 @@ describe Blacklight::SearchHelper do
     end
 
     describe "for All Docs Query and Bad Facet" do
-      it 'should have no results and not raise error' do
+      it 'has no results and not raise error' do
         (solr_response, document_list) = subject.search_results(q: @all_docs_query, f: @bad_facet)
         expect(document_list).to have(0).results
         expect(solr_response.docs).to have(0).results
@@ -173,20 +173,20 @@ describe Blacklight::SearchHelper do
       @facets = solr_response.aggregations
     end
 
-    it 'should have more than one facet' do
+    it 'has more than one facet' do
       expect(@facets).to have_at_least(1).facet
     end
-    it 'should have all facets specified in initializer' do
+    it 'has all facets specified in initializer' do
       expect(@facets.keys).to include *blacklight_config.facet_fields.keys
       expect(@facets.none? { |k, v| v.nil? }).to eq true
     end
 
-    it 'should have at least one value for each facet' do
+    it 'has at least one value for each facet' do
       @facets.each do |key, facet|
         expect(facet.items).to have_at_least(1).hit
       end
     end
-    it 'should have multiple values for at least one facet' do
+    it 'has multiple values for at least one facet' do
       has_mult_values = false
       @facets.each do |key, facet|
         if facet.items.size > 1
@@ -196,7 +196,7 @@ describe Blacklight::SearchHelper do
       end
       expect(has_mult_values).to eq true
     end
-    it 'should have all value counts > 0' do
+    it 'has all value counts > 0' do
       @facets.each do |key, facet|
         facet.items.each do |facet_vals|
           expect(facet_vals.hits).to be > 0
@@ -210,56 +210,56 @@ describe Blacklight::SearchHelper do
   describe 'Paging', :integration => true do
     let(:blacklight_config) { copy_of_catalog_config }
 
-    it 'should start with first results by default' do
+    it 'starts with first results by default' do
       (solr_response, document_list) = subject.search_results(q: @all_docs_query)
       expect(solr_response.params[:start].to_i).to eq 0
     end
-    it 'should have number of results (per page) set in initializer, by default' do
+    it 'has number of results (per page) set in initializer, by default' do
       (solr_response, document_list) = subject.search_results(q: @all_docs_query)
       expect(solr_response.docs).to have(blacklight_config[:default_solr_params][:rows]).items
       expect(document_list).to have(blacklight_config[:default_solr_params][:rows]).items
     end
 
-    it 'should get number of results per page requested' do
+    it 'gets number of results per page requested' do
       num_results = 3  # non-default value
       (solr_response1, document_list1) = subject.search_results(q: @all_docs_query, per_page: num_results)
       expect(document_list1).to have(num_results).docs
       expect(solr_response1.docs).to have(num_results).docs
     end
 
-    it 'should get number of rows requested' do
+    it 'gets number of rows requested' do
       num_results = 4  # non-default value
       (solr_response1, document_list1) = subject.search_results(q: @all_docs_query, rows: num_results)
       expect(document_list1).to have(num_results).docs
       expect(solr_response1.docs).to have(num_results).docs
     end
 
-    it 'should skip appropriate number of results when requested - default per page' do
+    it 'skips appropriate number of results when requested - default per page' do
       page = 3
       (solr_response2, document_list2) = subject.search_results(q: @all_docs_query, page: page)
       expect(solr_response2.params[:start].to_i).to eq  blacklight_config[:default_solr_params][:rows] * (page-1)
     end
-    it 'should skip appropriate number of results when requested - non-default per page' do
+    it 'skips appropriate number of results when requested - non-default per page' do
       page = 3
       num_results = 3
       (solr_response2a, document_list2a) = subject.search_results(q: @all_docs_query, per_page: num_results, page: page)
       expect(solr_response2a.params[:start].to_i).to eq num_results * (page-1)
     end
 
-    it 'should have no results when prompted for page after last result' do
+    it 'has no results when prompted for page after last result' do
       big = 5000
       (solr_response3, document_list3) = subject.search_results(q: @all_docs_query, rows: big, page: big)
       expect(document_list3).to have(0).docs
       expect(solr_response3.docs).to have(0).docs
     end
 
-    it 'should show first results when prompted for page before first result' do
+    it 'shows first results when prompted for page before first result' do
       # FIXME: should it show first results, or should it throw an error for view to deal w?
       #   Solr throws an error for a negative start value
       (solr_response4, document_list4) = subject.search_results(q: @all_docs_query, page: '-1')
       expect(solr_response4.params[:start].to_i).to eq 0
     end
-    it 'should have results available when asked for more than are in response' do
+    it 'has results available when asked for more than are in response' do
       big = 5000
       (solr_response5, document_list5) = subject.search_results(q: @all_docs_query, rows: big, page: 1)
       expect(solr_response5.docs).to have(document_list5.length).docs
@@ -276,34 +276,34 @@ describe Blacklight::SearchHelper do
       @response2, @document = subject.fetch(@doc_id)
     end
 
-    it "should raise Blacklight::RecordNotFound for an unknown id" do
+    it "raises Blacklight::RecordNotFound for an unknown id" do
       expect {
         subject.fetch(@bad_id)
       }.to raise_error(Blacklight::Exceptions::RecordNotFound)
     end
 
-    it "should use a provided document request handler " do
+    it "uses a provided document request handler" do
       allow(blacklight_config).to receive_messages(:document_solr_request_handler => 'document')
       allow(blacklight_solr).to receive(:send_and_receive).with('select', kind_of(Hash)).and_return({'response'=>{'docs'=>[]}})
       expect { subject.fetch(@doc_id)}.to raise_error Blacklight::Exceptions::RecordNotFound
     end
 
-    it "should use a provided document solr path " do
+    it "uses a provided document solr path" do
       allow(blacklight_config).to receive_messages(:document_solr_path => 'get')
       allow(blacklight_solr).to receive(:send_and_receive).with('get', kind_of(Hash)).and_return({'response'=>{'docs'=>[]}})
       expect { subject.fetch(@doc_id)}.to raise_error Blacklight::Exceptions::RecordNotFound
     end
 
-    it "should have a non-nil result for a known id" do
+    it "has a non-nil result for a known id" do
       expect(@document).not_to be_nil
     end
-    it "should have a single document in the response for a known id" do
+    it "has a single document in the response for a known id" do
       expect(@response2.docs.size).to eq 1
     end
-    it 'should have the expected value in the id field' do
+    it 'has the expected value in the id field' do
       expect(@document.id).to eq @doc_id
     end
-    it 'should have non-nil values for required fields set in initializer' do
+    it 'has non-nil values for required fields set in initializer' do
       expect(@document.fetch(blacklight_config.view_config(:show).display_type_field)).not_to be_nil
     end
   end
@@ -354,7 +354,7 @@ describe Blacklight::SearchHelper do
   describe "facet_limit_for" do
     let(:blacklight_config) { copy_of_catalog_config }
 
-    it "should return specified value for facet_field specified" do
+    it "returns specified value for facet_field specified" do
       expect(subject.facet_limit_for("subject_topic_facet")).to eq blacklight_config.facet_fields["subject_topic_facet"].limit
     end
 
@@ -364,7 +364,7 @@ describe Blacklight::SearchHelper do
       expect(subject.facet_limit_hash).to eq blacklight_config[:facet][:limits]
     end
 
-    it "should handle no facet_limits in config" do
+    it "handles no facet_limits in config" do
       blacklight_config.facet_fields = {}
       expect(subject.facet_limit_for("subject_topic_facet")).to be_nil
     end
@@ -375,23 +375,23 @@ describe Blacklight::SearchHelper do
         config.add_facet_field "language_facet", limit: true
         config
       end
-      it "should return nil if no @response available" do
+      it "returns nil if no @response available" do
         expect(subject.facet_limit_for("some_unknown_field")).to be_nil
       end
-      it "should get from @response facet.limit if available" do        
+      it "gets from @response facet.limit if available" do        
         @response = double()
         allow(@response).to receive(:aggregations).and_return("language_facet" => double(limit: nil))
         subject.instance_variable_set(:@response, @response)
         blacklight_config.facet_fields['language_facet'].limit = 10
         expect(subject.facet_limit_for("language_facet")).to eq 10
       end
-      it "should get the limit from the facet field in @response" do
+      it "gets the limit from the facet field in @response" do
         @response = double()
         allow(@response).to receive(:aggregations).and_return("language_facet" => double(limit: 16))
         subject.instance_variable_set(:@response, @response)
         expect(subject.facet_limit_for("language_facet")).to eq 15
       end
-      it "should default to 10" do
+      it "defaults to 10" do
         expect(subject.facet_limit_for("language_facet")).to eq 10
       end
     end
@@ -404,13 +404,13 @@ describe Blacklight::SearchHelper do
 # TODO: maybe eventually check other types of solr requests
 #  more like this
 #  nearby on shelf
-  it "should raise a Blacklight exception if RSolr can't connect to the Solr instance" do
+  it "raises a Blacklight exception if RSolr can't connect to the Solr instance" do
     allow(blacklight_solr).to receive(:send_and_receive).and_raise(Errno::ECONNREFUSED)
     expect { subject.repository.search }.to raise_exception(/Unable to connect to Solr instance/)
   end
 
   describe "grouped_key_for_results" do
-    it "should pull the grouped key out of the config" do
+    it "pulls the grouped key out of the config" do
       blacklight_config.index.group = 'xyz'
       expect(subject.grouped_key_for_results).to eq('xyz')
     end 
@@ -422,27 +422,27 @@ describe Blacklight::SearchHelper do
       @full_response, @all_docs = pre_query.search_results(q: '', per_page: '100')
     end
 
-    it "should return the previous and next documents for a search" do
+    it "returns the previous and next documents for a search" do
       response, docs = subject.get_previous_and_next_documents_for_search(4, :q => '')
 
       expect(docs.first.id).to eq @all_docs[3].id
       expect(docs.last.id).to eq @all_docs[5].id
     end
 
-    it "should return only the next document if the counter is 0" do
+    it "returns only the next document if the counter is 0" do
       response, docs = subject.get_previous_and_next_documents_for_search(0, :q => '')
 
       expect(docs.first).to be_nil
       expect(docs.last.id).to eq @all_docs[1].id
     end
 
-    it "should return only the previous document if the counter is the total number of documents" do
+    it "returns only the previous document if the counter is the total number of documents" do
       response, docs = subject.get_previous_and_next_documents_for_search(@full_response.total - 1, :q => '')
       expect(docs.first.id).to eq @all_docs.slice(-2).id
       expect(docs.last).to be_nil
     end
 
-    it "should return an array of nil values if there is only one result" do
+    it "returns an array of nil values if there is only one result" do
       response, docs = subject.get_previous_and_next_documents_for_search(0, :q => 'id:2007020969')
       expect(docs.last).to be_nil
       expect(docs.first).to be_nil