blacklight 9.0.0.beta1 → 9.0.0

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -1,17 +1,25 @@
 # frozen_string_literal: true
 
 module Blacklight::Solr
+  # This depends on being imported into a class that extends AbstractSearchBuilder
   module SearchBuilderBehavior
     extend ActiveSupport::Concern
 
     included do
       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_paging_to_solr,
-        :add_sorting_to_solr, :add_group_config_to_solr,
-        :add_facet_paging_to_solr, :add_facet_suggestion_parameters,
+        :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_paging_to_solr,
+        :add_sorting_to_solr,
+        :add_group_config_to_solr,
         :add_adv_search_clauses,
+        :add_facets_for_advanced_search_form,
+        :add_facet_paging_to_solr,
+        :add_facet_suggestion_parameters,
         :add_additional_filters
       ]
     end
@@ -96,6 +104,13 @@ module Blacklight::Solr
     def add_adv_search_clauses(solr_parameters)
       return if search_state.clause_params.blank?
 
+      # We need to specify lucene as the top-level defType when using JSON Query DSL in Solr versions
+      # between 7.2.0 & 9.4.0. After 9.4.0 this is no longer necessary, but also not harmful to include.
+      solr_parameters[:defType] = 'lucene'
+
+      # Disable spellcheck, which doesn't work when using JSON Query DSL
+      solr_parameters[:spellcheck] = 'false'
+
       defaults = { must: [], must_not: [], should: [] }
       default_op = blacklight_params[:op]&.to_sym || :must
       solr_parameters[:mm] = 1 if default_op == :should && search_state.clause_params.values.any? { |clause| }
@@ -118,6 +133,16 @@ module Blacklight::Solr
       [op, field.clause_params.transform_values { |v| v.merge(query: clause[:query]) }]
     end
 
+    # Merge the advanced search form parameters into the solr parameters
+    # @param [Hash] solr_parameters the current solr parameters
+    # @return [Hash] the solr parameters with the additional advanced search form parameters
+    def add_facets_for_advanced_search_form(solr_parameters)
+      return unless search_state.controller&.action_name == 'advanced_search' &&
+                    blacklight_config.advanced_search[:form_solr_parameters]
+
+      solr_parameters.merge!(blacklight_config.advanced_search[:form_solr_parameters])
+    end
+
     ##
     # Add any existing facet limits, stored in app-level HTTP query
     # as :f, to solr as appropriate :fq query.
@@ -128,25 +153,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 +209,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 +220,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 +231,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
 
@@ -224,8 +241,6 @@ module Blacklight::Solr
     # copy paging params from BL app over to solr, changing
     # app level per_page and page to Solr rows and start.
     def add_paging_to_solr(solr_params)
-      rows(solr_params[:rows] || 10) if rows.nil?
-
       solr_params[:rows] = rows
 
       solr_params[:start] = start if start.nonzero?
@@ -294,7 +309,7 @@ module Blacklight::Solr
 
     # Look up facet limit for given facet_field. Will look at config, and
     # if config is 'true' will look up from Solr @response if available. If
-    # no limit is avaialble, returns nil. Used from #add_facetting_to_solr
+    # no limit is available, returns nil. Used from #add_facetting_to_solr
     # to supply f.fieldname.facet.limit values in solr request (no @response
     # available), and used in display (with @response available) to create
     # a facet paginator with the right limit.
@@ -340,70 +355,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/solr/single_doc_search_builder.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Blacklight::Solr
+  class SingleDocSearchBuilder < SearchBuilder
+    self.default_processor_chain = [:add_defaults, :add_qt, :add_unique_id]
+
+    def initialize(scope, id, other_params)
+      @other_params = other_params
+      @id = id
+      super(scope)
+    end
+
+    def add_defaults(request)
+      request.reverse_merge!(blacklight_config.default_document_solr_params).reverse_merge!(@other_params)
+    end
+
+    def add_qt(request)
+      request[:qt] ||= blacklight_config.document_solr_request_handler if blacklight_config.document_solr_request_handler
+    end
+
+    def add_unique_id(request)
+      request[blacklight_config.document_unique_id_param] = @id
+    end
+  end
+end

data/lib/blacklight.rb

@@ -29,14 +29,16 @@ module Blacklight
   # the class Blacklight::(name of the adapter)::Repository, e.g.
   #   elastic_search => Blacklight::ElasticSearch::Repository
   def self.repository_class
-    case connection_config[:adapter]
+    if connection_config && !connection_config.key?(:adapter)
+      raise "The value for :adapter was not found in the blacklight.yml config"
+    end
+
+    case connection_config&.fetch(:adapter) || 'solr'
     when 'solr'
       Blacklight::Solr::Repository
     when /::/
       connection_config[:adapter].constantize
     else
-      raise "The value for :adapter was not found in the blacklight.yml config" unless connection_config.key? :adapter
-
       Blacklight.const_get("#{connection_config.fetch(:adapter)}/Repository".classify)
     end
   end
@@ -99,7 +101,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/
+  dir: solr/
   name: blacklight-core

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

@@ -12,7 +12,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
   # rescue_from Blacklight::Exceptions::InvalidRequest, with: :my_handling_method
 
   configure_blacklight do |config|
-    ## Specify the style of markup to be generated (may be 4 or 5)
+    ## Specify the style of markup to be generated
     # config.bootstrap_version = 5
     #
     ## Class for sending and receiving requests from a search index
@@ -29,6 +29,13 @@ class <%= controller_name.classify %>Controller < ApplicationController
     #
     ## Should the raw solr document endpoint (e.g. /catalog/:id/raw) be enabled
     # config.raw_endpoint.enabled = false
