blacklight 8.11.0 → 9.0.0.beta2

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
@@ -116,7 +116,7 @@ module Blacklight
 
   # returns the full path the the blacklight plugin installation
   def self.root
-    @root ||= File.expand_path(File.dirname(File.dirname(__FILE__)))
+    @root ||= File.expand_path(File.dirname(__FILE__, 2))
   end
 
   def self.deprecation

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

@@ -5,18 +5,12 @@ module Blacklight
     class ImportmapGenerator < Rails::Generators::Base
       class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
 
-      # This could be skipped if you want to use webpacker
-      def add_javascript_dependencies
-        gem 'bootstrap', options[:'bootstrap-version'].presence # in rails 7, only for stylesheets
-        gem 'jquery-rails' if bootstrap_4? # Bootstrap 4 has a dependency on jquery
-      end
-
       def import_javascript_assets
         append_to_file 'config/importmap.rb' do
           <<~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.2'}/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
 
@@ -40,39 +34,27 @@ module Blacklight
         append_to_file 'app/javascript/application.js' do
           <<~CONTENT
             import githubAutoCompleteElement from "@github/auto-complete-element"
-            import Blacklight from "blacklight"
+            import Blacklight from "blacklight-frontend"
           CONTENT
         end
       end
 
       def add_stylesheet
         if File.exist? 'app/assets/stylesheets/application.bootstrap.scss'
-          if ENV['CI']
-            run "yarn add file:#{Blacklight::Engine.root}"
-          else
-            run "yarn add blacklight-frontend@#{Blacklight::VERSION}"
-          end
-
           append_to_file 'app/assets/stylesheets/application.bootstrap.scss' do
             <<~CONTENT
-              @import "blacklight-frontend/app/assets/stylesheets/blacklight/blacklight";
+              @import url("blacklight.css");
             CONTENT
           end
         else
-          gem "sassc-rails", "~> 2.1"
-
-          create_file 'app/assets/stylesheets/blacklight.scss' do
+          append_to_file 'app/assets/stylesheets/application.css' do
             <<~CONTENT
-              @import 'bootstrap';
-              @import 'blacklight/blacklight';
+              @import url(https://cdn.jsdelivr.net/npm/bootstrap@5.3.5/dist/css/bootstrap.min.css);
+              @import url("blacklight.css");
             CONTENT
           end
         end
       end
-
-      def bootstrap_4?
-        options[:'bootstrap-version'].match?(/\A[^0-9]*4\./)
-      end
     end
   end
 end

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

@@ -18,7 +18,7 @@ module Blacklight
       def add_package_assets
         append_to_file 'app/assets/stylesheets/application.bootstrap.scss' do
           <<~CONTENT
-            @import "blacklight-frontend/app/assets/stylesheets/blacklight/blacklight";
+            @import url("blacklight.css");
           CONTENT
         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'), 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']
@@ -11,8 +11,8 @@ module Blacklight
                     'blacklight:assets:importmap'
                   elsif defined?(Propshaft)
                     'blacklight:assets:propshaft'
-                  elsif defined?(Sprockets)
-                    'blacklight:assets:sprockets'
+                  else
+                    raise "Unsupported path"
                   end
 
       generate generator, generated_options if generator

data/lib/generators/blacklight/controller_generator.rb

@@ -16,9 +16,9 @@ module Blacklight
     # Add Blacklight to the application controller
     def inject_blacklight_controller_behavior
       inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
-        "  # Adds a few additional behaviors into the application controller\n" \
-          "  include Blacklight::Controller\n" \
-          "  layout :determine_layout if respond_to? :layout\n\n"
+        "  # Adds a few additional behaviors into the application controller\n  " \
+          "include Blacklight::Controller\n  " \
+          "layout :determine_layout if respond_to? :layout\n\n"
       end
     end
 

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/lib/generators/blacklight/user_generator.rb

@@ -34,13 +34,6 @@ module Blacklight
       generate "devise", model_name.classify
       generate "devise_guests", model_name.classify
 
-      # add the #to_s to the model.
-      insert_into_file("app/models/#{model_name}.rb", before: /end(\n| )*$/) do
-        "\n  # Configuration added by Blacklight; Blacklight::User uses a method key on your\n" \
-          "  # user class to get a user-displayable login/identifier for\n" \
-          "  # the account.\n" \
-          "  self.string_display_key ||= :email\n"
-      end
       gsub_file("config/initializers/devise.rb", "config.sign_out_via = :delete", "config.sign_out_via = :get")
       # Work around for https://github.com/heartcombo/devise/issues/5720
       gsub_file("config/initializers/devise.rb", "# config.reload_routes = true", "config.reload_routes = false")
@@ -51,13 +44,19 @@ module Blacklight
       file_path = "app/models/#{model_name.underscore}.rb"
       if File.exist?(File.expand_path(file_path, destination_root))
         inject_into_class file_path, model_name.classify do
