blacklight 9.0.0.beta8 → 9.1.0

data/spec/models/blacklight/search_builder_spec.rb

@@ -125,7 +125,7 @@ RSpec.describe Blacklight::SearchBuilder, :api do
       end
 
       subject.with(a: 1)
-      expect(subject.send(:processed_parameters)).to include step_1: 'builder'
+      expect(subject.processed_parameters).to include step_1: 'builder'
     end
   end
 
@@ -137,15 +137,23 @@ RSpec.describe Blacklight::SearchBuilder, :api do
 
   describe "#page" do
     it "is the current user parameter page number" do
-      expect(subject.with(page: 2).send(:page)).to eq 2
+      expect(subject.with(page: 2).page).to eq 2
     end
 
     it "is page 1 if not page number given" do
-      expect(subject.send(:page)).to eq 1
+      expect(subject.page).to eq 1
     end
 
     it "coerces parameters to integers" do
-      expect(subject.with(page: '2b').send(:page)).to eq 2
+      expect(subject.with(page: '2b').page).to eq 2
+    end
+
+    it 'sets the page number' do
+      expect(subject.page(3).page).to eq 3
+    end
+
+    it 'gracefully handles setting the page number with a nil value' do
+      expect(subject.page(nil).page).to eq 1
     end
   end
 
@@ -160,6 +168,10 @@ RSpec.describe Blacklight::SearchBuilder, :api do
       expect(subject.rows(17).rows).to eq 17
     end
 
+    it "gracefully hnadles setting the number of rows to a nil value" do
+      expect(subject.rows(nil).rows).to eq 10
+    end
+
     it "is the per_page parameter" do
       expect(subject.with(per_page: 5).rows).to eq 5
     end
@@ -225,6 +237,16 @@ RSpec.describe Blacklight::SearchBuilder, :api do
     end
   end
 
+  describe "#facet_suggestion_query" do
+    it "is nil if no value is set" do
+      expect(subject.facet_suggestion_query).to be_nil
+    end
+
+    it "sets facet_suggestion_query value" do
+      expect(subject.facet_suggestion_query('antel').facet_suggestion_query).to eq 'antel'
+    end
+  end
+
   describe "#search_field" do
     it "uses the requested search field" do
       blacklight_config.add_search_field 'x'

data/spec/models/blacklight/solr/repository_spec.rb

@@ -160,7 +160,11 @@ RSpec.describe Blacklight::Solr::Repository, :api do
       end
 
       describe "setting to post" do
-        let (:blacklight_config) { config = Blacklight::Configuration.new; config.http_method = :post; config }
+        let(:blacklight_config) do
+          config = Blacklight::Configuration.new
+          config.http_method = :post
+          config
+        end
 
         it "keep value set to post" do
           expect(blacklight_config.http_method).to eq :post
@@ -210,7 +214,11 @@ RSpec.describe Blacklight::Solr::Repository, :api do
   end
 
   describe "http_method configuration", :integration do
-    let (:blacklight_config) { config = Blacklight::Configuration.new; config.http_method = :post; config }
+    let(:blacklight_config) do
+      config = Blacklight::Configuration.new
+      config.http_method = :post
+      config
+    end
 
     it "sends a post request to solr and get a response back" do
       response = subject.search(params: { q: all_docs_query })

data/spec/models/blacklight/solr/search_builder_behavior_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, :api do
   end
 
   context "with a complex parameter environment" do
-    subject { search_builder.with(user_params).send(:processed_parameters) }
+    subject { search_builder.with(user_params).processed_parameters }
 
     let(:user_params) do
       { :search_field => "test_field", :q => "test query", "facet.field" => "extra_facet" }
@@ -90,7 +90,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, :api do
   # SPECS for actual search parameter generation
   describe "#processed_parameters" do
     subject do
-      search_builder.with(user_params).send(:processed_parameters)
+      search_builder.with(user_params).processed_parameters
     end
 
     context "when search_params_logic is customized" do
@@ -524,13 +524,11 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, :api do
   end
 
   describe "#add_facets_for_advanced_search_form" do
