blacklight 7.2.0 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00a998f008fdf60cfe8e5623d8230c040e82f3a43daed779ad0aa276361b6050
-  data.tar.gz: 2ec969ac9ad9f859206c684d3380945345c175362dae5e0fc785d7aa9d4a697e
+  metadata.gz: 958a6b0c5bfc8cfdd7fa31fe600d5bc77219f389b850453ade7a7a7aef6f8229
+  data.tar.gz: f6a49835143c4126550be6f937e7328e002e2c63f20dcb36adfa77150d6e60a0
 SHA512:
-  metadata.gz: 67616cd584f0210b58b23de20c4c216e0f10ac9e547458b1eb98c34d6169372f42ca43b2131e804d9d0846c77218db81e36947223e5e96f8e470158a65bddfe9
-  data.tar.gz: 37a72f8450db7388d77764ff430b12962febc213a0a3cb8f5e1a84bff134dc1edbf2f79f08bf4f68980c71d4b47ccea7396554f99dfb6ea50847ea729851396f
+  metadata.gz: fce42f491e0dd73fc1f0f71d051d0afc8c324ac07b4fbaf9f0d728e0bdb0bde657000ef044e48b28fad008015b29c4dc0e73c47671677ae37cf2e38a06137741
+  data.tar.gz: eb4d53904c2d1a309aef41fbcb166c18fabde6d0a8eaf8851df1032c783ea4b34af8115ffb91464f9aaed907078f42cacb644d12770f14fc301e9c008c3e4648

data/.travis.yml

@@ -8,12 +8,12 @@ notifications:
 
 matrix:
   include:
+    - rvm: 2.6.5
+      env: "RAILS_VERSION=6.0.0 ENGINE_CART_RAILS_OPTIONS=\"--skip-webpack-install\""
     - rvm: 2.6.5
       env: "RAILS_VERSION=5.2.3"
     - rvm: 2.5.7
       env: "RAILS_VERSION=5.1.7"
-    - rvm: 2.4.9
-      env: "RAILS_VERSION=5.2.3"
     - rvm: 2.5.7
       env: "RAILS_VERSION=5.2.3 BLACKLIGHT_API_TEST=true ENGINE_CART_RAILS_OPTIONS=\"--api --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test\""
     - rvm: 2.4.9
@@ -25,6 +25,9 @@ matrix:
   fast_finish: true
 
 before_install:
+  - docker pull solr:7
+  - docker run -d -p 8983:8983 -v $PWD/lib/generators/blacklight/templates/solr/conf:/myconfig solr:7 solr-create -c blacklight-core -d /myconfig
+  - docker ps -a
   - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
 
 notifications:
@@ -34,7 +37,7 @@ notifications:
 
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test'
+  - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
   - CC_TEST_REPORTER_ID=5042c7358c96b0b926088a4cda3e132fffe7a66ce8047cdb1dc6f0b4b6676b79
 
 jdk: openjdk11

data/Gemfile

@@ -34,7 +34,7 @@ else
   end
 
   case ENV['RAILS_VERSION']
-  when /^5.[12]/
+  when /^5.[12]/, /^6.0/
     gem 'sass-rails', '~> 5.0'
   when /^4.2/
     gem 'responders', '~> 2.0'

data/VERSION

@@ -1 +1 @@
-7.2.0
+7.3.0

data/app/controllers/concerns/blacklight/facet.rb

@@ -18,8 +18,14 @@ module Blacklight
 
     # @param fields [Array<String>] a list of facet field names
     # @return [Array<Solr::Response::Facets::FacetField>]
-    def facets_from_request(fields = facet_field_names)
-      fields.map { |field| facet_by_field_name(field) }.compact
+    def facets_from_request(fields = facet_field_names, response = nil)
+      unless response
+        Deprecation.warn(self, 'Calling facets_from_request without passing the ' \
+          'second argument (response) is deprecated and will be removed in Blacklight ' \
+          '8.0.0')
+        response = @response
+      end
+      fields.map { |field| facet_by_field_name(field, response) }.compact
     end
 
     def facet_group_names
