blacklight 9.0.0.beta6 → 9.0.0.beta7

data/app/components/blacklight/document_component.rb

@@ -33,40 +33,39 @@ module Blacklight
     renders_one :body
 
     # The document title with some reasonable default behavior
-    renders_one :title, (lambda do |*args, component: nil, **kwargs|
+    renders_one :title, (lambda do |component: nil, **kwargs|
       component ||= view_config.title_component || Blacklight::DocumentTitleComponent
 
-      component.new(*args, counter: @counter, presenter: @presenter, as: @title_component, actions: !@show, link_to_document: !@show, document_component: self, **kwargs)
+      component.new(counter: @counter, presenter: @presenter, as: @title_component, actions: !@show, link_to_document: !@show, document_component: self, **kwargs)
     end)
 
-    renders_one :embed, (lambda do |static_content = nil, *args, component: nil, **kwargs|
+    renders_one :embed, (lambda do |static_content = nil, component: nil, **kwargs|
       next static_content if static_content.present?
 
       component ||= view_config.embed_component
 
       next unless component
 
-      component.new(*args, presenter: @presenter, document_counter: @document_counter, **kwargs)
+      component.new(presenter: @presenter, document_counter: @document_counter, **kwargs)
     end)
 
     # The primary metadata section
-    renders_one :metadata, (lambda do |static_content = nil, *args, component: nil, fields: nil, **kwargs|
+    renders_one :metadata, (lambda do |static_content = nil, component: nil, fields: nil, **kwargs|
       next static_content if static_content.present?
 
       component ||= view_config.metadata_component || Blacklight::DocumentMetadataComponent
-
-      component.new(*args, fields: fields || @presenter&.field_presenters || [], **kwargs)
+      component.new(fields: fields || @presenter&.field_presenters || [], **kwargs)
     end)
 
     # Additional metadata sections
     renders_many :metadata_sections
 
-    renders_one :thumbnail, (lambda do |image_options_or_static_content = {}, *args, component: nil, **kwargs|
+    renders_one :thumbnail, (lambda do |image_options_or_static_content = {}, component: nil, **kwargs|
       next image_options_or_static_content if image_options_or_static_content.is_a? String
 
       component ||= view_config.thumbnail_component || Blacklight::Document::ThumbnailComponent
 
-      component.new(*args, presenter: @presenter, counter: @counter, image_options: image_options_or_static_content, **kwargs)
+      component.new(presenter: @presenter, counter: @counter, image_options: image_options_or_static_content, **kwargs)
     end)
 
     # A container for partials rendered using the view config partials configuration. Its use is discouraged, but necessary until
@@ -90,8 +89,8 @@ module Blacklight
     def initialize(document: nil, partials: nil,
                    id: nil, classes: [], component: :article, title_component: nil,
                    counter: nil, document_counter: nil, counter_offset: 0,
-                   show: false, **args)
-      @presenter = document || args[self.class.collection_parameter]
+                   show: false)
+      @presenter = document
       @document = @presenter.document
       @view_partials = partials || []
 
@@ -101,7 +100,7 @@ module Blacklight
       @classes = classes
 
       @counter = counter
-      @document_counter = document_counter || args.fetch(self.class.collection_counter_parameter, nil)
+      @document_counter = document_counter
       @counter ||= 1 + @document_counter + counter_offset if @document_counter.present?
 
       @show = show
@@ -119,10 +118,10 @@ module Blacklight
     end
 
     def before_render
-      set_slot(:title, nil) unless title
-      set_slot(:thumbnail, nil) unless thumbnail || show?
-      set_slot(:metadata, nil, fields: presenter.field_presenters, show: @show) unless metadata
-      set_slot(:embed, nil) unless embed
+      with_title unless title
+      with_thumbnail unless thumbnail || show?
+      with_metadata(fields: presenter.field_presenters, show: @show) unless metadata
+      with_embed unless embed
 
       view_partials.each do |view_partial|
         with_partial(view_partial) do

data/app/components/blacklight/facet_item_pivot_component.rb

@@ -19,6 +19,10 @@ module Blacklight
 
     with_collection_parameter :facet_item
 
+    # @param [Blacklight::FacetItemPivotPresenter] facet_item
+    # @param [String] wrapping_element
+    # @param [Boolean] suppress_link
+    # @param [Boolean] collapsing
     def initialize(facet_item:, wrapping_element: 'li', suppress_link: false, collapsing: nil)
       @facet_item = facet_item
       @wrapping_element = wrapping_element

data/app/components/blacklight/facets/item_component.rb

@@ -7,6 +7,9 @@ module Blacklight
 
       with_collection_parameter :facet_item
 
+      # @param [Blacklight::FacetItemPresenter] facet_item
+      # @param [String] wrapping_element
+      # @param [Boolean] suppress_link
       def initialize(facet_item:, wrapping_element: 'li', suppress_link: false)
         @facet_item = facet_item
         @label = facet_item.label

data/app/components/blacklight/facets/selected_value_component.rb

@@ -7,7 +7,7 @@ module Blacklight
       def initialize(label:, href:)
         @label = label
         @href = href
-        super
+        super()
       end
 
       attr_reader :label, :href

data/app/components/blacklight/header_component.rb

@@ -19,8 +19,8 @@ module Blacklight
     # Hack so that the default lambdas are triggered
     # so that we don't have to do c.with_top_bar() in the call.
     def before_render
-      set_slot(:top_bar, nil) unless top_bar
-      set_slot(:search_bar, nil) unless search_bar
+      with_top_bar unless top_bar
+      with_search_bar unless search_bar
     end
   end
 end

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

@@ -29,10 +29,7 @@ module Blacklight::Catalog
       format.html { store_preferred_view }
       format.rss  { render layout: false }
       format.atom { render layout: false }
-      format.json do
-        @presenter = Blacklight::JsonPresenter.new(@response,
-                                                   blacklight_config)
-      end
+      format.json { @presenter = json_presenter(@response) }
       additional_response_formats(format)
       document_export_formats(format)
     end
@@ -143,7 +140,14 @@ module Blacklight::Catalog
 
   private
 
+  # @param [Blacklight::Solr::Response] repository_response
+  # @return [Blacklight::JsonPresenter]
+  def json_presenter(repository_response)
+    blacklight_config.index.json_presenter_class.new(repository_response, blacklight_config)
+  end
+
   # This method may be overridden to customize search behavior.
+  # @return [Blacklight::Solr::Response] the solr response object
   def retrieve_search_results
     search_service.search_results
   end

data/app/javascript/blacklight-frontend/facet_suggest.js

@@ -17,8 +17,9 @@ const FacetSuggest = async (e) => {
     // Drop facet.page so a filtered suggestion list will always start on page 1
     url.searchParams.delete('facet.page');
     const facetSearchParams = url.searchParams.toString();
+    const basePathComponent = url.pathname.split('/')[1];
 
-    const urlToFetch = `/catalog/facet_suggest/${facetField}/${queryFragment}?${facetSearchParams}`;
+    const urlToFetch = `/${basePathComponent}/facet_suggest/${facetField}/${queryFragment}?${facetSearchParams}`;
 
     const response = await fetch(urlToFetch);
     if (response.ok) {

data/app/presenters/blacklight/constraint_presenter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Blacklight
+  class ConstraintPresenter
+    def initialize(facet_item_presenter:, field_label:)
+      @facet_item_presenter = facet_item_presenter
+      @field_label = field_label
+    end
+
+    attr_accessor :facet_item_presenter, :field_label
+
+    delegate :key, :remove_href, to: :facet_item_presenter
+
+    # Get the displayable version of the facet's value for use
+    # in e.g. the constraints widget
+    #
+    # @return [String]
+    def constraint_label
+      facet_item_presenter.label
+    end
+  end
+end

data/app/presenters/blacklight/facet_item_pivot_presenter.rb

@@ -13,10 +13,6 @@ module Blacklight
       selected? || facet_item_presenters.any? { |x| x.try(:shown?) }
     end
 
-    def field_label
-      facet_field_presenter.label
-    end
-
     def facet_item_presenters
       return to_enum(:facet_item_presenters) unless block_given?
       return [] unless items
@@ -25,7 +21,7 @@ module Blacklight
     end
 
     def facet_item_presenter(facet_item)
-      facet_field_presenter.item_presenter(facet_item)
+      view_context.facet_field_presenter(facet_config, {}).item_presenter(facet_item)
     end
 
     ##

data/app/presenters/blacklight/facet_item_presenter.rb

@@ -38,10 +38,6 @@ module Blacklight
       search_state.filter(facet_config).include?(value)
     end
 
-    def field_label
-      facet_field_presenter.label
-    end
-
     ##
     # Get the displayable version of a facet's value
     #
@@ -67,14 +63,6 @@ module Blacklight
       end
     end
 
-    # Get the displayable version of the facet's value for use
-    # in e.g. the constraints widget
-    #
-    # @return [String]
-    def constraint_label
-      label
-    end
-
     def value
       if facet_item.respond_to? :value
         facet_item.value
@@ -104,11 +92,5 @@ module Blacklight
         view_context.search_action_path(search_state.add_facet_params_and_redirect(facet_config.key, facet_item).merge(path_options))
       end
     end
-
-    private
-
-    def facet_field_presenter
-      @facet_field_presenter ||= view_context.facet_field_presenter(facet_config, {})
-    end
   end
 end

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

@@ -21,7 +21,7 @@ xml.entry do
   with_format(:html) do
     xml.summary "type" => "html" do
       document_component = blacklight_config.view_config(:atom).summary_component
-      xml.text! render document_component.new(document_component.collection_parameter => document_presenter(document), component: :div, show: true)
+      xml.text! render document_component.new(document: document_presenter(document), component: :div, show: true)
     end
   end
 

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

@@ -1,4 +1,4 @@
 <% # container for a single doc -%>
 <% view_config = local_assigns[:view_config] || blacklight_config.view_config(document_index_view_type, action_name: action_name) %>
 <% document_component = view_config.document_component -%>
-<%= render document_component.new(document_component.collection_parameter => document_presenter(document), counter: document_counter_with_offset(document_counter), partials: view_config&.partials) %>
+<%= render document_component.new(document: document_presenter(document), counter: document_counter_with_offset(document_counter), partials: view_config&.partials) %>

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

@@ -3,7 +3,7 @@
 <% content_for(:head) { render_link_rel_alternates } %>
 
 <% document_component = blacklight_config.view_config(:show).document_component -%>
-<%= render (document_component).new(document_component.collection_parameter => document_presenter(@document), component: :div, show: true, partials: blacklight_config.view_config(:show).partials) do |component| %>
+<%= render document_component.new(document: document_presenter(@document), component: :div, show: true, partials: blacklight_config.view_config(:show).partials) do |component| %>
   <% component.with_title(as: 'h1', classes: '', link_to_document: false, actions: false) %>
   <% component.with_footer do %>
     <% if @document.respond_to?(:export_as_openurl_ctx_kev) %>

data/blacklight.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "i18n", '>= 1.7.0' # added named parameters
   s.add_dependency "ostruct", '>= 0.3.2'
-  s.add_dependency "view_component", '~> 3.9'
+  s.add_dependency "view_component", '>= 3.0', '< 5.0'
   s.add_dependency "zeitwerk"
 
   s.add_development_dependency "rsolr", ">= 1.0.6", "< 3"  # Library for interacting with rSolr.

data/config/locales/blacklight.ar.yml

@@ -120,7 +120,7 @@ ar:
         remove:
           label_value: "إزالة القيد %{label}: %{value}"
           value: إزالة القيد %{value}
-        title: "لقد بحثت عن:"
+        title: "اختياراتك:"
       form:
         search:
           label: ابحث عن
@@ -160,7 +160,6 @@ ar:
         submit: تحديث
         title: عدد النتائج المعروضة في الصفحة
       rss_feed: خلاصات RSS للنتائج
-      search_constraints_header: قيود البحث
       search_results: نتائج البحث
       show:
         label: "%{label}:"

data/config/locales/blacklight.ca.yml

@@ -136,7 +136,6 @@ ca:
         many_constraint_values: "%{values} seleccionat"
         joiner: " / "
       header: "Cerca"
-      search_constraints_header: "Filtres de la cerca"
       search_results: "Resultats de la cerca"
       errors:
         invalid_solr_id: "El registre que heu sol·licitat no existeix."
@@ -194,7 +193,7 @@ ca:
       group:
         more: "més »"
       filters:
-        title: "Heu cercat per:"
+        title: "Les teves seleccions:"
         label: "%{label}:"
         remove:
           value: "Eliminar el filtre %{value}"

data/config/locales/blacklight.de.yml

@@ -111,7 +111,7 @@ de:
         remove:
           label_value: "Filter %{label}: %{value} entfernen"
           value: Filter %{value} entfernen
-        title: "Sie suchten nach:"
+        title: "Ihre Auswahl:"
       form:
         search:
           label: suchen nach
@@ -147,7 +147,6 @@ de:
         submit: Aktualisieren
         title: Anzahl der Ergebnisse, die pro Seite angezeigt werden
       rss_feed: RSS für Ergebnisse
-      search_constraints_header: Suchen
       search_results: Suchergebnisse
       show:
         label: "%{label}:"

data/config/locales/blacklight.en.yml

@@ -129,7 +129,7 @@ en:
         remove:
           label_value: "Remove constraint %{label}: %{value}"
           value: Remove constraint %{value}
-        title: "You searched for:"
+        title: "Your selections:"
       form:
         search:
           label: search for
@@ -165,7 +165,6 @@ en:
         submit: Update
         title: Number of results to display per page
       rss_feed: RSS for results
-      search_constraints_header: Search Constraints
       search_results: Search Results
       show:
         label: "%{label}:"

data/config/locales/blacklight.es.yml

@@ -110,7 +110,7 @@ es:
         remove:
           label_value: "Eliminar la restricción%{label}: %{value}"
           value: Eliminar la restricción %{value}
-        title: "Usted ha buscado:"
+        title: "Tus selecciones:"
       form:
         search:
           label: buscar
@@ -146,7 +146,6 @@ es:
         submit: Actualización
         title: El número de resultados a mostrar por página
       rss_feed: RSS de los resultados
-      search_constraints_header: Buscar
       search_results: Resultados de la búsqueda
       show:
         label: "%{label}:"

data/config/locales/blacklight.fr.yml

@@ -110,7 +110,7 @@ fr:
         remove:
           label_value: "Supprimer la restriction %{label}: %{value}"
           value: Supprimer la restriction %{value}
-        title: "Vous avez demandé :"
+        title: "Vos sélections:"
       form:
         search:
           label: Rechercher
@@ -146,7 +146,6 @@ fr:
         submit: mettre à jour
         title: Nombre de résultats à afficher par page
       rss_feed: RSS pour les résultats
-      search_constraints_header: Recherche
       search_results: Résultats de recherche
       show:
         label: "%{label}:"

data/config/locales/blacklight.hu.yml

@@ -108,7 +108,7 @@ hu:
         remove:
           label_value: "Feltétel eltávolítása %{label}: %{value}"
           value: Feltételek eltávolítása %{value}
-        title: "Ön ezt kereste:"
+        title: "Az Ön választása:"
       form:
         search:
           label: keresés
@@ -144,7 +144,6 @@ hu:
         submit: Frissítés
         title: Az eredmények száma oldalanként
       rss_feed: Eredmények RSS-ként
-      search_constraints_header: Keresés feltételei
       search_results: Keresés eredményei
       show:
         label: "%{label}:"

data/config/locales/blacklight.it.yml

@@ -111,7 +111,7 @@ it:
         remove:
           label_value: "Cancella il filtro %{label}: %{value}"
           value: Cancella il filtro %{value}
-        title: "Hai cercato per:"
+        title: "Le tue selezioni:"
       form:
         search:
           label: cerca per
@@ -147,7 +147,6 @@ it:
         submit: Aggiorna
         title: Risultati per pagina
       rss_feed: RSS per i risultati
-      search_constraints_header: Ricerca
       search_results: Risultati della ricerca
       show:
         label: "%{label}:"

data/config/locales/blacklight.nl.yml

@@ -108,7 +108,7 @@ nl:
         remove:
           label_value: "Verwijder zoekfilter %{label}: %{value}"
           value: Verwijder zoekfilter %{value}
-        title: "U zocht op:"
+        title: "Uw selecties:"
       form:
         search:
           label: zoeken op
@@ -144,7 +144,6 @@ nl:
         submit: Update
         title: Toon aantal zoekresultaten per pagina
       rss_feed: RSS voor zoekresultaten
-      search_constraints_header: Zoek filters
       search_results: Zoek resultaten
       show:
         label: "%{label}:"

data/config/locales/blacklight.pt-BR.yml

@@ -109,7 +109,7 @@ pt-BR:
         remove:
           label_value: "Remover %{label}: %{value}"
           value: Remover filtro %{value}
-        title: "Sua busca por:"
+        title: "Suas seleções:"
       form:
         search:
           label: busca
@@ -145,7 +145,6 @@ pt-BR:
         submit: Atualizar
         title: Número de resultados para mostrar por página
       rss_feed: RSS para resultadoss
-      search_constraints_header: Busca
       search_results: Resultados da Busca
       show:
         label: "%{label}:"

data/config/locales/blacklight.sq.yml

@@ -108,7 +108,7 @@ sq:
         remove:
           label_value: "Fshij kufizimin %{label}: %{value}"
           value: Fshij kufizimin %{value}
-        title: "Ju keni kërkuar për:"
+        title: "Zgjedhjet tuaja:"
       form:
         search:
           label: kërko për
@@ -144,7 +144,6 @@ sq:
         submit: Përditëso
         title: Numri i rezultateve që do të shfaqen për faqe
       rss_feed: RSS për rezultatet
-      search_constraints_header: Kufizimet e kërkimit
       search_results: Rezultatet e kërkimit
       show:
         label: "%{label}:"

data/config/locales/blacklight.zh.yml

@@ -108,7 +108,7 @@ zh:
         remove:
           label_value: "删除限定条件 %{label}: %{value}"
           value: 删除限定条件 %{value}
-        title: 你在搜索：
+        title: 您的选择：
       form:
         search:
           label: 搜索
@@ -144,7 +144,6 @@ zh:
         submit: 更新
         title: 每页显示结果数
       rss_feed: 搜索结果RSS
-      search_constraints_header: 搜索条件
       search_results: 搜索结果
       show:
         label: "%{label}:"

data/lib/blacklight/component.rb

@@ -9,9 +9,13 @@ module Blacklight
         @__vc_compiler = nil
       end
 
+      # This allows the host application to provide erb templates that override the templates
+      # provided by Blacklight.
       def sidecar_files(*args, **kwargs)
         upstream_sidecar_files(*args, **kwargs).map do |path|
-          app_path = Rails.root.join(path.slice(path.index(view_component_path)..-1).to_s).to_s
+          components_path = ViewComponent::VERSION::MAJOR == 3 ? view_component_path : config.generate.path
+
+          app_path = Rails.root.join(path.slice(path.index(components_path)..-1).to_s).to_s
 
           if File.exist?(app_path)
             app_path

data/lib/blacklight/configuration/facet_field.rb

@@ -76,6 +76,8 @@ module Blacklight
       self.index_range = 'A'..'Z' if index_range == true
       self.presenter ||= Blacklight::FacetFieldPresenter
       self.item_presenter ||= Blacklight::FacetItemPresenter
+      self.constraint_presenter ||= Blacklight::ConstraintPresenter
+
       self.component = Blacklight::Facets::ListComponent if component.nil? || component == true
       self.advanced_search_component ||= Blacklight::Facets::CheckboxesComponent
       self.item_component ||= Blacklight::Facets::ItemComponent

data/lib/blacklight/configuration.rb

@@ -148,6 +148,8 @@ module Blacklight
       property :index, default: ViewConfig::Index.new(
         # document presenter class used by helpers and views
         document_presenter_class: nil,
+        # document presenter used for json responses
+        json_presenter_class: Blacklight::JsonPresenter,
         # component class used to render a document
         document_component: Blacklight::DocumentComponent,
         sidebar_component: Blacklight::Search::SidebarComponent,

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

@@ -3,5 +3,5 @@
 env:
   SOLR_MODULES: analysis-extras
 collection:
-  dir: solr/conf/
+  dir: solr/
   name: blacklight-core

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "9.0.0-beta5",
+  "version": "9.0.0-beta7",
   "description": "The frontend code and styles for Blacklight",
   "exports": {
     "./blacklight.esm.js": "./app/assets/javascripts/blacklight/blacklight.esm.js",

data/spec/components/blacklight/constraints_component_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Blacklight::ConstraintsComponent, type: :component do
     end
 
     it 'has a header' do
-      expect(page).to have_css('h2', text: 'Search Constraints')
+      expect(page).to have_css('h2', text: 'Your selections:')
     end
 
     it 'wraps the output in a div' do
@@ -79,7 +79,7 @@ RSpec.describe Blacklight::ConstraintsComponent, type: :component do
     end
 
     it 'omits the headers' do
-      expect(page).to have_no_css('h2', text: 'Search Constraints')
+      expect(page).to have_no_css('h2', text: 'Your selections:')
     end
   end
 end

data/spec/components/blacklight/document_component_spec.rb

@@ -34,11 +34,11 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
   end
 
   it 'has some defined content areas' do
-    component.set_slot(:title) { 'Title' }
-    component.set_slot(:embed, nil, 'Embed')
-    component.set_slot(:metadata, nil, 'Metadata')
-    component.set_slot(:thumbnail, nil, 'Thumbnail')
-    component.set_slot(:actions) { 'Actions' }
+    component.with_title { 'Title' }
+    component.with_embed('Embed')
+    component.with_metadata('Metadata')
+    component.with_thumbnail('Thumbnail')
+    component.with_actions { 'Actions' }
     render_inline component
 
     expect(page).to have_content 'Title'
@@ -49,7 +49,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
   end
 
   it 'has schema.org properties' do
-    component.set_slot(:body) { '-' }
+    component.with_body { '-' }
     render_inline component
 
     expect(page).to have_css 'article[@itemtype="http://schema.org/Thing"]'
@@ -58,7 +58,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
 
   context 'with a provided body' do
     it 'opts-out of normal component content' do
-      component.set_slot(:body) { 'Body content' }
+      component.with_body { 'Body content' }
       render_inline component
 
       expect(page).to have_content 'Body content'
@@ -75,7 +75,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     let(:attr) { { counter: 5 } }
 
     it 'has data properties' do
-      component.set_slot(:body) { '-' }
+      component.with_body { '-' }
       render_inline component
 
       expect(page).to have_css 'article[@data-document-id="x"]'
@@ -137,7 +137,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     end
 
     it 'renders with an id' do
-      component.set_slot(:body) { '-' }
+      component.with_body { '-' }
       render_inline component
 
       expect(page).to have_css 'article#document'

data/spec/components/blacklight/facets/index_navigation_component_spec.rb

@@ -16,7 +16,8 @@ RSpec.describe Blacklight::Facets::IndexNavigationComponent, type: :component do
 
   it 'renders the facet index navigation range' do
     expect(page).to have_css '.pagination'
-    expect(page).to have_link '0', href: '/catalog/facet/language.html?facet.prefix=0&facet.sort=index'
+    facet_path = ViewComponent::VERSION::MAJOR == 3 ? '/catalog/facet/language.html' : '/catalog/facet/language'
+    expect(page).to have_link '0', href: "#{facet_path}?facet.prefix=0&facet.sort=index"
     expect(page).to have_link '1'
     expect(page).to have_link '8'
     expect(page).to have_link '9'

data/spec/components/blacklight/facets/suggest_component_spec.rb

@@ -28,7 +28,8 @@ RSpec.describe Blacklight::Facets::SuggestComponent, type: :component do
   it 'has an input with the data-facet-search-context attribute, which the javascript needs to determine the current search context' do
     with_request_url "/catalog/facet/language_facet?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields" do
       rendered = render_inline component
-      expect(rendered.css('input[data-facet-search-context="/catalog/facet/language_facet.html?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields"]').count).to eq 1
+      facet_path = ViewComponent::VERSION::MAJOR == 3 ? '/catalog/facet/language_facet.html' : '/catalog/facet/language_facet'
+      expect(rendered.css("input[data-facet-search-context=\"#{facet_path}?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields\"]").count).to eq 1
     end
   end