blacklight 9.0.0.beta1 → 9.0.0.beta2

data/lib/blacklight/solr/abstract_filter_query_builder.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Blacklight::Solr
+  class AbstractFilterQueryBuilder
+    def initialize(blacklight_config:)
+      @blacklight_config = blacklight_config
+    end
+
+    attr_reader :blacklight_config
+
+    private
+
+    def facet_inclusive_value_to_fq_string(facet_field, values)
+      return if values.blank?
+
+      return facet_value_to_fq_string(facet_field, values.first) if values.length == 1
+
+      facet_config = blacklight_config.facet_fields[facet_field]
+
+      local_params = []
+      local_params << "tag=#{facet_config.tag}" if facet_config&.tag
+
+      solr_filters = values.each_with_object({}).with_index do |(v, h), index|
+        h["f_inclusive.#{facet_field}.#{index}"] = facet_value_to_fq_string(facet_field, v, use_local_params: false)
+      end
+
+      filter_query = solr_filters.keys.map do |k|
+        "{!query v=$#{k}}"
+      end.join(' OR ')
+
+      ["{!lucene#{" #{local_params.join(' ')}" unless local_params.empty?}}#{filter_query}", solr_filters]
+    end
+
+    ##
+    # Convert a facet/value pair into a solr fq parameter
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def facet_value_to_fq_string(facet_field, value, use_local_params: true)
+      facet_config = blacklight_config.facet_fields[facet_field]
+
+      solr_field = facet_config.field if facet_config && !facet_config.query
+      solr_field ||= facet_field
+
+      local_params = []
+      local_params << "tag=#{facet_config.tag}" if use_local_params && facet_config&.tag
+
+      if facet_config&.query
+        if facet_config.query[value]
+          facet_config.query[value][:fq]
+        else
+          # exclude all documents if the custom facet key specified was not found
+          '-*:*'
+        end
+      elsif value.is_a?(Range)
+        prefix = "{!#{local_params.join(' ')}}" unless local_params.empty?
+        start = value.begin || '*'
+        finish = value.end || '*'
+        "#{prefix}#{solr_field}:[#{start} TO #{finish}]"
+      elsif value == Blacklight::SearchState::FilterField::MISSING
+        "-#{solr_field}:[* TO *]"
+      else
+        "{!term f=#{solr_field}#{" #{local_params.join(' ')}" unless local_params.empty?}}#{convert_to_term_value(value)}"
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+    def convert_to_term_value(value)
+      case value
+      when DateTime, Time
+        value.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+      when Date
+        value.to_time(:local).strftime("%Y-%m-%dT%H:%M:%SZ")
+      else
+        value.to_s
+      end
+    end
+  end
+end

data/lib/blacklight/solr/default_filter_query_builder.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Blacklight::Solr
+  class DefaultFilterQueryBuilder < AbstractFilterQueryBuilder
+    def call(filter, _solr_parameters)
+      filter_queries = []
+      all_subqueries = {}
+      filter.values.compact_blank.each do |value|
+        filter_query, subqueries = if value.is_a?(Array)
+                                     facet_inclusive_value_to_fq_string(filter.key, value.compact_blank)
+                                   else
+                                     facet_value_to_fq_string(filter.config.key, value)
+                                   end
+        filter_queries << filter_query
+        all_subqueries.merge!(subqueries) if subqueries
+      end
+      [filter_queries, all_subqueries]
+    end
+  end
+end

data/lib/blacklight/solr/facet_search_builder_behavior.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Blacklight::Solr
+  module FacetSearchBuilderBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      include Blacklight::Solr::SearchBuilderBehavior
+      self.default_processor_chain = [:default_solr_parameters,
+                                      :add_search_field_default_parameters,
+                                      :add_query_to_solr,
+                                      :add_facet_fq_to_solr,
+                                      :add_facetting_to_solr,
+                                      :add_solr_fields_to_query,
+                                      :add_additional_filters,
+                                      :add_facet_paging_to_solr,
+                                      :add_facet_suggestion_parameters]
+    end
+
+    def add_facet_paging_to_solr(solr_params)
+      return if facet.blank?
+
+      facet_config = blacklight_config.facet_fields[facet]
+
+      solr_params[:rows] = 0
+
+      limit = if solr_params["facet.limit"]
+                solr_params["facet.limit"].to_i
+              else
+                facet_config.fetch(:more_limit, blacklight_config.default_more_limit)
+              end
+
+      page = search_state.facet_page
+      sort = search_state.facet_sort
+      prefix = search_state.facet_prefix
+      offset = (page - 1) * limit
+
+      if facet_config.json
+        add_solr_facet_json_params(solr_parameters, facet, facet_config, limit: limit + 1, offset: offset, sort: sort, prefix: prefix)
+        return
+      end
+
+      # Now override with our specific things for fetching facet values
+      facet_ex = facet_config.respond_to?(:ex) ? facet_config.ex : nil
+      solr_params[:'facet.field'] = with_ex_local_param(facet_ex, facet_config.field)
+
+      # Need to set as f.facet_field.facet.* to make sure we
+      # override any field-specific default in the solr request handler.
+      solr_params[:"f.#{facet_config.field}.facet.limit"] = limit + 1
+      solr_params[:"f.#{facet_config.field}.facet.offset"] = offset
+      solr_params[:"f.#{facet_config.field}.facet.sort"] = sort if sort
+      solr_params[:"f.#{facet_config.field}.facet.prefix"] = prefix if prefix
+    end
+
+    def add_facet_suggestion_parameters(solr_params)
+      return if facet.blank? || facet_suggestion_query.blank?
+
+      solr_params[:'facet.contains'] = facet_suggestion_query[0..50]
+      solr_params[:'facet.contains.ignoreCase'] = true
+    end
+  end
+end

data/lib/blacklight/solr/repository.rb

@@ -8,7 +8,6 @@ module Blacklight::Solr
     # @param [Hash] params additional solr query parameters
     def find id, params = {}
       doc_params = params.reverse_merge(blacklight_config.default_document_solr_params)
-                         .reverse_merge(qt: blacklight_config.document_solr_request_handler)
                          .merge(blacklight_config.document_unique_id_param => id)
 
       solr_response = send_and_receive blacklight_config.document_solr_path || blacklight_config.solr_path, doc_params
@@ -27,7 +26,11 @@ module Blacklight::Solr
     # Execute a search query against solr
     # @param [Hash] params solr query parameters
     # @param [String] path solr request handler path
-    def search pos_params = {}, path: nil, params: nil, **kwargs
+    def search pos_params = nil, path: nil, params: nil, **kwargs
+      if pos_params
+        Blacklight.deprecation.warn("Passing positional arguments to search() is deprecated. Use the params kwarg instead.")
+      end
+
       request_params = (params || pos_params).reverse_merge(kwargs).reverse_merge({ qt: blacklight_config.qt })
 
       send_and_receive(path || default_search_path(request_params), request_params)
@@ -56,15 +59,11 @@ module Blacklight::Solr
     end
 
     ##
-    # Execute a solr query
+    # Execute a solr query at the given path with the parameters
     # TODO: Make this private after we have a way to abstract admin/luke and ping
     # @see [RSolr::Client#send_and_receive]
-    # @overload find(solr_path, params)
-    #   Execute a solr query at the given path with the parameters
-    #   @param [String] solr path (defaults to blacklight_config.solr_path)
-    #   @param [Hash] parameters for RSolr::Client#send_and_receive
-    # @overload find(params)
-    #   @param [Hash] parameters for RSolr::Client#send_and_receive
+    # @param [String] path solr path (defaults to blacklight_config.solr_path)
+    # @param [Hash, Blacklight::SearchBuilder] solr_params parameters for RSolr::Client#send_and_receive
     # @return [Blacklight::Solr::Response] the solr response object
     def send_and_receive(path, solr_params = {})
       benchmark("Solr fetch", level: :debug) do

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

@@ -229,7 +229,7 @@ module Blacklight::Solr::Response::Facets
 
     blacklight_config.facet_fields.select { |_k, v| v.query }.each_with_object({}) do |(field_name, facet_field), hash|
       salient_facet_queries = facet_field.query.map { |_k, x| x[:fq] }
-      items = facet_queries.select { |k, _v| salient_facet_queries.include?(k) }.reject { |_value, hits| hits.zero? }.map do |value, hits|
+      items = facet_queries.slice(*salient_facet_queries).reject { |_value, hits| hits.zero? }.map do |value, hits|
         salient_fields = facet_field.query.select { |_key, val| val[:fq] == value }
         key = ((salient_fields.keys if salient_fields.respond_to? :keys) || salient_fields.first).first
         Blacklight::Solr::Response::Facets::FacetItem.new(value: key, hits: hits, label: facet_field.query[key][:label])
@@ -250,7 +250,7 @@ module Blacklight::Solr::Response::Facets
 
     salient_facet_queries = facet_field.query.map { |_k, x| x[:fq] }
 
-    relevant_facet_data = self['facets'].select { |k, _v| salient_facet_queries.include?(k) }.reject { |_key, data| data['count'].zero? }
+    relevant_facet_data = self['facets'].slice(*salient_facet_queries).reject { |_key, data| data['count'].zero? }
 
     relevant_facet_data.map do |key, data|
       salient_fields = facet_field.query.select { |_key, val| val[:fq] == key }

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

@@ -52,10 +52,6 @@ module Blacklight::Solr::Response::Params
 
   private
 
-  def search_builder
-    request_params if request_params.is_a?(Blacklight::SearchBuilder)
-  end
-
   # Extract JSON Request API parameters from the response header or the request itself
   def json_params
     encoded_json_params = header&.dig('params', 'json')

data/lib/blacklight/solr/response.rb

@@ -8,12 +8,16 @@ class Blacklight::Solr::Response < ActiveSupport::HashWithIndifferentAccess
   include MoreLikeThis
   include Params
 
-  attr_reader :request_params
+  attr_reader :request_params, :search_builder
   attr_accessor :blacklight_config, :options
 
   delegate :document_factory, to: :blacklight_config
 
+  # @param [Hash] data
+  # @param [Hash, Blacklight::SearchBuilder] request_params a SearchBuilder or a Hash of parameters
   def initialize(data, request_params, options = {})
+    @search_builder = request_params if request_params.is_a?(Blacklight::SearchBuilder)
+
     super(force_to_utf8(ActiveSupport::HashWithIndifferentAccess.new(data)))
     @request_params = ActiveSupport::HashWithIndifferentAccess.new(request_params)
     self.blacklight_config = options[:blacklight_config]

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -10,7 +10,6 @@ module Blacklight::Solr
         :add_query_to_solr, :add_facet_fq_to_solr,
         :add_facetting_to_solr, :add_solr_fields_to_query, :add_paging_to_solr,
         :add_sorting_to_solr, :add_group_config_to_solr,
-        :add_facet_paging_to_solr, :add_facet_suggestion_parameters,
         :add_adv_search_clauses,
         :add_additional_filters
       ]