@@ -27,13 +33,19 @@ module Blacklight
     end
 
     # Get a FacetField object from the @response
-    def facet_by_field_name(field_or_field_name)
+    def facet_by_field_name(field_or_field_name, response = nil)
+      unless response
+        Deprecation.warn(self, 'Calling facet_by_field_name without passing the ' \
+          'second argument (response) is deprecated and will be removed in Blacklight ' \
+          '8.0.0')
+        response = @response
+      end
       case field_or_field_name
       when String, Symbol
         facet_field = facet_configuration_for_field(field_or_field_name)
-        @response.aggregations[facet_field.field]
+        response.aggregations[facet_field.field]
       when Blacklight::Configuration::FacetField
-        @response.aggregations[field_or_field_name.field]
+        response.aggregations[field_or_field_name.field]
       else
         # is this really a useful case?
         field_or_field_name

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -260,7 +260,7 @@ module Blacklight::BlacklightHelperBehavior
     case action_name
     when 'show', 'citation'
       show_presenter(document)
-    when 'index'
+    else
       index_presenter(document)
     end
   end

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -7,8 +7,14 @@ module Blacklight::FacetsHelperBehavior
   #
   # @param [Array<String>] fields
   # @return [Boolean]
-  def has_facet_values? fields = facet_field_names
-    facets_from_request(fields).any? { |display_facet| should_render_facet?(display_facet) }
+  def has_facet_values? fields = facet_field_names, response = nil
+    unless response
+      Deprecation.warn(self, 'Calling has_facet_values? without passing the ' \
+        'second argument (response) is deprecated and will be removed in Blacklight ' \
+        '8.0.0')
+      response = @response
+    end
+    facets_from_request(fields, response).any? { |display_facet| should_render_facet?(display_facet) }
   end
 
   ##
@@ -17,9 +23,24 @@ module Blacklight::FacetsHelperBehavior
   #
   # @param [Array<String>] fields
   # @param [Hash] options
+  # @options options [Blacklight::Solr::Response] :response the Solr response object
   # @return String
