blacklight 6.3.1 → 6.3.3

data/spec/lib/tasks/blacklight_task_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 require 'rake'
 
 describe "blacklight:delete_old_searches" do

data/spec/models/blacklight/configurable_spec.rb

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

data/spec/models/blacklight/configuration/context_spec.rb

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

data/spec/models/blacklight/configuration_spec.rb

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

data/spec/models/blacklight/document/active_model_shim_spec.rb

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

data/spec/models/blacklight/document/cache_key_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Document::CacheKey do
   let(:attributes) { {} }

data/spec/models/blacklight/document/dublin_core_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Blacklight::Document::DublinCore" do
   before(:all) do

data/spec/models/blacklight/document/email_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Blacklight::Document::Email" do
   before(:all) do

data/spec/models/blacklight/document/sms_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Blacklight::Document::Email" do
   before(:all) do

data/spec/models/blacklight/document_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Document do
   let(:data) { {} }

data/spec/models/blacklight/facet_paginator_spec.rb

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

data/spec/models/blacklight/search_builder_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::SearchBuilder do
   let(:processor_chain) { [] }

data/spec/models/blacklight/solr/document/more_like_this_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Solr::Document::MoreLikeThis do
   before(:all) do

data/spec/models/blacklight/solr/document_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "Blacklight::Solr::Document" do
     class MockDocument

data/spec/models/blacklight/solr/facet_paginator_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Solr::FacetPaginator do
   let(:f1) { Blacklight::Solr::Response::Facets::FacetItem.new(hits: '792', value: 'Book') }

data/spec/models/blacklight/solr/repository_spec.rb

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

data/spec/models/blacklight/solr/request_spec.rb

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

data/spec/models/blacklight/solr/response/facets_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Solr::Response::Facets do
   describe Blacklight::Solr::Response::Facets::FacetField do

data/spec/models/blacklight/solr/response_spec.rb

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

data/spec/models/blacklight/solr/search_builder_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Solr::SearchBuilderBehavior do
   let(:single_facet) { { format: 'Book' } }

data/spec/models/blacklight/suggest/response_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Suggest::Response do
   let(:empty_response) { described_class.new({}, { q: 'hello' }, 'suggest') }

data/spec/models/blacklight/user_spec.rb

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

data/spec/models/bookmark_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Bookmark do
   let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345'}

data/spec/models/record_mailer_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe RecordMailer do
   before(:each) do

data/spec/models/search_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Search do
   let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345'}

data/spec/models/solr_document_spec.rb

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

data/spec/presenters/document_presenter_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::DocumentPresenter do
   include Capybara::RSpecMatchers

data/spec/presenters/index_presenter_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::IndexPresenter do
   include Capybara::RSpecMatchers

data/spec/presenters/pipeline_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::Rendering::Pipeline do
   include Capybara::RSpecMatchers

data/spec/presenters/show_presenter_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe Blacklight::ShowPresenter do
   include Capybara::RSpecMatchers

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 # Has been customized by Blacklight to work when application is in one place,
-# and actual spec/ stuff is in another (the blacklight gem checkout).  
+# and actual spec/ stuff is in another (the blacklight gem checkout).
 
 ENV["RAILS_ENV"] ||= 'test'
 
@@ -27,21 +27,18 @@ require 'rspec/collection_matchers'
 require 'capybara/rspec'
 require 'capybara/poltergeist'
 
-
 Capybara.javascript_driver = :poltergeist
 
 Capybara.register_driver :poltergeist do |app|
   options = {}
-
   options[:timeout] = 120 if RUBY_PLATFORM == "java"
-
   Capybara::Poltergeist::Driver.new(app, options)
 end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-# Blacklight, again, make sure we're looking in the right place for em. 
-# Relative to HERE, NOT to Rails.root, which is off somewhere else. 
+# Blacklight, again, make sure we're looking in the right place for em.
+# Relative to HERE, NOT to Rails.root, which is off somewhere else.
 Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each {|f| require f}
 
 RSpec.configure do |config|
@@ -53,12 +50,12 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = true
 
-  if Rails.version > '5'
-    # This is for an unreleased version of Devise (will either be 4.2 or 5.0)
+  if defined? Devise::Test::ControllerHelpers
     config.include Devise::Test::ControllerHelpers, type: :controller
   else
     config.include Devise::TestHelpers, type: :controller
   end
+
   config.infer_spec_type_from_file_location!
 
   config.include(ControllerLevelHelpers, type: :helper)

data/spec/test_app_templates/Gemfile.extra

@@ -1,4 +1,4 @@
 if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
   gem 'rails-controller-testing'
-  gem 'deprecation', github: 'jcoyne/deprecation', branch: 'no_alias_method_chain'
+  gem 'deprecation'
 end

data/spec/views/_user_util_links.html.erb_spec.rb

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

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

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

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/_constraints_element.html.erb" do
   describe "for simple display" do
@@ -25,7 +24,6 @@ describe "catalog/_constraints_element.html.erb" do
         expect(s).to have_selector(".remove[href='http://remove']")
       end
     end
-
     it "has an accessible remove label" do
       expect(rendered).to have_selector(".remove") do |s|
         expect(s).to have_content("Remove constraint my label: my value")