+    let(:user_params) do
+      Blacklight::SearchState.new({}, blacklight_config, mock_controller)
+    end
     let(:solr_parameters) { Blacklight::Solr::Request.new }
     let(:mock_controller) { instance_double(CatalogController, action_name: 'advanced_search') }
-    let(:mock_search_state) { instance_double(Blacklight::SearchState, controller: mock_controller) }
-
-    before do
-      allow(search_builder).to receive(:search_state).and_return(mock_search_state)
-    end
 
     context "when action is advanced_search and form_solr_parameters are configured" do
       before do
@@ -718,6 +716,166 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, :api do
     end
   end
 
+  describe "#add_facet_paging_to_solr" do
+    let(:facet_field) { 'format' }
+    let(:sort_key) { Blacklight::Solr::FacetPaginator.request_keys[:sort] }
+    let(:page_key) { Blacklight::Solr::FacetPaginator.request_keys[:page] }
+    let(:prefix_key) { Blacklight::Solr::FacetPaginator.request_keys[:prefix] }
+
+    let(:blacklight_config) do
+      Blacklight::Configuration.new do |config|
+        config.add_facet_fields_to_solr_request!
+        config.add_facet_field 'format'
+        config.add_facet_field 'format_ordered', sort: :count
+        config.add_facet_field 'format_limited', limit: 5
+        config.add_facet_field 'format_more_limited', limit: 5, more_limit: 50
+      end
+    end
+
+    let(:solr_parameters) do
+      solr_parameters = Blacklight::Solr::Request.new
+      subject.facet(facet_field).add_facet_paging_to_solr(solr_parameters)
+      solr_parameters
+    end
+
+    it 'sets rows to 0' do
+      expect(solr_parameters[:rows]).to eq 0
+    end
+
+    it 'sets facets requested to facet_field argument' do
+      expect(solr_parameters[:'facet.field']).to eq facet_field
+    end
+
+    it 'defaults offset to 0' do
+      expect(solr_parameters[:"f.#{facet_field}.facet.offset"]).to eq 0
+    end
+
+    context 'when offset is manually set' do
+      let(:user_params) { { page_key => 2 } }
+
+      it 'uses offset manually set, and converts it to an integer' do
+        expect(solr_parameters[:"f.#{facet_field}.facet.offset"]).to eq 20
+      end
+    end
+
+    context 'for a field with a configured more_limit' do
+      let(:facet_field) { 'format_more_limited' }
+
+      it 'uses the more_limit configuration' do
+        expect(solr_parameters[:"f.#{facet_field}.facet.limit"]).to eq 51
+      end
+    end
+
+    context 'for a field with a param key different from the field name' do
+      let(:user_params) { { page_key => 2, 'facet.sort': 'index', 'facet.prefix': 'x' } }
+      let(:facet_field) { 'param_key' }
+
+      let(:blacklight_config) do
+        Blacklight::Configuration.new.tap do |config|
+          config.add_facet_field key: 'param_key', field: 'solr_field', more_limit: 50, ex: 'other'
+
+          config.add_facet_fields_to_solr_request!
+        end
+      end
+
+      it "uses the configured solr field name in queries" do
+        expect(solr_parameters).to include 'f.solr_field.facet.limit': 51,
+                                           'f.solr_field.facet.offset': 50,
+                                           'f.solr_field.facet.sort': 'index',
+                                           'f.solr_field.facet.prefix': 'x',
+                                           'facet.field': '{!ex=other}solr_field'
+      end
+    end
+
+    it 'defaults limit to 20' do
+      expect(solr_parameters[:"f.#{facet_field}.facet.limit"]).to eq 21
+    end
+
+    it 'uses the default sort' do
+      expect(solr_parameters[:"f.#{facet_field}.facet.sort"]).to be_blank
+    end
+
+    context 'when sort is provided' do
+      let(:user_params) { { sort_key => 'index' } }
+
+      it 'uses sort provided in the parameters' do
+        expect(solr_parameters[:"f.#{facet_field}.facet.sort"]).to eq 'index'
+      end
+    end
+
+    context 'when a prefix is provided' do
+      let(:user_params) { { prefix_key => 'A' } }
+
+      it 'includes the prefix in the query' do
+        expect(solr_parameters[:"f.#{facet_field}.facet.prefix"]).to eq 'A'
+      end
+    end
+  end
+
+  describe "#add_facet_suggestion_parameters" do
+    it "does not add anything when the builder has no facet_suggestion_query and no facet" do
+      expect(subject.facet).to be_nil
+      expect(subject.facet_suggestion_query).to be_nil
+      solr_params = Blacklight::Solr::Request.new
+
+      expect do
+        subject.add_facet_suggestion_parameters(solr_params)
+      end.not_to(change { solr_params })
+    end
+
+    it "does not add anything when the builder has a facet_suggestion_query but no facet" do
+      subject.facet_suggestion_query = 'artic'
+      expect(subject.facet_suggestion_query).to eq 'artic'
+      expect(subject.facet).to be_nil
+      solr_params = Blacklight::Solr::Request.new
+
+      expect do
+        subject.add_facet_suggestion_parameters(solr_params)
+      end.not_to(change { solr_params })
+    end
+
+    it "does not add anything when the builder has a facet but no facet_suggestion_query" do
+      subject.facet = 'subject_facet'
+      expect(subject.facet_suggestion_query).to be_nil
+      expect(subject.facet).to eq 'subject_facet'
+      solr_params = Blacklight::Solr::Request.new
+
+      expect do
+        subject.add_facet_suggestion_parameters(solr_params)
+      end.not_to(change { solr_params })
+    end
+
+    it "adds the facet_suggestion_query to facet.contains" do
+      subject.facet = 'subject_facet'
+      subject.facet_suggestion_query = 'artic'
+      solr_params = Blacklight::Solr::Request.new
+
+      subject.add_facet_suggestion_parameters(solr_params)
+
+      expect(solr_params[:'facet.contains']).to eq 'artic'
+    end
+
+    it "adds the first part of facet_suggestion_query to facet.contains if it is extremely long" do
+      subject.facet = 'subject_facet'
+      subject.facet_suggestion_query = 'Call me Ishmael. Some years ago—never mind how long precisely'
+      solr_params = Blacklight::Solr::Request.new
+
+      subject.add_facet_suggestion_parameters(solr_params)
+
+      expect(solr_params[:'facet.contains']).to eq 'Call me Ishmael. Some years ago—never mind how long'
+    end
+
+    it "adds facet.contains.ignoreCase" do
+      subject.facet = 'subject_facet'
+      subject.facet_suggestion_query = 'artic'
+      solr_params = Blacklight::Solr::Request.new
+
+      subject.add_facet_suggestion_parameters(solr_params)
+
+      expect(solr_params[:'facet.contains.ignoreCase']).to be true
+    end
+  end
+
   describe "#with_tag_ex" do
     it "adds an !ex local parameter if the facet configuration requests it" do
       expect(subject.with_ex_local_param("xyz", "some-value")).to eq "{!ex=xyz}some-value"