+    #
+    ## Should advanced search be enabled
+    # config.advanced_search.enabled = true
+    #
+    ## Optional fine-tuning for advanced search, e.g., set different limits for
+    ## different facets.
+    # config.advanced_search.form_solr_parameters = {}
 
     ## Default parameters to send to solr for all search-like requests. See also SearchBuilder#processed_parameters
     config.default_solr_params = {
@@ -38,7 +45,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # solr path which will be added to solr base url before the other solr params.
     #config.solr_path = 'select'
     #config.document_solr_path = 'get'
-    #config.json_solr_path = 'advanced'
+    #config.json_solr_path = 'select'
 
     # items to show per page, each number in the array represent another option to choose from.
     #config.per_page = [10,20,50,100]
@@ -65,8 +72,8 @@ class <%= controller_name.classify %>Controller < ApplicationController
     config.add_results_collection_tool(:view_type_group)
 
     config.add_show_tools_partial(:bookmark, component: Blacklight::Document::BookmarkComponent, if: :render_bookmarks_control?)
-    config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
-    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
+    config.add_show_tools_partial(:email, callback: :email_action, validator: :email_params_valid?)
+    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :sms_params_valid?)
     config.add_show_tools_partial(:citation)
 
     config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)
@@ -105,9 +112,17 @@ 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 :include_in_advanced_search to false for any search field or facet field
+    # that you want to exclude from appearing in the advanced search page.
+    #
+    # Set :include_in_simple_select to false for any search field you want to render
+    # in the Advanced Search page but exclude from the main search box scope selector.
+    #
+    # 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
@@ -117,7 +132,11 @@ class <%= controller_name.classify %>Controller < ApplicationController
     config.add_facet_field 'subject_geo_ssim', label: 'Region'
     config.add_facet_field 'subject_era_ssim', label: 'Era'
 
-    config.add_facet_field 'example_pivot_field', label: 'Pivot Field', pivot: ['format', 'language_ssim'], collapsing: true
+    config.add_facet_field 'example_pivot_field',
+                           label: 'Pivot Field',
+                           pivot: ['language_ssim', 'subject_geo_ssim', 'subject_ssim'],
+                           collapsing: true,
+                           include_in_advanced_search: false
 
     config.add_facet_field 'example_query_facet_field', label: 'Publish Date', :query => {
        :years_5 => { label: 'within 5 Years', fq: "pub_date_ssim:[#{Time.zone.now.year - 5 } TO *]" },
@@ -161,7 +180,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
     config.add_show_field 'isbn_ssim', label: 'ISBN'
 
     # "fielded" search configuration. Used by pulldown among other places.
-    # For supported keys in hash, see rdoc for Blacklight::SearchFields
+    # For supported keys in hash, see rdoc for Blacklight::Configuration::SearchField
     #
     # Search fields will inherit the :qt solr request handler from
     # config[:default_solr_parameters], OR can specify a different one
@@ -204,7 +223,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     # Specifying a :qt only to show it's possible, and so our internal automated
     # tests can test it. In this case it's the same as
-    # config[:default_solr_parameters][:qt], so isn't actually neccesary.
+    # config[:default_solr_parameters][:qt], so isn't actually necessary.
     config.add_search_field('subject') do |field|
       field.qt = 'search'
       field.solr_parameters = {
@@ -214,6 +233,13 @@ class <%= controller_name.classify %>Controller < ApplicationController
       }
     end
 
+    # Set up a default advanced search configuration by using the current
+    # search_fields and facet_fields configs.
+    if config.advanced_search.enabled
+      config.copy_search_field_config_to_advanced!
+      config.copy_facet_field_config_to_advanced!
+    end
+
     # "sort results by" select (pulldown)
     # label in pulldown is followed by the name of the Solr field to sort by and
     # whether the sort is ascending or descending (it must be asc or desc

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,76 +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>
-       <str name="spellcheck.dictionary">default</str>
-       <str name="spellcheck.onlyMorePopular">true</str>
-       <str name="spellcheck.extendedResults">true</str>
-       <str name="spellcheck.collate">false</str>
-       <str name="spellcheck.count">5</str>
-
-     </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
-
-  <requestHandler name="/advanced" class="solr.SearchHandler">
-    <!-- a lucene request handler for using the JSON Query DSL,
-         specifically for advanced search.
-         Using a separate requestHandler is a workaround to
-         https://issues.apache.org/jira/browse/SOLR-16916, although
-         it could be desirable for other reasons as well.
-      -->
-     <lst name="defaults">
-       <str name="defType">lucene</str>
-       <str name="echoParams">explicit</str>
-        <str name="df">title_tsim</str>
-        <str name="qf">
-          id
-          full_title_tsim
-          short_title_tsim
-          alternative_title_tsim
-          active_fedora_model_ssi
-          title_tsim
-          author_tsim
-          subject_tsim
-          all_text_timv
-        </str>
-        <str name="pf">
-          all_text_timv^10
-        </str>
-
-       <str name="author_qf">
-          author_tsim
-       </str>
-       <str name="author_pf">
-       </str>
-       <str name="title_qf">
-          title_tsim
-          full_title_tsim
-          short_title_tsim
-          alternative_title_tsim
-       </str>
-       <str name="title_pf">
-       </str>
-       <str name="subject_qf">
-          subject_tsim
-       </str>
-       <str name="subject_pf">
-       </str>
-
-       <str name="fl">
-         *,
-         score
-       </str>
-
-       <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",
   "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