blacklight 6.2.0 → 6.3.0

data/spec/models/blacklight/document_spec.rb

@@ -11,50 +11,50 @@ describe Blacklight::Document do
 
   describe "#has?" do
     context "without value constraints" do
-      it "should have the field if the field is in the data" do
+      it "has the field if the field is in the data" do
         data[:x] = true
         expect(subject).to have_field(:x)
       end
       
-      it "should not have the field if the field is not in the data" do
+      it "does not have the field if the field is not in the data" do
         expect(subject).not_to have_field(:x)
       end
     end
 
     context "with regular value constraints" do
-      it "should have the field if the data has that value" do
+      it "has the field if the data has that value" do
         data[:x] = true
         expect(subject).to have_field(:x, true)
       end
       
-      it "should not have the field if the data does not have that value" do
+      it "does not have the field if the data does not have that value" do
         data[:x] = false
         expect(subject).not_to have_field(:x, true)
       end
 
-      it "should allow multiple value constraints" do
+      it "allows multiple value constraints" do
         data[:x] = false
         expect(subject).to have_field(:x, true, false)
       end
 
-      it "should support multivalued fields" do
+      it "supports multivalued fields" do
         data[:x] = ["a", "b", "c"]
         expect(subject).to have_field(:x, "a")
       end
 
-      it "should support multivalued fields with an array of value constraints" do
+      it "supports multivalued fields with an array of value constraints" do
         data[:x] = ["a", "b", "c"]
         expect(subject).to have_field(:x, "a", "d")
       end
     end
 
     context "with regexp value constraints" do
-      it "should check if the data matches the constraint" do
+      it "checks if the data matches the constraint" do
         data[:x] = "the quick brown fox"
         expect(subject).to have_field(:x, /fox/)
       end
 
-      it "should support multivalued fields" do
+      it "supports multivalued fields" do
         data[:x] = ["the quick brown fox", "and the lazy dog"]
         expect(subject).to have_field(:x, /fox/)
       end
@@ -84,7 +84,7 @@ describe Blacklight::Document do
       allow(MockDocument).to receive(:repository).and_return(double(find: MockResponse.new([{id: 1}], {})))
     end
 
-    it "should have a globalid" do
+    it "has a globalid" do
       expect(MockDocument.find(1).to_global_id).to be_a GlobalID
     end
   end

data/spec/models/blacklight/facet_paginator_spec.rb

@@ -21,7 +21,7 @@ describe Blacklight::FacetPaginator do
     its(:current_page) { should eq 1 }
     its(:prev_page) { should be_nil }
     its(:next_page) { should eq 2 }
-    it 'should limit items to limit, if limit is smaller than items.length' do
+    it 'limits items to limit, if limit is smaller than items.length' do
       expect(subject.items.size).to eq 6
     end
   end
@@ -33,7 +33,7 @@ describe Blacklight::FacetPaginator do
     its(:current_page) { should eq 2 }
     its(:prev_page) { should eq 1 }
     its(:next_page) { should be_nil }
-    it 'should return all items when limit is greater than items.length' do
+    it 'returns all items when limit is greater than items.length' do
       expect(subject.items.size).to eq 1
     end
   end
@@ -45,7 +45,7 @@ describe Blacklight::FacetPaginator do
     its(:current_page) { should eq 2 }
     its(:prev_page) { should eq 1 }
     its(:next_page) { should eq 3 }
-    it 'should limit items to limit, if limit is smaller than items.length' do
+    it 'limits items to limit, if limit is smaller than items.length' do
       expect(subject.items.size).to eq 6
     end
   end
@@ -61,7 +61,7 @@ describe Blacklight::FacetPaginator do
     let(:page_key) { described_class.request_keys[:page] }
     subject { described_class.new([], offset: 100, limit: limit, sort: 'index') }
 
-    it 'should know a manually set sort, and produce proper sort url' do
+    it 'knows a manually set sort, and produce proper sort url' do
         expect(subject.sort).to eq 'index'
 
         click_params = subject.params_for_resort_url('count', {}.with_indifferent_access)
@@ -105,7 +105,7 @@ describe Blacklight::FacetPaginator do
 
   describe "#as_json" do
     subject { described_class.new([f1], offset: 0, limit: nil).as_json }
-    it "should be well structured" do
+    it "is well structured" do
       expect(subject).to eq("items" => [{"hits"=>"792", "value"=>"Book"}], "limit" => nil,
        "offset" => 0, "sort" => nil)
     end