data/spec/models/blacklight/user_spec.rb

@@ -1,12 +1,36 @@
 # frozen_string_literal: true
 
 RSpec.describe "Blacklight::User", :api do
-  subject { User.create! email: 'xyz@example.com', password: 'xyz12345' }
+  subject { create_user email: 'xyz@example.com', password: 'xyz12345' }
 
   def mock_bookmark document_id
     Bookmark.new document_id: document_id, document_type: SolrDocument.to_s
   end
 
+  describe ".blacklight_email_column" do
+    it "returns the email column the model actually has" do
+      expected = User.column_names.include?("email_address") ? :email_address : :email
+      expect(User.blacklight_email_column).to eq expected
+    end
+  end
+
+  describe ".create_guest_user!" do
+    it "creates a persisted user with a generated, unique identifier" do
+      guest = User.create_guest_user!
+
+      expect(guest).to be_persisted
+      expect(guest.public_send(User.blacklight_email_column)).to match(/^guest_.*@example\.com$/)
+    end
+
+    it "generates a distinct identifier each time" do
+      one = User.create_guest_user!
+      two = User.create_guest_user!
+
+      expect(one.public_send(User.blacklight_email_column))
+        .not_to eq(two.public_send(User.blacklight_email_column))
+    end
+  end
+
   describe "#bookmarks_for_documents" do
     before do
       subject.bookmarks << mock_bookmark(1)
