blacklight 6.3.1 → 6.3.3

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-# spec for default partial to display solr document fields 
-#  in catalog INDEX view
+# spec for default partial to display solr document fields in catalog INDEX view
 
 describe "/catalog/_index_default.erb" do
   include BlacklightHelper
@@ -22,7 +20,6 @@ describe "/catalog/_index_default.erb" do
     @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:"
@@ -38,7 +35,7 @@ describe "/catalog/_index_default.erb" do
     expect(@rendered).to_not include("val_2")
     expect(@rendered).to_not 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)
   end
@@ -47,11 +44,11 @@ describe "/catalog/_index_default.erb" do
     # labels
     expect(@rendered).to include(@flabel_1)
     expect(@rendered).to include(@flabel_4)
-    # classes    
+    # classes
     expect(@rendered).to include("blacklight-#{@fname_1}")
     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

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

@@ -1,14 +1,11 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/_index_header_default" do
   let :document do
     SolrDocument.new :id => 'xyz', :format => 'a'
   end
 
-  let :blacklight_config do
-    Blacklight::Configuration.new
-  end
+  let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
     allow(controller).to receive(:action_name).and_return('index')
@@ -30,7 +27,7 @@ describe "catalog/_index_header_default" do
     render partial: "catalog/index_header_default", 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}

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

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/_paginate_compact.html.erb" do
   let(:user) { User.new.tap { |u| u.save(validate: false) } }
-  
+
   before do
     controller.request.path_parameters[:action] = 'index'
   end
 
-  describe "with a real solr response", :integration => true do  
+  describe "with a real solr response", :integration => true do
     def blacklight_config
       @config ||= CatalogController.blacklight_config
     end
-    
+
     def blacklight_config=(config)
       @config = config
     end
@@ -25,7 +24,6 @@ describe "catalog/_paginate_compact.html.erb" do
 
     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]"

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

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 # spec for sidebar partial in catalog show view
 
 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"

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

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-# spec for default partial to display solr document fields 
-#  in catalog show view
+# spec for default partial to display solr document fields in catalog show view
 
 describe "/catalog/_show_default.html.erb" do
-  
+
   include BlacklightHelper
   include CatalogHelper
 
-
   before(:each) do
     allow(controller).to receive(:action_name).and_return('show')
     @config = Blacklight::Configuration.new do |config|
@@ -23,9 +20,9 @@ describe "/catalog/_show_default.html.erb" do
     @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:"
     @flabel_3 = "Two:"
     @flabel_4 = "Four:"
@@ -39,7 +36,7 @@ describe "/catalog/_show_default.html.erb" do
     expect(@rendered).to_not include("val_2")
     expect(@rendered).to_not 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)
   end
@@ -48,11 +45,11 @@ describe "/catalog/_show_default.html.erb" do
     # labels
     expect(@rendered).to include(@flabel_1)
     expect(@rendered).to include(@flabel_4)
-    # classes    
+    # classes
     expect(@rendered).to include("blacklight-#{@fname_1}")
     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
@@ -63,5 +60,4 @@ describe "/catalog/_show_default.html.erb" do
     expect(@rendered).to include("val_4")
     expect(@rendered).to_not include("val_2")
   end
-
 end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 # spec for sidebar partial in catalog show view
 

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

@@ -1,14 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/_show_tools.html.erb" do
-  let :document do
-    SolrDocument.new :id => 'xyz', :format => 'a'
-  end
-
-  let :blacklight_config do
-    Blacklight::Configuration.new
-  end
+  let(:document) { SolrDocument.new :id => 'xyz', :format => 'a' }
+  let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
     assign :response, double(:params => {})
@@ -18,11 +12,7 @@ describe "catalog/_show_tools.html.erb" do
   end
 
   describe "document actions" do
-
-    let :document_actions do
-      blacklight_config.show.document_actions
-    end
-
+    let(:document_actions) { blacklight_config.show.document_actions }
 
     it "renders a document action" do
       allow(view).to receive(:some_action_solr_document_path).with(document).and_return "x"

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

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/_sort_and_per_page" do
-
-  let :blacklight_config do
-    Blacklight::Configuration.new
-  end
+  let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
     blacklight_config.add_results_collection_tool(:sort_widget)

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/_thumbnail_default" do
 

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