data/spec/models/blacklight/search_builder_spec.rb

@@ -28,13 +28,13 @@ describe Blacklight::SearchBuilder do
   end
 
   describe "#with" do
-    it "should set the blacklight params" do
+    it "sets the blacklight params" do
       params = {}
       subject.with(params)
       expect(subject.blacklight_params).to eq params
     end
 
-    it "should dup the params" do
+    it "dups the params" do
       params = {}
       subject.with(params).where('asdf')
       expect(subject.blacklight_params).not_to eq params
@@ -45,7 +45,7 @@ describe Blacklight::SearchBuilder do
 
   describe "#processor_chain" do
     let(:processor_chain) { [:a, :b, :c] }
-    it "should be mutable" do
+    it "is mutable" do
       subject.processor_chain.insert(-1, :d)
       expect(subject.processor_chain).to match_array [:a, :b, :c, :d]
     end
@@ -53,7 +53,7 @@ describe Blacklight::SearchBuilder do
 
   describe "#append" do
     let(:processor_chain) { [:a, :b, :c] }
-    it "should provide a new search builder with the processor chain" do
+    it "provides a new search builder with the processor chain" do
       builder = subject.append(:d, :e)
       expect(subject.processor_chain).to eq processor_chain
       expect(builder.processor_chain).not_to eq subject.processor_chain
@@ -73,7 +73,7 @@ describe Blacklight::SearchBuilder do
   end
 
   describe "#to_hash" do
-    it "should update if data is changed" do
+    it "updates if data is changed" do
       subject.merge(q: 'xyz')
       expect(subject.to_hash).to include q: 'xyz'
       subject.merge(q: 'abc')
@@ -88,7 +88,7 @@ describe Blacklight::SearchBuilder do
         req_params.replace subject.blacklight_params
       end
     end
-    it "should overwrite the processed parameters" do
+    it "overwrites the processed parameters" do
       actual = subject.with(q: 'abc').merge(q: 'xyz')
       expect(actual[:q]).to eq 'xyz'
     end
@@ -102,12 +102,12 @@ describe Blacklight::SearchBuilder do
       end
     end
 
-    it "should provide default values for parameters" do
+    it "provides default values for parameters" do
       actual = subject.reverse_merge(a: 1)
       expect(actual[:a]).to eq 1
     end
 
-    it "should not overwrite the processed parameters" do
+    it "does not overwrite the processed parameters" do
       actual = subject.with(q: 'abc').reverse_merge(q: 'xyz')
       expect(actual[:q]).to eq 'abc'
     end
@@ -116,7 +116,7 @@ describe Blacklight::SearchBuilder do
   describe "#processed_parameters" do
     let(:processor_chain) { [:step_1] }
 
-    it "should try to run the processor method on the search builder" do
+    it "tries to run the processor method on the search builder" do
       allow(subject).to receive(:step_1) do |req_params|
         req_params[:step_1] = 'builder'
       end
@@ -127,130 +127,130 @@ describe Blacklight::SearchBuilder do
   end
 
   describe "#blacklight_config" do
-    it "should get the blacklight_config from the scope" do
+    it "gets the blacklight_config from the scope" do
       expect(subject.blacklight_config).to eq scope.blacklight_config
     end
   end
 
   describe "#page" do
-    it "should be the current user parameter page number" do
+    it "is the current user parameter page number" do
       expect(subject.with(page: 2).send(:page)).to eq 2
     end
 
-    it "should be page 1 if not page number given" do
+    it "is page 1 if not page number given" do
       expect(subject.send(:page)).to eq 1
     end
 
-    it "should coerce parameters to integers" do
+    it "coerces parameters to integers" do
       expect(subject.with(page: '2b').send(:page)).to eq 2
     end
   end
 
   describe "#rows" do
 
-    it "should be nil if no value is set" do
+    it "is nil if no value is set" do
       blacklight_config.default_per_page = nil
       blacklight_config.per_page = []
       expect(subject.rows).to be_nil
     end
 
-    it "should set the number of rows" do
+    it "sets the number of rows" do
       expect(subject.rows(17).rows).to eq 17
     end
 
-    it "should be the per_page parameter" do
+    it "is the per_page parameter" do
       expect(subject.with(per_page: 5).rows).to eq 5
     end
 