@@ -128,25 +127,19 @@ module Blacklight::Solr
       end
 
       search_state.filters.each do |filter|
-        if filter.config.filter_query_builder
-          filter_query, subqueries = filter.config.filter_query_builder.call(self, filter, solr_parameters)
-
-          Array(filter_query).each do |fq|
-            solr_parameters.append_filter_query(fq)
-          end
-          solr_parameters.merge!(subqueries) if subqueries
+        filter_query_builder_class_or_proc = filter.config.filter_query_builder || DefaultFilterQueryBuilder
+        if filter_query_builder_class_or_proc.is_a?(Class)
+          filter_query_builder = filter_query_builder_class_or_proc.new(blacklight_config: blacklight_config)
+          filter_query, subqueries = filter_query_builder.call(filter, solr_parameters)
         else
-          filter.values.compact_blank.each do |value|
-            filter_query, subqueries = if value.is_a?(Array)
-                                         facet_inclusive_value_to_fq_string(filter.key, value.compact_blank)
-                                       else
-                                         facet_value_to_fq_string(filter.config.key, value)
-                                       end
-
-            solr_parameters.append_filter_query filter_query
-            solr_parameters.merge!(subqueries) if subqueries
-          end
+          # TODO: Maybe deprecate proc?
+          filter_query, subqueries = filter_query_builder_class_or_proc.call(self, filter, solr_parameters)
+        end
+
+        Array(filter_query).each do |fq|
+          solr_parameters.append_filter_query(fq)
         end