@@ -47,12 +71,15 @@ RSpec.describe "Blacklight::User", :api do
   end
 
   describe '#to_s' do
-    it 'is the email by default' do
-      expect(subject.to_s).to eq subject.email
+    it 'is the configured display key by default' do
+      display_key = User.column_names.include?("email_address") ? :email_address : :email
+
+      expect(subject.to_s).to eq subject.public_send(display_key)
     end
 
-    context 'when no email method is provided' do
-      let(:old_method) { subject.class.instance_method(:email) }
+    context 'when no configured display key method is provided' do
+      let(:display_key) { User.column_names.include?("email_address") ? :email_address : :email }
+      let(:old_method) { subject.class.instance_method(display_key) }
 
       before do
         subject.class.send(:undef_method, old_method.name)

data/spec/models/bookmark_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Bookmark do
     b
   end
 
-  let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345' }
+  let(:user) { create_user email: 'xyz@example.com', password: 'xyz12345' }
 
   it "is valid" do
     expect(subject).to be_valid

data/spec/models/record_mailer_spec.rb

@@ -37,11 +37,11 @@ RSpec.describe RecordMailer do
     end
 
     it "starts the subject w/ Item Record:" do
-      expect(email.subject).to match /^Item Record:/
+      expect(email.subject).to match(/^Item Record:/)
     end
 
     it "puts the title of the item in the subject" do
-      expect(email.subject).to match /The horn/
+      expect(email.subject).to include('The horn')
     end
 
     it "has the correct from address (w/o the port number)" do
@@ -49,9 +49,9 @@ RSpec.describe RecordMailer do
     end
 
     it "prints out the correct body" do
-      expect(email.body).to match /Title: The horn/
-      expect(email.body).to match /Author: Janetzky, Kurt/
-      expect(email.body).to match /projectblacklight.org/
+      expect(email.body).to include('Title: The horn')
+      expect(email.body).to include('Author: Janetzky, Kurt')
+      expect(email.body).to match(/projectblacklight.org/)
     end
 
     it "uses https URLs when protocol is set" do
@@ -104,9 +104,9 @@ RSpec.describe RecordMailer do
     end
 
     it "prints out the correct body" do
-      expect(@sms.body).to match /Title: The horn/
-      expect(@sms.body).to match /Author: Janetzky, Kurt/
-      expect(@sms.body).to match /projectblacklight.org:3000/
+      expect(@sms.body).to include('Title: The horn')
+      expect(@sms.body).to include('Author: Janetzky, Kurt')
+      expect(@sms.body).to match(/projectblacklight.org:3000/)
     end
 
     it "uses https URL when protocol is set" do

data/spec/models/search_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe Search do
   let(:search) { described_class.new(user: user) }
-  let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345' }
+  let(:user) { create_user email: 'xyz@example.com', password: 'xyz12345' }
   let(:hash_params) { { q: "query", f: { facet: "filter" } } }
   let(:query_params) { hash_params }
 

data/spec/models/solr_document_spec.rb

@@ -54,6 +54,7 @@ RSpec.describe SolrDocument, :api do
         attribute :first_author, :select, 'author_tesim', by: :min
         attribute :date, :date, field: 'date_dtsi'
         attribute :time, :time, field: 'date_dtsi'
+        attribute :details, :json, 'details_ssi'
         attribute :whatever, :string, default: ->(*) { 'default_value' }
       end
     end
@@ -61,6 +62,7 @@ RSpec.describe SolrDocument, :api do
       doc_class.new(id: '123',
                     title_tesim: ['Good Omens'],
                     author_tesim: ['Neil Gaiman', 'Terry Pratchett'],
+                    details_ssi: '{"pages":288}',
                     date_dtsi: '1990-01-01T17:23:13Z')
     end
 
@@ -72,6 +74,8 @@ RSpec.describe SolrDocument, :api do
       expect(document.date.to_s).to eq '1990-01-01'
       expect(document.time).to be_a Time
       expect(document.time.to_s).to eq '1990-01-01 17:23:13 UTC'