-    it "should support the legacy 'rows' parameter" do
+    it "supports the legacy 'rows' parameter" do
       expect(subject.with(rows: 10).rows).to eq 10
     end
 
-    it "should be set to the configured default" do
+    it "is set to the configured default" do
       blacklight_config.default_per_page = 42
       expect(subject.rows).to eq 42
     end
 
-    it "should limit the number of rows to the configured maximum" do
+    it "limits the number of rows to the configured maximum" do
       blacklight_config.max_per_page = 1000
       expect(subject.rows(1001).rows).to eq 1000
     end
   end
 
   describe "#sort" do
-    it "should pass through the sort parameter" do
+    it "passes through the sort parameter" do
       expect(subject.with(sort: 'x').send(:sort)).to eq 'x'
     end
 
-    it "should use the default if no sort parameter is given" do
+    it "uses the default if no sort parameter is given" do
       blacklight_config.default_sort_field = double(sort: 'x desc')
       expect(subject.send(:sort)).to eq 'x desc'
     end
 
-    it "should use the requested sort field" do
+    it "uses the requested sort field" do
       blacklight_config.add_sort_field 'x', sort: 'x asc'
       expect(subject.with(sort: 'x').send(:sort)).to eq 'x asc'
     end
   end
 
   describe "#facet" do
-    it "should be nil if no value is set" do
+    it "is nil if no value is set" do
       expect(subject.facet).to be_nil
     end
 
-    it "should set facet value" do
+    it "sets facet value" do
       expect(subject.facet('format').facet).to eq 'format'
     end
   end
 
   describe "#search_field" do
-    it "should use the requested search field" do
+    it "uses the requested search field" do
       blacklight_config.add_search_field 'x'
       expect(subject.with(search_field: 'x').send(:search_field)).to eq blacklight_config.search_fields['x']
     end
   end
 
   describe "#params_changed?" do
-    it "should be false" do
+    it "is false" do
       expect(subject.send(:params_changed?)).to eq false
     end
 
-    it "should be marked as changed when with() changes" do
+    it "is marked as changed when with() changes" do
       subject.with(a: 1)
       expect(subject.send(:params_changed?)).to eq true
     end
 
-    it "should be marked as changed when where() changes" do
+    it "is marked as changed when where() changes" do
       subject.where(a: 1)
       expect(subject.send(:params_changed?)).to eq true
     end
 
-    it "should be marked as changed when the processor chain changes" do
+    it "is marked as changed when the processor chain changes" do
       subject.append(:a)
       expect(subject.send(:params_changed?)).to eq true
     end
 
-    it "should be marked as changed when merged parameters are added" do
+    it "is marked as changed when merged parameters are added" do
       subject.merge(a: 1)
       expect(subject.send(:params_changed?)).to eq true
     end
 
-    it "should be marked as changed when reverse merged parameters are added" do
+    it "is marked as changed when reverse merged parameters are added" do
       subject.merge(a: 1)
       expect(subject.send(:params_changed?)).to eq true
     end
 
-    it "should be marked as changed when pagination changes" do
+    it "is marked as changed when pagination changes" do
       subject.page(1)
       expect(subject.send(:params_changed?)).to eq true
     end
 
-    it "should be marked as changed when rows changes" do
+    it "is marked as changed when rows changes" do
       subject.rows(1)
       expect(subject.send(:params_changed?)).to eq true
     end
 
-    it "should be marked as changed when start offset changes" do
+    it "is marked as changed when start offset changes" do
       subject.start(1)
       expect(subject.send(:params_changed?)).to eq true
     end

data/spec/models/blacklight/user_spec.rb

@@ -16,7 +16,7 @@ describe "Blacklight::User" do
       subject.bookmarks << mock_bookmark(3)
     end
     
-    it "should return all the bookmarks that match the given documents" do
+    it "returns all the bookmarks that match the given documents" do
       bookmarks = subject.bookmarks_for_documents([SolrDocument.new(id: 1), SolrDocument.new(id: 2)])
       expect(bookmarks).to have(2).items
       expect(bookmarks.first.document_id).to eq "1"
@@ -29,11 +29,11 @@ describe "Blacklight::User" do
       subject.bookmarks << mock_bookmark(1)
     end
     
-    it "should  be true if the document is bookmarked" do
+    it "is true if the document is bookmarked" do
       expect(subject).to be_document_is_bookmarked(SolrDocument.new(id: 1))
     end
 