-  def render_facet_partials fields = facet_field_names, options = {}
-    safe_join(facets_from_request(fields).map do |display_facet|
+  def render_facet_partials fields = nil, options = {}
+    unless fields
+      Deprecation.warn(self, 'Calling render_facet_partials without passing the ' \
+        'first argument (fields) is deprecated and will be removed in Blacklight ' \
+        '8.0.0')
+      fields = facet_field_names
+    end
+
+    response = options.delete(:response)
+    unless response
+      Deprecation.warn(self, 'Calling render_facet_partials without passing the ' \
+        'response keyword is deprecated and will be removed in Blacklight ' \
+        '8.0.0')
+      response = @response
+    end
+    safe_join(facets_from_request(fields, response).map do |display_facet|
       render_facet_limit(display_facet, options)
     end.compact, "\n")
   end

data/app/presenters/blacklight/field_presenter.rb

@@ -3,6 +3,12 @@
 module Blacklight
   # Renders a field and handles link_to_facet or helper_method if supplied
   class FieldPresenter
+    # @param controller [Object] the context in which to execute helper methods
+    # @param document [SolrDocument] the document
+    # @param field_config [Blacklight::Configuration::Field] the field's configuration
+    # @param options [Hash]
+    # @option options [Object] :value when this is provided, we don't want the pipeline to deal with helper methods.
+    #                                 this happens when drawing the label for the document
     def initialize(controller, document, field_config, options)
       @controller = controller
       @document = document
@@ -13,15 +19,12 @@ module Blacklight
     attr_reader :controller, :document, :field_config, :options
 
     def render
-      if options[:value]
-        # This prevents helper methods from drawing.
-        config = Configuration::NullField.new(field_config.to_h.except(:helper_method))
-        values = Array.wrap(options[:value])
-      else
-        config = field_config
-        values = retrieve_values
-      end
-      Rendering::Pipeline.render(values, config, document, controller, options)
+      return Rendering::Pipeline.render(retrieve_values, field_config, document, controller, options) unless options[:value]
+
+      values = Array.wrap(options[:value])
+      # Prevents helper methods from drawing.
+      steps = Rendering::Pipeline.operations - [Rendering::HelperMethod]
+      Rendering::Pipeline.new(values, field_config, document, controller, steps, options).render
     end
 
     private

data/app/presenters/blacklight/index_presenter.rb

@@ -17,7 +17,8 @@ module Blacklight
     end
 
     ##
-    # Render the document index heading
+    # Render the document index heading. This is used when making a link to a
+    # document, where we don't want any HTML markup added from the pipeline.
     #
     # @param [Symbol, Proc, String] field_or_string_or_proc Render the given field or evaluate the proc or render the given string
     # @param [Hash] opts

data/app/presenters/blacklight/json_presenter.rb

@@ -18,7 +18,7 @@ module Blacklight
 
     # @return [Array<Blacklight::Solr::Response::Facets::FacetField>]
     def search_facets
-      facets_from_request.select { |display_facet| display_facet.items.present? }
+      facets_from_request(facet_field_names, @response).select { |display_facet| display_facet.items.present? }
     end
 
     # extract the pagination info from the response object

data/app/presenters/blacklight/rendering/pipeline.rb

@@ -2,27 +2,42 @@
 
 module Blacklight
   module Rendering
-    # The field rendering pipeline
+    # The field rendering pipeline.
+    # This takes a field and its values and transforms them through a list of
+    # operations.
     class Pipeline
-      class_attribute :operations
+      class_attribute :operations, instance_accessor: false
 
       # The ordered list of pipeline operations
       self.operations = [HelperMethod, LinkToFacet, Microdata, Join]
 
-      def initialize(values, config, document, context, options)
+      # @param values [Array] the values for the field
+      # @param config [Blacklight::Configuration::Field] the field's configuration
+      # @param document [SolrDocument] the document
+      # @param context [Object] an execution context, used to execute the helper method in.
+      # @param operations [Array<Class>] the list of operations in this Pipeline
+      # @param options [Hash] options to pass to the processors. Typically only `:value` is used
+      def initialize(values, config, document, context, operations, options)
         @values = values
         @config = config
         @document = document
         @context = context
+        @operations = operations
         @options = options
       end
 
-      attr_reader :values, :config, :document, :context, :options
+      attr_reader :values, :config, :document, :context, :operations, :options
 
+      # @param values [Array] the values for the field
+      # @param config [Blacklight::Configuration::Field] the field's configuration
+      # @param document [SolrDocument] the document
+      # @param context [Object] an execution context, used to execute the  helper method in.
+      # @param options [Hash] options to pass to the processors. Typically only `:value` is used
       def self.render(values, config, document, context, options)
-        new(values, config, document, context, options).render
+        new(values, config, document, context, operations, options).render
       end
 
+      # Perform the processing by the pipeline
       def render
         first, *rest = *stack
         first.new(values, config, document, context, options, rest).render

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

@@ -13,7 +13,7 @@
       <span class="filter-name"><%= label %></span>
     <% end %>
     <% unless value.blank? %>
-      <%= content_tag :span, value, class: 'filter-value', title: value %>
+      <%= content_tag :span, value, class: 'filter-value', title: strip_tags(value) %>
     <% end %>
   </span>
   <% unless options[:remove].blank? %>

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

@@ -17,7 +17,7 @@ xml.entry do
     xml.author { xml.name(document.to_semantic_values[:author].first) }
   end
 
-  with_format("html") do
+  with_format(:html) do
     xml.summary "type" => "html" do
       xml.text! render_document_partial(document,
       :index,

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

@@ -1,5 +1,5 @@
 <% # main container for facets/limits menu -%>
-<% if has_facet_values? facet_field_names(groupname) %>
+<% if has_facet_values? facet_field_names(groupname), @response %>
 <div id="facets<%= "-#{groupname}" unless groupname.nil? %>" class="facets sidenav facets-toggleable-md">
 
   <div class="navbar">
@@ -13,7 +13,7 @@
   </div>
 
   <div id="facet-panel<%= "-#{groupname}" unless groupname.nil? %>-collapse" class="facets-collapse collapse">
-    <%= render_facet_partials facet_field_names(groupname) %>
+    <%= render_facet_partials facet_field_names(groupname), response: @response %>
   </div>
 </div>
 <% end %>

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

@@ -12,8 +12,8 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
   xml.author { xml.name application_name }
 
   xml.link    "rel" => "self", "href" => url_for(search_state.to_h.merge(only_path: false))
-  xml.link    "rel" => "alternate", "href" => url_for(search_state.to_h.merge(only_path: false, format: "html")), "type" => "text/html"
-  xml.id      url_for(search_state.to_h.merge(:only_path => false, :format => "html", :content_format => nil, "type" => "text/html"))
+  xml.link    "rel" => "alternate", "href" => url_for(search_state.to_h.merge(only_path: false, format: :html)), "type" => "text/html"
+  xml.id      url_for(search_state.to_h.merge(only_path: false, format: :html, content_format: nil, "type" => "text/html"))
 
   # Navigational and context links
 

data/app/views/layouts/blacklight/base.html.erb

@@ -27,11 +27,10 @@
   <main id="main-container" class="<%= container_classes %>" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
     <%= content_for(:container_header) %>
 
-      <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
+    <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
 
-      <div class="row">
-        <%= content_for?(:content) ? yield(:content) : yield %>
-      </div>
+    <div class="row">
+      <%= content_for?(:content) ? yield(:content) : yield %>
     </div>
   </main>
 

data/blacklight.gemspec

@@ -25,15 +25,14 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '~> 2.1'
 
-  s.add_dependency "rails", "~> 5.1"
+  s.add_dependency "rails", '>= 5.1', '< 7'
   s.add_dependency "globalid"
   s.add_dependency "jbuilder", '~> 2.7'
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "deprecation"
 
   s.add_development_dependency "rsolr", ">= 1.0.6", "< 3"  # Library for interacting with rSolr.
-  s.add_development_dependency "solr_wrapper"
-  s.add_development_dependency "rspec-rails", "~> 3.5"
+  s.add_development_dependency "rspec-rails", "~> 4.0.0.beta2"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
   s.add_development_dependency "capybara", '~> 3'

data/lib/blacklight/solr/response/facets.rb

@@ -120,6 +120,15 @@ module Blacklight::Solr::Response::Facets
     @facet_pivot ||= facet_counts['facet_pivot'] || {}
   end
 
+  # Merge or add new facet count values to existing response
+  def merge_facet(name:, value:, hits: nil)
+    if dig('facet_counts', 'facet_fields', name)
+      self['facet_counts']['facet_fields'][name] << value << hits
+    else
+      self['facet_counts']['facet_fields'][name] = [value, hits]
+    end
+  end
+
   private
 
   ##

data/lib/generators/blacklight/assets_generator.rb

@@ -9,6 +9,19 @@ module Blacklight
       gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
     end
 
+    # Add sprockets javascript to Rails 6.
+    def create_sprockets_javascript
+      return if Rails.version < '6.0.0'
+
+      create_file 'app/assets/javascripts/application.js' do
+        <<~CONTENT
+          //= require jquery
+          //= require rails-ujs
+          //= require turbolinks
+        CONTENT
+      end
+    end
+
     def assets
       copy_file "blacklight.scss", "app/assets/stylesheets/blacklight.scss"
 

data/spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -9,16 +9,17 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
 
   describe "has_facet_values?" do
     let(:empty) { double(items: [], name: 'empty') }
+    let(:response) { instance_double(Blacklight::Solr::Response) }
 
     it "is true if there are any facets to display" do
       a = double(items: [1, 2], name: 'a')
       b = double(items: %w[b c], name: 'b')
       fields = [a, b, empty]
-      expect(helper.has_facet_values?(fields)).to be true
+      expect(helper.has_facet_values?(fields, response)).to be true
     end
 
     it "is false if all facets are empty" do
-      expect(helper.has_facet_values?([empty])).to be false
+      expect(helper.has_facet_values?([empty], response)).to be false
     end
 
     describe "different config" do
@@ -26,7 +27,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
 
       it "is false if no facets are displayable" do
         a = double(items: [1, 2], name: 'basic_field')
-        expect(helper.has_facet_values?([a])).to be false
+        expect(helper.has_facet_values?([a], response)).to be false
       end
     end
   end
@@ -106,15 +107,16 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
       facet_config = double(query: nil, field: 'b', key: 'a')
       facet_field = double
       allow(helper).to receive(:facet_configuration_for_field).with('b').and_return(facet_config)
-      @response = instance_double(Blacklight::Solr::Response, aggregations: { 'b' => facet_field })
+      response = instance_double(Blacklight::Solr::Response, aggregations: { 'b' => facet_field })
 
-      expect(helper.facet_by_field_name('b')).to eq facet_field
+      expect(helper.facet_by_field_name('b', response)).to eq facet_field
     end
   end
 
   describe "render_facet_partials" do
     let(:a) { double(items: [1, 2]) }
     let(:b) { double(items: %w[b c]) }
+    let(:response) { instance_double(Blacklight::Solr::Response) }
 
     it "tries to render all provided facets" do
       empty = double(items: [])
@@ -122,14 +124,16 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
       expect(helper).to receive(:render_facet_limit).with(a, {})
       expect(helper).to receive(:render_facet_limit).with(b, {})
       expect(helper).to receive(:render_facet_limit).with(empty, {})
-      helper.render_facet_partials fields
+      helper.render_facet_partials fields, response: response
     end
 
     it "defaults to the configured facets" do
+      allow(Deprecation).to receive(:warn)
       expect(helper).to receive(:facet_field_names) { [a, b] }
       expect(helper).to receive(:render_facet_limit).with(a, {})
       expect(helper).to receive(:render_facet_limit).with(b, {})
       helper.render_facet_partials
+      expect(Deprecation).to have_received(:warn).twice
     end
   end
 

data/spec/helpers/blacklight_helper_spec.rb

@@ -388,4 +388,46 @@ RSpec.describe BlacklightHelper do
       expect(helper.render_document_heading(document, tag: "h3")).to have_selector "h3", text: "Document Heading"
     end
   end
+
+  describe "#presenter" do
+    let(:document) { double }
+
+    before do
+      allow(helper).to receive(:index_presenter).and_return(:index_presenter)
+      allow(helper).to receive(:show_presenter).and_return(:show_presenter)
+      allow(helper).to receive(:action_name).and_return(action_name)
+    end
+
+    context "action is show" do
+      let(:action_name) { "show" }
+
+      it "uses the show presenter" do
+        expect(helper.presenter(document)).to eq(:show_presenter)
+      end
+    end
+
+    context "action is citation" do
+      let(:action_name) { "citation" }
+
+      it "uses the show presenter" do
+        expect(helper.presenter(document)).to eq(:show_presenter)
+      end
+    end
+
+    context "action is index" do
+      let(:action_name) { "index" }
+
+      it "uses the index presenter" do
+        expect(helper.presenter(document)).to eq(:index_presenter)
+      end
+    end
+
+    context "action is foo" do
+      let(:action_name) { "foo" }
+
+      it "uses the index presenter (by default)" do
+        expect(helper.presenter(document)).to eq(:index_presenter)
+      end
+    end
+  end
 end

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

@@ -104,6 +104,43 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
     end
   end
 
+  describe "#merge_facet" do
+    let(:response) { Blacklight::Solr::Response.new(facet_counts, {}, {}) }
+    let(:facet) { { name: "foo", value: "bar", hits: 1 } }
+
+    before do
+      response.merge_facet(facet)
+    end
+
+    context "facet does not already exist" do
+      it "adds the facet and appends the new field name and value" do
+        expect(response.facet_fields["foo"]).to eq(["bar", 1])
+      end
+    end
+
+    context "facet exists but field does not exist" do
+      let(:facet) { { name: "cat", value: "bar", hits: 1 } }
+
+      it "appends the new field name and value" do
+        expect(response.facet_fields["cat"]).to eq(["memory", 3, "card", 2, "bar", 1])
+      end
+    end
+
+    context "facet exists and field exists" do
+      let(:facet) { { name: "cat", value: "memory", hits: 4 } }
+
+      it "appends the new field name and value and aggregations uses new value" do
+        expect(response.aggregations["cat"].items.count).to eq(2)
+        expect(response.aggregations["cat"].items.first.value).to eq("memory")
+        expect(response.aggregations["cat"].items.first.hits).to eq(4)
+      end
+    end
+
+    def facet_counts
+      { "facet_counts" => { "facet_fields" => { "cat" => ["memory", 3, "card", 2] } } }
+    end
+  end
+
   context "facet.missing" do
     subject { Blacklight::Solr::Response.new(response, {}) }
 

data/spec/presenters/pipeline_spec.rb

@@ -4,11 +4,10 @@ RSpec.describe Blacklight::Rendering::Pipeline do
   include Capybara::RSpecMatchers
   let(:document) { instance_double(SolrDocument) }
   let(:context) { double }
-  let(:options) { double }
-  let(:presenter) { described_class.new(values, field_config, document, context, options) }
+  let(:options) { double('options') }
 
-  describe "render" do
-    subject { presenter.render }
+  describe '.render' do
+    subject { described_class.render(values, field_config, document, context, options) }
 
     let(:values) { %w[a b] }
     let(:field_config) { Blacklight::Configuration::NullField.new }
@@ -28,9 +27,17 @@ RSpec.describe Blacklight::Rendering::Pipeline do
 
       it { is_expected.to have_selector("span[@itemprop='some-prop']", text: "a") }
     end
+
+    it 'sets the operations on the instance as equal to the class variable' do
+      allow(described_class).to receive(:new)
+        .and_return(instance_double(described_class, render: true))
+      subject
+      expect(described_class).to have_received(:new)
+        .with(values, field_config, document, context, described_class.operations, options)
+    end
   end
 
-  describe "#operations" do
+  describe '.operations' do
     subject { described_class.operations }
 
     it {
@@ -40,4 +47,17 @@ RSpec.describe Blacklight::Rendering::Pipeline do
                              Blacklight::Rendering::Join]
     }
   end
+
+  describe '#operations' do
+    subject(:operations) { presenter.operations }
+
+    let(:presenter) { described_class.new(values, field_config, document, context, steps, options) }
+    let(:steps) { [Blacklight::Rendering::HelperMethod] }
+    let(:values) { ['a'] }
+    let(:field_config) { Blacklight::Configuration::NullField.new }
+
+    it 'sets the operations to the value passed to the initializer' do
+      expect(operations).to eq steps
+    end
+  end
 end

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

@@ -15,7 +15,7 @@ RSpec.describe "catalog/_show_tools.html.erb" do
     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"
+      allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_link "Some action", href: "x"

data/tasks/blacklight.rake

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'solr_wrapper'
 require 'engine_cart/rake_task'
 
 require 'rspec/core/rake_task'
@@ -13,14 +12,10 @@ RuboCop::RakeTask.new(:rubocop)
 
 desc "Run test suite"
 task ci: ['blacklight:generate'] do
-  SolrWrapper.wrap do |solr|
-    solr.with_collection do
-      within_test_app do
-        system "RAILS_ENV=test rake blacklight:index:seed"
-      end
-      Rake::Task['blacklight:coverage'].invoke
-    end
+  within_test_app do
+    system "RAILS_ENV=test rake blacklight:index:seed"
   end
+  Rake::Task['blacklight:coverage'].invoke
 end
 
 namespace :blacklight do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.3.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,22 +17,28 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -109,34 +115,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: solr_wrapper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -309,7 +301,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".solr_wrapper.yml"
 - ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.md

data/.solr_wrapper.yml

@@ -1,12 +0,0 @@
-# Place configuration for solr_wrapper here
-#
-# Specify the port to run solr on
-# port: 8983
-#
-# Specify a version of Solr to download
-# version: 7.3.1
-#
-# Create a collection when starting solr
-collection:
-  dir: lib/generators/blacklight/templates/solr/conf/
-  name: blacklight-core