-          "\n  # Connects this user object to Blacklights Bookmarks." \
-            "\n  include Blacklight::User\n"
+          <<~EOS
+            # Connects this user object to Blacklights Bookmarks.
+            include Blacklight::User
+
+            # Blacklight::User uses a method on your User class to get a user-displayable
+            # label (e.g. login or identifier) for the account. Blacklight uses `email' by default.
+            # self.string_display_key = :email
+          EOS
         end
       else
         say_status "warning", <<~EOS, :yellow
           Blacklight authenticated user functionality not installed, as a user model
-          could not be found at /app/models/user.rb. If you used a different name,
+          could not be found at #{file_path}. If you used a different name,
           please re-run the migration and provide that name as an argument. E.g.:
 
             `rails -g blacklight:user client`

data/package.json

@@ -1,11 +1,19 @@
 {
   "name": "blacklight-frontend",
-  "version": "8.11.0",
+  "version": "9.0.0-beta2",
   "description": "The frontend code and styles for Blacklight",
-  "main": "app/assets/javascripts/blacklight",
+  "exports": {
+    "./blacklight.esm.js": "./app/assets/javascripts/blacklight/blacklight.esm.js",
+    "./stylesheets/*": "./app/assets/stylesheets/blacklight/*",
+    ".": {
+      "import": "./app/javascript/blacklight-frontend/index.js",
+      "require": "./app/assets/javascripts/blacklight.js"
+    },
+    "./*": "./app/javascript/blacklight-frontend/*.js"
+  },
   "type": "module",
-  "module": "app/assets/javascripts/blacklight/blacklight.esm.js",
   "scripts": {
+    "build": "sass ./app/assets/stylesheets/blacklight/build.scss:./app/assets/builds/blacklight.css --no-source-map --load-path=node_modules --quiet-deps",
     "prepare": "rollup --config rollup.config.js --sourcemap && ESM=true rollup --config rollup.config.js --sourcemap"
   },
   "repository": {
@@ -24,13 +32,15 @@
   "homepage": "https://github.com/projectblacklight/blacklight#readme",
   "devDependencies": {
     "rollup": "^4.24.0",
-    "rollup-plugin-includepaths": "^0.2.4"
+    "rollup-plugin-includepaths": "^0.2.4",
+    "sass": "^1.80.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/rollup.config.js

@@ -16,7 +16,7 @@ let includePathOptions = {
 };
 
 const rollupConfig = {
-  input: 'app/javascript/blacklight/index.js',
+  input: 'app/javascript/blacklight-frontend/index.js',
   output: {
     file: `app/assets/javascripts/blacklight/${fileDest}.js`,
     format: ESM ? 'es' : 'umd',

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

data/spec/components/blacklight/constraint_layout_component_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
-  subject(:rendered) do
-    render_inline_to_capybara_node(described_class.new(**params))
+  before do
+    render_inline described_class.new(**params)
   end
 
   describe "for simple display" do
@@ -13,7 +13,7 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
     end
 
     it "renders label and value" do
-      expect(rendered).to have_css("span.applied-filter.constraint") do |s|
+      expect(page).to have_css("span.applied-filter.constraint") do |s|
         expect(s).to have_css("span.constraint-value")
         expect(s).to have_no_css("a.constraint-value")
         expect(s).to have_css "span.filter-name", text: "my label"
@@ -28,13 +28,13 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
     end
 
     it "includes remove link" do
-      expect(rendered).to have_css("span.applied-filter") do |s|
+      expect(page).to have_css("span.applied-filter") do |s|
         expect(s).to have_css(".remove[href='http://remove']")
       end
     end
 
     it "has an accessible remove label" do
-      expect(rendered).to have_css(".remove") do |s|
+      expect(page).to have_css(".remove") do |s|
         expect(s).to have_css('.visually-hidden', text: 'Remove constraint my label: my value')
       end
     end
@@ -46,7 +46,7 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
     end
 
     it "includes them" do
-      expect(rendered).to have_css("span.applied-filter.constraint.class1.class2")
+      expect(page).to have_css("span.applied-filter.constraint.class1.class2")
     end
   end
 
@@ -56,8 +56,8 @@ RSpec.describe Blacklight::ConstraintLayoutComponent, type: :component do
     end
 
     it "does not escape key and value" do
-      expect(rendered).to have_css("span.applied-filter.constraint span.filter-name span.custom_label")
-      expect(rendered).to have_css("span.applied-filter.constraint span.filter-value span.custom_value")
+      expect(page).to have_css("span.applied-filter.constraint span.filter-name span.custom_label")
+      expect(page).to have_css("span.applied-filter.constraint span.filter-value span.custom_value")
     end
   end
 end