@@ -1,19 +1,13 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/_view_type_group" do
-
-  let :blacklight_config do
-    Blacklight::Configuration.new
-  end
+  let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
     allow(view).to receive(:view_label) do |view|
       view.to_s
     end
-
     allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
-
     controller.request.path_parameters[:action] = 'index'
   end
 
@@ -27,7 +21,7 @@ describe "catalog/_view_type_group" do
     assign(:response, [double])
     blacklight_config.configure do |config|
       config.view.delete(:list)
-      config.view.a 
+      config.view.a
       config.view.b
       config.view.c
     end
@@ -38,12 +32,11 @@ describe "catalog/_view_type_group" do
     expect(rendered).to have_selector('.view-type-c', :text => 'c')
   end
 
-
   it "sets the current view to 'active'" do
     assign(:response, [double])
     blacklight_config.configure do |config|
       config.view.delete(:list)
-      config.view.a 
+      config.view.a
       config.view.b
     end
     render partial: 'catalog/view_type_group'
@@ -51,5 +44,4 @@ describe "catalog/_view_type_group" do
     expect(rendered).to_not have_selector('.active', :text => 'b')
     expect(rendered).to have_selector('.btn', :text => 'b')
   end
-
 end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe 'catalog/facet.html.erb' do
   let(:display_facet) { double }

data/spec/views/catalog/facet.json.jbuilder_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 describe "catalog/facet.json" do
   it "renders facet json" do
     assign :pagination, { items: [{ value: 'Book' }] }

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -1,36 +1,29 @@
 # frozen_string_literal: true
-require 'spec_helper'
 require 'rexml/document'
 
 describe "catalog/index" do
-
-  before(:all) do
-    @response = Blacklight::Solr::Response.new({ response: { numFound: 30 }}, { start: 10, rows: 10})
-    @config = CatalogController.blacklight_config
-  end
-
   let(:document_list) do
-    10.times.map { |i| SolrDocument.new(id: i) }
+    10.times.map do |i|
+      doc = SolrDocument.new(id: i)
+      allow(doc).to receive(:export_as_some_format).and_return("")
+      allow(doc).to receive(:to_semantic_values).and_return(author: ['xyz']) if i == 0
+      doc.will_export_as(:some_format, "application/some-format") if i == 1
+      doc
+    end
   end
 
   before do
-    allow(view).to receive(:action_name).and_return('index')
-    params['content_format'] = 'some_format'
+    @response = Blacklight::Solr::Response.new({ response: { numFound: 30 }}, { start: 10, rows: 10})
     @document_list = document_list
-    allow_any_instance_of(SolrDocument).to receive(:export_as_some_format).and_return("")
-    allow(document_list[0]).to receive(:to_semantic_values).and_return(author: ['xyz'])
-    @document_list[1].will_export_as(:some_format, "application/some-format")
-
-    allow(view).to receive(:blacklight_config).and_return(@config)
+    params['content_format'] = 'some_format'
+    allow(view).to receive(:action_name).and_return('index')
+    allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
     allow(view).to receive(:search_field_options_for_select).and_return([])
-
     render template: 'catalog/index', formats: [:atom]
   end
 
-  let(:response_xml) do
-    # We need to use rexml to test certain things that have_tag wont' test
-    REXML::Document.new(rendered)
-  end
+  # We need to use rexml to test certain things that have_tag wont' test
+  let(:response_xml) { REXML::Document.new(rendered) }
 
   it "has contextual information" do
     expect(rendered).to have_selector("link[rel=self]")
@@ -80,29 +73,23 @@ describe "catalog/index" do
     end
 
     describe "with an author" do
-      before do
-        @entry = response_xml.elements.to_a("/feed/entry")[0]
-      end
+      let(:entry) { response_xml.elements.to_a("/feed/entry")[0] }
       it "has author tag" do