-    it "should be false if the document is not bookmarked" do
+    it "is false if the document is not bookmarked" do
       expect(subject).to_not be_document_is_bookmarked(SolrDocument.new(id: 2))
     end
   end
@@ -43,7 +43,7 @@ describe "Blacklight::User" do
       subject.bookmarks << mock_bookmark(1)
     end
     
-    it "should return the bookmark for that document id" do
+    it "returns the bookmark for that document id" do
       expect(subject.existing_bookmark_for(SolrDocument.new(id: 1))).to eq subject.bookmarks.first
     end
   end

data/spec/models/bookmark_spec.rb

@@ -9,27 +9,27 @@ describe Bookmark do
     b
   end
 
-  it "should be valid" do
+  it "is valid" do
     expect(subject).to be_valid
   end
 
-  it "should belong to user" do
+  it "belongs to user" do
     expect(Bookmark.reflect_on_association(:user)).not_to be_nil
   end
 
-  it "should be valid after saving" do
+  it "is valid after saving" do
     subject.save
     expect(subject).to be_valid
   end
   
   describe "#document_type" do
-    it "should be the class of the solr document" do
+    it "is the class of the solr document" do
       expect(subject.document_type).to eq SolrDocument
     end
   end
   
   describe "#document" do
-    it "should be a SolrDocument with just an id field" do
+    it "is a SolrDocument with just an id field" do
       expect(subject.document).to be_a_kind_of SolrDocument
       expect(subject.document.id).to eq 'u001'
     end

data/spec/models/record_mailer_spec.rb

@@ -14,24 +14,24 @@ describe RecordMailer do
       details = {:to => 'test@test.com', :message => "This is my message"}
       @email = RecordMailer.email_record(@documents,details,{:host =>'projectblacklight.org', :protocol => 'https'}) 
     end
-    it "should receive the TO paramater and send the email to that address" do
+    it "receives the TO paramater and send the email to that address" do
       expect(@email.to).to include 'test@test.com'
     end
-    it "should start the subject w/ Item Record:" do
+    it "starts the subject w/ Item Record:" do
       expect(@email.subject).to match /^Item Record:/
     end
-    it "should put the title of the item in the subject" do
+    it "puts the title of the item in the subject" do
       expect(@email.subject).to match /The horn/
     end
-    it "should have the correct from address (w/o the port number)" do
+    it "has the correct from address (w/o the port number)" do
       expect(@email.from).to include "no-reply@projectblacklight.org"
     end
-    it "should print out the correct body" do
+    it "prints out the correct body" do
       expect(@email.body).to match /Title: The horn/
       expect(@email.body).to match /Author: Janetzky, Kurt/
       expect(@email.body).to match /projectblacklight.org/
     end
-    it "should use https URLs when protocol is set" do
+    it "uses https URLs when protocol is set" do
       details = {:to => 'test@test.com', :message => "This is my message"}
       @https_email = RecordMailer.email_record(@documents,details,{:host =>'projectblacklight.org', :protocol => 'https'})
       expect(@https_email.body).to match %r|https://projectblacklight.org/|
@@ -43,21 +43,21 @@ describe RecordMailer do
       details = {:to => '5555555555@txt.att.net'}
       @sms = RecordMailer.sms_record(@documents,details,{:host =>'projectblacklight.org:3000'})
     end
-    it "should create the correct TO address for the SMS email" do
+    it "creates the correct TO address for the SMS email" do
       expect(@sms.to).to include '5555555555@txt.att.net'
     end
-    it "should not have a subject" do
+    it "does not have a subject" do
       expect(@sms.subject).to be_blank
     end
-    it "should have the correct from address (w/o the port number)" do
+    it "has the correct from address (w/o the port number)" do
       expect(@sms.from).to include "no-reply@projectblacklight.org"
     end
-    it "should print out the correct body" do
+    it "prints out the correct body" do
       expect(@sms.body).to match /The horn/
       expect(@sms.body).to match /by Janetzky, Kurt/
       expect(@sms.body).to match /projectblacklight.org:3000/      
     end
-    it "should use https URL when protocol is set" do
+    it "uses https URL when protocol is set" do
       details = {:to => '5555555555@txt.att.net'}
       @https_sms = RecordMailer.sms_record(@documents,details,{:host =>'projectblacklight.org', :protocol => 'https'})
       expect(@https_sms.body).to match %r|https://projectblacklight.org/|