+        solr_parameters.merge!(subqueries) if subqueries
       end
     end
 
@@ -190,10 +183,8 @@ module Blacklight::Solr
           solr_parameters[:"f.#{facet.field}.facet.sort"] = facet.sort
         end
 
-        if facet.solr_params
-          facet.solr_params.each do |k, v|
-            solr_parameters[:"f.#{facet.field}.#{k}"] = v
-          end
+        facet.solr_params&.each do |k, v|
+          solr_parameters[:"f.#{facet.field}.#{k}"] = v
         end
 
         limit = facet_limit_with_pagination(field_name)
@@ -203,9 +194,9 @@ module Blacklight::Solr
 
     def add_solr_fields_to_query solr_parameters
       blacklight_config.show_fields.select(&method(:should_add_field_to_request?)).each_value do |field|
-        field.solr_params.each do |k, v|
+        field.solr_params&.each do |k, v|
           solr_parameters[:"f.#{field.field}.#{k}"] = v
-        end if field.solr_params
+        end
       end
 
       blacklight_config.index_fields.select(&method(:should_add_field_to_request?)).each_value do |field|
@@ -214,9 +205,9 @@ module Blacklight::Solr
           solr_parameters.append_highlight_field field.field
         end
 
-        field.solr_params.each do |k, v|
+        field.solr_params&.each do |k, v|
           solr_parameters[:"f.#{field.field}.#{k}"] = v