+      expect(document.details).to be_a Hash
+      expect(document.details).to eq({ 'pages' => 288 })
       expect(document.whatever).to eq 'default_value'
     end
 

data/spec/presenters/blacklight/index_presenter_spec.rb

@@ -2,6 +2,7 @@
 
 RSpec.describe Blacklight::IndexPresenter, :api do
   include Capybara::RSpecMatchers
+
   subject { presenter }
 
   let(:request_context) { double(document_index_view_type: 'list') }

data/spec/presenters/blacklight/rendering/pipeline_spec.rb

@@ -2,6 +2,7 @@
 
 RSpec.describe Blacklight::Rendering::Pipeline do
   include Capybara::RSpecMatchers
+
   let(:document) { instance_double(SolrDocument) }
   let(:context) { double }
   let(:options) { {} }

data/spec/presenters/blacklight/show_presenter_spec.rb

@@ -2,6 +2,7 @@
 
 RSpec.describe Blacklight::ShowPresenter, :api do
   include Capybara::RSpecMatchers
+
   subject { presenter }
 
   let(:request_context) { double }

data/spec/presenters/blacklight/thumbnail_presenter_spec.rb

@@ -2,6 +2,7 @@
 
 RSpec.describe Blacklight::ThumbnailPresenter do
   include Capybara::RSpecMatchers
+
   let(:view_context) { double "View context" }
   let(:config) { Blacklight::Configuration.new.view_config(:index) }
   let(:presenter) { described_class.new(document, view_context, config) }

data/spec/services/blacklight/search_service_spec.rb

@@ -145,7 +145,7 @@ RSpec.describe Blacklight::SearchService, :api do
     end
 
     it 'has all facets specified in initializer' do
-      expect(@facets.keys).to include *blacklight_config.facet_fields.keys
+      expect(@facets.keys).to include(*blacklight_config.facet_fields.keys)
       expect(@facets.none? { |_k, v| v.nil? }).to be true
     end
 
@@ -379,40 +379,40 @@ RSpec.describe Blacklight::SearchService, :api do
     end
 
     it "returns the previous and next documents for a search" do
-      _response, docs = service.previous_and_next_documents_for_search(4, q: '')
+      _response, docs = service.previous_and_next_documents_for_search(4, { q: '' })
 
       expect(docs.first.id).to eq @full_response.documents[3].id
       expect(docs.last.id).to eq @full_response.documents[5].id
     end
 
     it "returns only the next document if the counter is 0" do
-      _response, docs = service.previous_and_next_documents_for_search(0, q: '')
+      _response, docs = service.previous_and_next_documents_for_search(0, { q: '' })
 
       expect(docs.first).to be_nil
       expect(docs.last.id).to eq @full_response.documents[1].id
     end
 
     it "returns only the previous document if the counter is the total number of documents" do
-      _response, docs = service.previous_and_next_documents_for_search(@full_response.total - 1, q: '')
+      _response, docs = service.previous_and_next_documents_for_search(@full_response.total - 1, { q: '' })
       expect(docs.first.id).to eq @full_response.documents.slice(-2).id
       expect(docs.last).to be_nil
     end
 
     it "returns an array of nil values if there is only one result" do
-      _response, docs = service.previous_and_next_documents_for_search(0, q: 'id:2007020969')
+      _response, docs = service.previous_and_next_documents_for_search(0, { q: 'id:2007020969' })
       expect(docs.last).to be_nil
       expect(docs.first).to be_nil
     end
 
     it 'returns only the unique key by default' do
-      _response, docs = service.previous_and_next_documents_for_search(0, q: '')
+      _response, docs = service.previous_and_next_documents_for_search(0, { q: '' })
       expect(docs.last.to_h).to eq 'id' => @full_response.documents[1].id
     end
 
     it 'allows the query parameters to be customized using configuration' do
       blacklight_config.document_pagination_params[:fl] = 'id,format'
 
-      _response, docs = service.previous_and_next_documents_for_search(0, q: '')
+      _response, docs = service.previous_and_next_documents_for_search(0, { q: '' })
 
       expect(docs.last.to_h).to eq @full_response.documents[1].to_h.slice('id', 'format')
     end

data/spec/spec_helper.rb