-        expect(@entry.elements["author/name"].text).to eq 'xyz'
+        expect(entry.elements["author/name"].text).to eq 'xyz'
       end
     end
 
     describe "without an author" do
-      before do
-        @entry = response_xml.elements.to_a("/feed/entry")[1]
-      end
+      let(:entry) { response_xml.elements.to_a("/feed/entry")[1] }
       it "does not have an author tag" do
-        expect(@entry.elements["author/name"]).to be_nil
+        expect(entry.elements["author/name"]).to be_nil
       end
     end
   end
 
   describe "when content_format is specified" do
     describe "for an entry with content available" do
-      let(:entry) do
-        response_xml.elements.to_a("/feed/entry")[1].to_s
-      end
+      let(:entry) { response_xml.elements.to_a("/feed/entry")[1].to_s }
       it "includes a link rel tag" do
         expect(entry).to have_selector("link[rel=alternate][type='application/some-format']")
       end
@@ -111,11 +98,9 @@ describe "catalog/index" do
       end
     end
     describe "for an entry with NO content available" do
-      before do
-        @entry = response_xml.elements.to_a("/feed/entry")[5]
-      end
-      it "includes content" do
-        expect(@entry.to_s).to_not have_selector("content[type='application/some-format']")
+      let(:entry) { response_xml.elements.to_a("/feed/entry")[5].to_s }
+      it "does not have content embedded" do
+        expect(entry).to_not have_selector("content[type='application/some-format']")
       end
     end
   end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/index.html.erb" do
 
@@ -13,7 +12,6 @@ describe "catalog/index.html.erb" do
       expect(rendered).to match /id="sidebar"/
       expect(rendered).to match /id="content"/
     end
-
     it "renders the search_sidebar partial" do
       stub_template "catalog/_search_sidebar.html.erb" => "sidebar_content"
       render
@@ -26,7 +24,6 @@ describe "catalog/index.html.erb" do
       allow(view).to receive(:has_search_parameters?).and_return(true)
       stub_template "catalog/_results_pagination.html.erb" => ""
       stub_template "catalog/_search_header.html.erb" => "header_content"
-
       allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
       allow(view).to receive(:render_opensearch_response_metadata).and_return("")
       assign(:response, double(:empty? => true))

data/spec/views/catalog/index.json.jbuilder_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 describe "catalog/index.json" do
   let(:response) { double("response") }
   let(:docs) { [{ id: '123', title_t: 'Book1' }, { id: '456', title_t: 'Book2' }] }

data/spec/views/catalog/opensearch.xml.builder_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe 'catalog/opensearch.xml.builder' do
   it "renders an OpenSearch description document" do

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

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/show.html.erb" do
-
-  let :document do
-    SolrDocument.new :id => 'xyz', :format => 'a'
-  end
-
-  let :blacklight_config do
-    Blacklight::Configuration.new
-  end
+  let(:document) { SolrDocument.new :id => 'xyz', :format => 'a' }
+  let(:blacklight_config) { Blacklight::Configuration.new }
 
   before :each do
     allow(view).to receive(:action_name).and_return('show')
@@ -32,7 +25,6 @@ describe "catalog/show.html.erb" do
     allow(view).to receive(:document_show_html_title).and_return("Heading")
     allow(document).to receive_messages(:itemtype => 'some-item-type-uri')
     render
-
     expect(rendered).to have_selector('div#document[@itemscope]')
     expect(rendered).to have_selector('div#document[@itemtype="some-item-type-uri"]')
   end
@@ -41,14 +33,11 @@ describe "catalog/show.html.erb" do
     allow(view).to receive(:render_grouped_response?).and_return(false)
     stub_template "catalog/_show_header_default.html.erb" => "document_header"
     stub_template "catalog/_show_default.html.erb" => "show_default"
-    
     render
-
     expect(rendered).to match /document_header/
     expect(rendered).to match /show_default/
   end
 
-
   it "uses the show.partials parameter to determine the partials to render" do
     allow(view).to receive(:render_grouped_response?).and_return(false)
     blacklight_config.show.partials = ['a', 'b', 'c']