-        end if field.solr_params
+        end
       end
     end
 
@@ -242,48 +233,6 @@ module Blacklight::Solr
       solr_parameters[:group] = false if search_state.filter(grouped_key_for_results).any?
     end
 
-    def add_facet_paging_to_solr(solr_params)
-      return if facet.blank?
-
-      facet_config = blacklight_config.facet_fields[facet]
-
-      solr_params[:rows] = 0
-
-      limit = if solr_params["facet.limit"]
-                solr_params["facet.limit"].to_i
-              else
-                facet_config.fetch(:more_limit, blacklight_config.default_more_limit)
-              end
-
-      page = search_state.facet_page
-      sort = search_state.facet_sort
-      prefix = search_state.facet_prefix
-      offset = (page - 1) * limit
-
-      if facet_config.json
-        add_solr_facet_json_params(solr_parameters, facet, facet_config, limit: limit + 1, offset: offset, sort: sort, prefix: prefix)
-        return
-      end
-
-      # Now override with our specific things for fetching facet values
-      facet_ex = facet_config.respond_to?(:ex) ? facet_config.ex : nil
-      solr_params[:'facet.field'] = with_ex_local_param(facet_ex, facet_config.field)
-
-      # Need to set as f.facet_field.facet.* to make sure we
-      # override any field-specific default in the solr request handler.
-      solr_params[:"f.#{facet_config.field}.facet.limit"] = limit + 1
-      solr_params[:"f.#{facet_config.field}.facet.offset"] = offset
-      solr_params[:"f.#{facet_config.field}.facet.sort"] = sort if sort
-      solr_params[:"f.#{facet_config.field}.facet.prefix"] = prefix if prefix
-    end
-
-    def add_facet_suggestion_parameters(solr_params)
-      return if facet.blank? || facet_suggestion_query.blank?
-
-      solr_params[:'facet.contains'] = facet_suggestion_query[0..50]
-      solr_params[:'facet.contains.ignoreCase'] = true
-    end
-
     def with_ex_local_param(ex, value)
       if ex
         "{!ex=#{ex}}#{value}"
@@ -340,70 +289,6 @@ module Blacklight::Solr
 
     private
 