@@ -48,25 +48,16 @@ RSpec.configure do |config|
   # When we're testing the API, only run the api tests
   config.filter_run api: true if ENV['BLACKLIGHT_API_TEST'].present?
 
-  if Rails.version.to_f >= 7.1
-    config.fixture_paths = [Rails.root.join("spec/fixtures")]
-  else
-    config.fixture_path = Rails.root.join("spec/fixtures")
-  end
+  config.fixture_paths = [Rails.root.join("spec/fixtures")]
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
 
-  if defined? Devise::Test::ControllerHelpers
-    config.include Devise::Test::ControllerHelpers, type: :controller
-  else
-    config.include Devise::TestHelpers, type: :controller
-    config.include Devise::TestHelpers, type: :i18n
-  end
-
   config.infer_spec_type_from_file_location!
+  config.include UserHelpers
+  config.include Devise::Test::ControllerHelpers, type: :controller if defined?(Devise)
   config.include PresenterTestHelpers, type: :presenter
   config.include ViewComponent::TestHelpers, type: :component
   config.include ViewComponentTestHelpers, type: :component

data/spec/support/features/session_helpers.rb

@@ -4,6 +4,8 @@
 module Features
   module SessionHelpers
     def sign_up_with(email, password)
+      return create_user(email: email, password: password) if respond_to?(:new_session_path)
+
       Capybara.exact = true
       visit new_user_registration_path
       fill_in 'Email', with: email
@@ -14,10 +16,17 @@ module Features
 
     def sign_in(login = 'user1')
       email = "#{login}@#{login}.com"
-      User.create(email: email, password: "password", password_confirmation: "password")
-      visit new_user_session_path
-      fill_in("user_email", with: email)
-      fill_in("user_password", with: "password")
+      create_user(email: email, password: "password")
+
+      if respond_to?(:new_session_path)
+        visit new_session_path
+        fill_in("email_address", with: email)
+        fill_in("password", with: "password")
+      else
+        visit new_user_session_path
+        fill_in("user_email", with: email)
+        fill_in("user_password", with: "password")
+      end
 
       if has_button? "Sign in"
         click_on("Sign in")

data/spec/support/features/turbo_helpers.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# spec/support/features/turbo_helpers.rb
+module Features
+  module TurboHelpers
+    # Turbo Drive marks the document as busy for the duration of a visit. Capybara
+    # clicks return before the visit completes, so wait for the busy state to clear
+    # before making assertions that don't wait on their own (e.g. be_axe_clean).
+    def wait_for_turbo
+      expect(page).to have_no_css('html[aria-busy]', visible: :all)
+    end
+  end
+end

data/spec/support/features.rb

@@ -4,8 +4,10 @@
 
 require File.expand_path('features/search_helpers.rb', __dir__)
 require File.expand_path('features/session_helpers.rb', __dir__)
+require File.expand_path('features/turbo_helpers.rb', __dir__)
 
 RSpec.configure do |config|
   config.include Features::SearchHelpers, type: :feature
   config.include Features::SessionHelpers, type: :feature
+  config.include Features::TurboHelpers, type: :feature
 end

data/spec/support/user_helpers.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module UserHelpers
+  def build_user(attributes = {})
+    User.new(user_attributes(attributes))
+  end
+
+  def create_user(attributes = {})
+    User.create!(user_attributes(attributes))
+  end
+
+  def user_attributes(attributes = {})
+    attributes = attributes.dup
+    password = attributes.delete(:password) || "password"
+    email = attributes.delete(:email) || attributes.delete(:email_address) || "user@example.com"
+    email_attribute = User.column_names.include?("email_address") ? :email_address : :email
+
+    {
+      email_attribute => email,
+      password: password,
+      password_confirmation: attributes.delete(:password_confirmation) || password
+    }.merge(attributes)
+  end
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -15,7 +15,7 @@ class TestAppGenerator < Rails::Generators::Base
     Bundler.with_unbundled_env do
       run "bundle install"
     end
-    options = '--devise'
+    options = Rails.gem_version >= Gem::Version.new('8.0.0') ? '--authentication' : '--devise'
     if ENV['BLACKLIGHT_API_TEST'].present?
       options += ' --skip-assets'
     end