@@ -50,8 +48,5 @@ describe "catalog/_constraints_element.html.erb" do
       expect(rendered).to have_selector("span.appliedFilter.constraint span.filterName span.custom_label")
       expect(rendered).to have_selector("span.appliedFilter.constraint span.filterValue span.custom_value")
     end
-
   end
-
-
 end

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

@@ -1,14 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/_document" 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
     allow(view).to receive(:render_grouped_response?).and_return(false)
@@ -27,7 +21,6 @@ describe "catalog/_document" do
     expect(rendered).to have_selector('div.document[@itemtype="http://schema.org/Thing"]')
   end
 
-
   it "uses the index.partials parameter to determine the partials to render" do
     blacklight_config.index.partials = ['a', 'b', 'c']
     stub_template "catalog/_a_default.html.erb" => "a_partial"
@@ -41,17 +34,13 @@ describe "catalog/_document" do
 
   it 'has a css class with the document position' do
     allow(view).to receive(:render_document_partials)
-
     render partial: 'catalog/document', locals: { document: document, document_counter: 5 }
-
     expect(rendered).to have_selector 'div.document-position-5'
   end
 
   it 'has a data attribute with the document position' do
     allow(view).to receive(:render_document_partials)
-
     render partial: 'catalog/document', locals: { document: document, document_counter: 5 }
-
     expect(rendered).to have_selector 'div.document[@data-document-counter="5"]'
   end
-end
+end

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

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
-require 'spec_helper'
-
-describe "catalog/_document_list", type: :view do  
 
+describe "catalog/_document_list", type: :view do
   before do
     allow(view).to receive_messages(document_index_view_type: "some-view", documents: [])
   end
-
   it "includes a class for the current view" do
     render
     expect(rendered).to have_selector(".documents-some-view")

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe 'catalog/_facet_index_navigation.html.erb', type: :view do
   let(:pagination) { Blacklight::Solr::FacetPaginator.new([]) }
@@ -15,7 +14,6 @@ describe 'catalog/_facet_index_navigation.html.erb', type: :view do
 
   it 'renders the facet index navigation range' do
     render
-
     expect(rendered).to have_selector '.pagination'
     expect(rendered).to have_link '0', href: '/?facet.prefix=0&facet.sort=index'
     expect(rendered).to have_link '1'
@@ -35,7 +33,6 @@ describe 'catalog/_facet_index_navigation.html.erb', type: :view do
       render
       expect(rendered).to have_selector '.active', text: '5'
     end
-
     it 'enables the clear facets button' do
       render
       expect(rendered).to have_link 'Clear Filter'

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/facet_layout" do
-
   let :blacklight_config do
     Blacklight::Configuration.new do |config|
       config.facet_fields[facet_field.field] = facet_field
@@ -19,7 +17,7 @@ describe "catalog/facet_layout" do
 
   it "has a facet-specific class" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
-    expect(rendered).to have_selector '.blacklight-some_field' 
+    expect(rendered).to have_selector '.blacklight-some_field'
   end
 
   it "has a title with a link for a11y" do
@@ -38,8 +36,5 @@ describe "catalog/facet_layout" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
     expect(rendered).to_not have_selector '.panel-heading.collapsed'
     expect(rendered).to have_selector '.in .panel-body'
-
   end
-
-
-end
+end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 describe "catalog/_facets" do
   let(:blacklight_config) { Blacklight::Configuration.new }
@@ -26,13 +25,10 @@ describe "catalog/_facets" do
 
     before do
       blacklight_config.facet_fields['facet_field_1'] = facet_field
-
-        @mock_display_facet_1 = double(:name => 'facet_field_1', sort: nil, offset: nil, prefix: nil, :items => [Blacklight::Solr::Response::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
-        allow(view).to receive_messages(:facet_field_names => [:facet_field_1],
-                  :facet_limit_for => 10 )
-
-        @response = double()
-        allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
+      @mock_display_facet_1 = double(:name => 'facet_field_1', sort: nil, offset: nil, prefix: nil, :items => [Blacklight::Solr::Response::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
+      allow(view).to receive_messages(:facet_field_names => [:facet_field_1], :facet_limit_for => 10)
+      @response = double()
+      allow(@response).to receive(:aggregations).and_return("facet_field_1" => @mock_display_facet_1)
     end
 
     it "has a header" do
@@ -41,23 +37,19 @@ describe "catalog/_facets" do
       expect(rendered).to have_selector('.facets-heading')
     end
 
-
     describe "facet display" do
       it "has a(n accessible) header" do
         render
         expect(rendered).to have_selector('.facet-field-heading')
       end
-
       it "lists values" do
         render
-
         # The .facet-content class is used by blacklight_range_limit js, and
         # should be applied to the .panel-collapse div that contains the collapsible
-        # facet content. Please make sure it remains if possible. 
+        # facet content. Please make sure it remains if possible.
         expect(rendered).to have_selector('.facet-content a.facet_select')
-        expect(rendered).to have_selector('.facet-content .facet-count')    
+        expect(rendered).to have_selector('.facet-content .facet-count')
       end
     end
   end
 end
-