-    ##
-    # Convert a facet/value pair into a solr fq parameter
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    def facet_value_to_fq_string(facet_field, value, use_local_params: true)
-      facet_config = blacklight_config.facet_fields[facet_field]
-
-      solr_field = facet_config.field if facet_config && !facet_config.query
-      solr_field ||= facet_field
-
-      local_params = []
-      local_params << "tag=#{facet_config.tag}" if use_local_params && facet_config && facet_config.tag
-
-      if facet_config && facet_config.query
-        if facet_config.query[value]
-          facet_config.query[value][:fq]
-        else
-          # exclude all documents if the custom facet key specified was not found
-          '-*:*'
-        end
-      elsif value.is_a?(Range)
-        prefix = "{!#{local_params.join(' ')}}" unless local_params.empty?
-        start = value.begin || '*'
-        finish = value.end || '*'
-        "#{prefix}#{solr_field}:[#{start} TO #{finish}]"
-      elsif value == Blacklight::SearchState::FilterField::MISSING
-        "-#{solr_field}:[* TO *]"
-      else
-        "{!term f=#{solr_field}#{" #{local_params.join(' ')}" unless local_params.empty?}}#{convert_to_term_value(value)}"
-      end
-    end
-    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
-    def facet_inclusive_value_to_fq_string(facet_field, values)
-      return if values.blank?
-
-      return facet_value_to_fq_string(facet_field, values.first) if values.length == 1
-
-      facet_config = blacklight_config.facet_fields[facet_field]
-
-      local_params = []
-      local_params << "tag=#{facet_config.tag}" if facet_config && facet_config.tag
-
-      solr_filters = values.each_with_object({}).with_index do |(v, h), index|
-        h["f_inclusive.#{facet_field}.#{index}"] = facet_value_to_fq_string(facet_field, v, use_local_params: false)
-      end
-
-      filter_query = solr_filters.keys.map do |k|
-        "{!query v=$#{k}}"
-      end.join(' OR ')
-
-      ["{!lucene#{" #{local_params.join(' ')}" unless local_params.empty?}}#{filter_query}", solr_filters]
-    end
-
-    def convert_to_term_value(value)
-      case value
-      when DateTime, Time
-        value.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
-      when Date
-        value.to_time(:local).strftime("%Y-%m-%dT%H:%M:%SZ")
-      else
-        value.to_s
-      end
-    end
-
     ##
     # The key to use to retrieve the grouped field to display
     def grouped_key_for_results

data/lib/blacklight.rb

@@ -99,7 +99,7 @@ module Blacklight
   end
 
   def self.logger
-    @logger ||= (::Rails.logger if defined? Rails && Rails.respond_to?(:logger))
+    @logger ||= ::Rails.logger
   end
 
   def self.logger= logger

data/lib/generators/blacklight/assets/importmap_generator.rb

@@ -10,7 +10,7 @@ module Blacklight
           <<~CONTENT
             pin "@github/auto-complete-element", to: "https://cdn.skypack.dev/@github/auto-complete-element"
             pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/core@2.11.6/dist/umd/popper.min.js"
-            pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@#{(defined?(Bootstrap) && Bootstrap::VERSION) || '5.3.3'}/dist/js/bootstrap.js"
+            pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@#{(defined?(Bootstrap) && Bootstrap::VERSION) || '5.3.5'}/dist/js/bootstrap.js"
           CONTENT
         end
 
@@ -49,10 +49,8 @@ module Blacklight
         else
           append_to_file 'app/assets/stylesheets/application.css' do
             <<~CONTENT
-              /*
-               *= require blacklight
-               */
-              @import url(https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css);
+              @import url(https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/css/bootstrap.min.css);
+              @import url("blacklight.css");
             CONTENT
           end
         end

data/lib/generators/blacklight/assets_generator.rb

@@ -2,7 +2,7 @@
 
 module Blacklight
   class AssetsGenerator < Rails::Generators::Base
-    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '5.3.3'), desc: "Set the generated app's bootstrap version"
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '5.3.5'), desc: "Set the generated app's bootstrap version"
 
     def run_asset_pipeline_specific_generator
       generated_options = "--bootstrap-version='#{options[:'bootstrap-version']}'" if options[:'bootstrap-version']

data/lib/generators/blacklight/search_builder_generator.rb

@@ -27,7 +27,7 @@ module Blacklight
     private
 
     def rspec_installed?
-      defined?(RSpec) && defined?(RSpec::Rails)
+      defined?(RSpec::Rails)
     end
   end
 end

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

@@ -1,5 +1,7 @@
 # Place any default configuration for solr_wrapper here
 # port: 8983
+env:
+  SOLR_MODULES: analysis-extras
 collection:
   dir: solr/conf/
   name: blacklight-core

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

@@ -105,9 +105,11 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # :show may be set to false if you don't want the facet to be drawn in the
     # facet bar
     #
-    # set :index_range to true if you want the facet pagination view to have facet prefix-based navigation
+    # Set :index_range to true if you want the facet pagination view to have facet prefix-based navigation.
     #  (useful when user clicks "more" on a large facet and wants to navigate alphabetically across a large set of results)
     # :index_range can be an array or range of prefixes that will be used to create the navigation (note: It is case sensitive when searching values)
+    # This control only displays when the user has selected "A-Z Sort" (You make make this the default by setting "sort: 'index'"
+    # in the facet config)
 
     config.add_facet_field 'format', label: 'Format'
     config.add_facet_field 'pub_date_ssim', label: 'Publication Year', single: true

data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml

@@ -47,7 +47,6 @@
           full_title_tsim
           short_title_tsim
           alternative_title_tsim
-          active_fedora_model_ssi
           title_tsim
           author_tsim
           subject_tsim
@@ -84,7 +83,6 @@
        <str name="facet">true</str>
        <str name="facet.mincount">1</str>
        <str name="facet.limit">10</str>
-       <str name="facet.field">active_fedora_model_ssi</str>
        <str name="facet.field">subject_ssim</str>
 
        <str name="spellcheck">true</str>
@@ -116,7 +114,6 @@
           full_title_tsim
           short_title_tsim
           alternative_title_tsim
-          active_fedora_model_ssi
           title_tsim
           author_tsim
           subject_tsim
@@ -153,7 +150,6 @@
        <str name="facet">true</str>
        <str name="facet.mincount">1</str>
        <str name="facet.limit">10</str>
-       <str name="facet.field">active_fedora_model_ssi</str>
        <str name="facet.field">subject_ssim</str>
 
        <str name="spellcheck">true</str>

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "9.0.0-beta1",
+  "version": "9.0.0-beta2",
   "description": "The frontend code and styles for Blacklight",
   "exports": {
     "./blacklight.esm.js": "./app/assets/javascripts/blacklight/blacklight.esm.js",
@@ -34,13 +34,13 @@
     "rollup": "^4.24.0",
     "rollup-plugin-includepaths": "^0.2.4",
     "sass": "^1.80.3",
-    "bootstrap": "^5.3.3"
+    "bootstrap": "^5.3.5"
   },
   "browserslist": [
     "defaults",
     "not IE 11"
   ],
   "dependencies": {
-    "bootstrap": ">=4.3.1 <6.0.0"
+    "bootstrap": ">=5.3.5 <6.0.0"
   }
 }

data/spec/components/blacklight/advanced_search_form_component_spec.rb

@@ -3,49 +3,45 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::AdvancedSearchFormComponent, type: :component do
-  subject(:render) do
-    component.render_in(view_context)
-  end
-
   let(:component) { described_class.new(url: '/whatever', response: response, params: params) }
-  let(:response) { Blacklight::Solr::Response.new({ facet_counts: { facet_fields: { format: { 'Book' => 10, 'CD' => 5 } } } }.with_indifferent_access, {}) }
-  let(:params) { {} }
-
-  let(:rendered) do
-    Capybara::Node::Simple.new(render)
+  let(:response) { Blacklight::Solr::Response.new({ facet_counts: { facet_fields: { format: { 'Book' => 10, 'CD' => 5 } } } }.with_indifferent_access, search_builder) }
+  let(:search_builder) do
+    Blacklight::SearchBuilder.new(view_context)
   end
+  let(:params) { {} }
 
-  let(:view_context) { controller.view_context }
+  let(:view_context) { vc_test_controller.view_context }
 
   before do
     allow(view_context).to receive(:facet_limit_for).and_return(nil)
+    render_inline component
   end
 
   context 'with additional parameters' do
     let(:params) { { some: :parameter, an_array: [1, 2] } }
 
     it 'adds additional parameters as hidden fields' do
-      expect(rendered).to have_field 'some', with: 'parameter', type: :hidden
-      expect(rendered).to have_field 'an_array[]', with: '1', type: :hidden
-      expect(rendered).to have_field 'an_array[]', with: '2', type: :hidden
+      expect(page).to have_field 'some', with: 'parameter', type: :hidden
+      expect(page).to have_field 'an_array[]', with: '1', type: :hidden
+      expect(page).to have_field 'an_array[]', with: '2', type: :hidden
     end
   end
 
   it 'has text fields for each search field' do
-    expect(rendered).to have_css '.advanced-search-field', count: 4
-    expect(rendered).to have_field 'clause_0_field', with: 'all_fields', type: :hidden
-    expect(rendered).to have_field 'clause_1_field', with: 'title', type: :hidden
-    expect(rendered).to have_field 'clause_2_field', with: 'author', type: :hidden
-    expect(rendered).to have_field 'clause_3_field', with: 'subject', type: :hidden
+    expect(page).to have_css '.advanced-search-field', count: 4
+    expect(page).to have_field 'clause_0_field', with: 'all_fields', type: :hidden
+    expect(page).to have_field 'clause_1_field', with: 'title', type: :hidden
+    expect(page).to have_field 'clause_2_field', with: 'author', type: :hidden
+    expect(page).to have_field 'clause_3_field', with: 'subject', type: :hidden
   end
 
   it 'has filters' do
-    expect(rendered).to have_css '.blacklight-format'
-    expect(rendered).to have_field 'f_inclusive[format][]', with: 'Book'
-    expect(rendered).to have_field 'f_inclusive[format][]', with: 'CD'
+    expect(page).to have_css '.blacklight-format'
+    expect(page).to have_field 'f_inclusive[format][]', with: 'Book'
+    expect(page).to have_field 'f_inclusive[format][]', with: 'CD'
   end
 
   it 'has a sort field' do
-    expect(rendered).to have_select 'sort', options: %w[relevance year author title]
+    expect(page).to have_select 'sort', options: %w[relevance year author title]
   end
 end