blacklight 9.0.0 → 9.1.0

data/spec/features/search_filters_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe "Facets" do
       click_on "Tibetan"
     end
     within "#sortAndPerPage" do
-      expect(page).to have_content "1 - 6 of 6"
+      expect(page).to have_text "1 - 6 of 6"
     end
 
     expect(page).to have_css(".blacklight-language_ssim")
@@ -21,8 +21,8 @@ RSpec.describe "Facets" do
     within "#facet-subject_geo_ssim" do
       click_on "India"
     end
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "1 - 2 of 2"
+    within("#sortAndPerPage") do
+      expect(page).to have_text "1 - 2 of 2"
     end
     within "#facet-language_ssim" do
       expect(page).to have_css("span.selected", text: "Tibetan")
@@ -38,29 +38,29 @@ RSpec.describe "Facets" do
     visit root_path
     fill_in "q", with: 'history'
     click_on 'search'
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "1 - 10 of 11"
+    within("#sortAndPerPage") do
+      expect(page).to have_text "1 - 10 of 11"
     end
 
     within "#facet-language_ssim" do
       click_on "Tibetan"
     end
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "1 - 2 of 2"
+    within("#sortAndPerPage") do
+      expect(page).to have_text "1 - 2 of 2"
     end
     within "#facet-language_ssim" do
       expect(page).to have_css("span.selected", text: "Tibetan")
       expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
-      expect(page).to have_content "Your selections:"
-      expect(page).to have_content "history"
+      expect(page).to have_text "Your selections:"
+      expect(page).to have_text "history"
     end
 
     click_on "2004"
 
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "1 entry found"
+    within("#sortAndPerPage") do
+      expect(page).to have_text "1 entry found"
     end
     within "#facet-language_ssim" do
       expect(page).to have_css("span.selected", text: "Tibetan")
@@ -85,7 +85,7 @@ RSpec.describe "Facets" do
       click_on 'remove'
     end
     expect(page).to have_no_link 'remove'
-    expect(page).to have_content('Welcome!')
+    expect(page).to have_text('Welcome!')
   end
 
   it "retains filters when you change the search term" do
@@ -140,8 +140,8 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
-      expect(page).to have_content "Your selections:"
-      expect(page).to have_content "history"
+      expect(page).to have_text "Your selections:"
+      expect(page).to have_text "history"
     end
   end
 
@@ -164,8 +164,8 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
-      expect(page).to have_content "Your selections:"
-      expect(page).to have_content "history"
+      expect(page).to have_text "Your selections:"
+      expect(page).to have_text "history"
     end
   end
 

data/spec/features/search_formats_spec.rb

@@ -3,13 +3,13 @@
 RSpec.describe "Search Formats" do
   it "has an RSS XML response" do
     visit "/catalog.rss?q="
-    expect(page).to have_content "Blacklight Search Results"
+    expect(page).to have_text "Blacklight Search Results"
     expect(page).to have_xpath('//item', count: 10)
   end
 
   it "has an ATOM XML response" do
     visit "/catalog.atom?q="
-    expect(page).to have_content "Blacklight Search Results"
+    expect(page).to have_text "Blacklight Search Results"
 
     expect(page).to have_xpath('//entry', count: 10)
   end

data/spec/features/search_history_spec.rb

@@ -5,8 +5,8 @@ RSpec.describe "Search History Page" do
     it "has a link to the history page" do
       visit root_path
       click_on 'History'
-      expect(page).to have_content 'Search History'
-      expect(page).to have_content 'You have no search history'
+      expect(page).to have_text 'Search History'
+      expect(page).to have_text 'You have no search history'
     end
   end
 
@@ -19,15 +19,15 @@ RSpec.describe "Search History Page" do
     end
 
     it "shows searches" do
-      expect(page).to have_content 'Your recent searches'
-      expect(page).to have_content 'book'
-      expect(page).to have_no_content 'dang'
+      expect(page).to have_text 'Your recent searches'
+      expect(page).to have_text 'book'
+      expect(page).to have_no_text 'dang'
       visit root_path
       fill_in "q", with: 'dang'
       click_on 'search'
       click_on 'History'
-      expect(page).to have_content 'book'
-      expect(page).to have_content 'dang'
+      expect(page).to have_text 'book'
+      expect(page).to have_text 'dang'
     end
   end
 
@@ -43,10 +43,10 @@ RSpec.describe "Search History Page" do
 
     it "is able to clear the history" do
       click_on "Clear Search History"
-      expect(page).to have_content 'Cleared your search history.'
-      expect(page).to have_content 'You have no search history'
-      expect(page).to have_no_content 'book'
-      expect(page).to have_no_content 'dang'
+      expect(page).to have_text 'Cleared your search history.'
+      expect(page).to have_text 'You have no search history'
+      expect(page).to have_no_text 'book'
+      expect(page).to have_no_text 'dang'
     end
   end
 end

data/spec/features/search_pagination_spec.rb

@@ -5,8 +5,8 @@ RSpec.describe "Search Pagination" do
     visit root_path
     fill_in "q", with: ''
     click_on 'search'
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "1 - 10 of "
+    within("#sortAndPerPage") do
+      expect(page).to have_text "1 - 10 of "
       within '#per_page-dropdown' do
         expect(page).to have_link('10')
         expect(page).to have_link('20')
@@ -18,11 +18,11 @@ RSpec.describe "Search Pagination" do
       click_on "Next »"
     end
     within "#sortAndPerPage" do
-      expect(page).to have_content "11 - 20 of "
+      expect(page).to have_text "11 - 20 of "
       click_on "« Previous"
     end
     within "#sortAndPerPage" do
-      expect(page).to have_content "1 - 10 of "
+      expect(page).to have_text "1 - 10 of "
     end
   end
 
@@ -30,15 +30,15 @@ RSpec.describe "Search Pagination" do
     visit root_path
     fill_in "q", with: ''
     click_on 'search'
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "1 - 10 of "
+    within("#sortAndPerPage") do
+      expect(page).to have_text "1 - 10 of "
     end
 
-    within ("#per_page-dropdown") do
+    within("#per_page-dropdown") do
       click_on '20'
     end
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "1 - 20 of "
+    within("#sortAndPerPage") do
+      expect(page).to have_text "1 - 20 of "
     end
   end
 
@@ -60,18 +60,18 @@ RSpec.describe "Search Pagination" do
       visit root_path
       fill_in "q", with: ''
       click_on 'search'
-      within ("#sortAndPerPage") do
-        expect(page).to have_content "1 - 15 of "
+      within("#sortAndPerPage") do
+        expect(page).to have_text "1 - 15 of "
         within '#per_page-dropdown' do
           expect(page).to have_link('15')
           expect(page).to have_link('30')
         end
       end
-      within ("#per_page-dropdown") do
+      within("#per_page-dropdown") do
         click_on '30'
       end
-      within ("#sortAndPerPage") do
-        expect(page).to have_content "1 - 30 of "
+      within("#sortAndPerPage") do
+        expect(page).to have_text "1 - 30 of "
       end
     end
   end
@@ -84,13 +84,13 @@ RSpec.describe "Search Pagination" do
       click_on "Next »"
     end
     within "#sortAndPerPage" do
-      expect(page).to have_content "11 - 20 of "
+      expect(page).to have_text "11 - 20 of "
     end
-    within ("#per_page-dropdown") do
+    within("#per_page-dropdown") do
       click_on '20'
     end
     within "#sortAndPerPage" do
-      expect(page).to have_content "1 - 20 of "
+      expect(page).to have_text "1 - 20 of "
     end
   end
 end

data/spec/features/search_results_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe "Search Results" do
 
   it "provides search hints if there are no results" do
     search_for 'asdfghj'
-    expect(page).to have_content "No results found for your search"
+    expect(page).to have_text "No results found for your search"
   end
 
   it "provides search hints if there are no results" do
@@ -52,8 +52,8 @@ RSpec.describe "Search Results" do
     fill_in "q", with: "inmul"
     select "Author", from: "search_field"
     click_on 'search'
-    expect(page).to have_content "No results found for your search"
-    expect(page).to have_content "you searched by Author"
+    expect(page).to have_text "No results found for your search"
+    expect(page).to have_text "you searched by Author"
     click_on "try searching everything"
     expect(page).to have_xpath("//a[contains(@href, 77826928)]")
   end

data/spec/features/search_sort_spec.rb

@@ -6,17 +6,17 @@ RSpec.describe "Search Sort" do
     within "#facet-language_ssim" do
       click_on 'English'
     end
-    expect(page).to have_content 'Sort by relevance'
+    expect(page).to have_text 'Sort by relevance'
     click_on 'title'
-    expect(page).to have_content 'Sort by title'
+    expect(page).to have_text 'Sort by title'
   end
 
   it "sorts on search" do
     visit root_path
     fill_in "q", with: 'bod'
     click_on 'search'
-    expect(page).to have_content 'Sort by relevance'
+    expect(page).to have_text 'Sort by relevance'
     click_on 'title'
-    expect(page).to have_content 'Sort by title'
+    expect(page).to have_text 'Sort by title'
   end
 end

data/spec/features/search_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe "Search Page" do
   it "shows welcome" do
     visit root_path
     expect(page).to have_field("search for")
-    within ("select#search_field") do
+    within("select#search_field") do
       expect(page).to have_css('option', text: 'All Fields')
       expect(page).to have_css('option', text: 'Title')
       expect(page).to have_css('option', text: 'Author')
@@ -18,7 +18,7 @@ RSpec.describe "Search Page" do
     expect(page).to have_css("button[type='submit'] .submit-search-text")
     expect(page).to have_no_link "Start Over"
 
-    expect(page).to have_content "Welcome!"
+    expect(page).to have_text "Welcome!"
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
     expect(page).to have_css("link[rel=stylesheet]")
@@ -44,17 +44,17 @@ RSpec.describe "Search Page" do
     Capybara.ignore_hidden_elements = tmp_value
 
     within "#appliedParams" do
-      expect(page).to have_content "Your selections:"
-      expect(page).to have_content "history"
+      expect(page).to have_text "Your selections:"
+      expect(page).to have_text "history"
     end
 
-    within ("select#search_field") do
+    within("select#search_field") do
       expect(page).to have_css("option[selected]", text: "All Fields")
     end
 
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "Sort by"
-      expect(page).to have_content "1 - 10 of 11"
+    within("#sortAndPerPage") do
+      expect(page).to have_text "Sort by"
+      expect(page).to have_text "1 - 10 of 11"
       within '#sort-dropdown' do
         expect(page).to have_link('relevance')
         expect(page).to have_link('year')
@@ -74,18 +74,18 @@ RSpec.describe "Search Page" do
     click_on 'search'
 
     within "#appliedParams" do
-      expect(page).to have_content "Your selections:"
-      expect(page).to have_content "Title"
-      expect(page).to have_content "inmul"
+      expect(page).to have_text "Your selections:"
+      expect(page).to have_text "Title"
+      expect(page).to have_text "inmul"
     end
-    within ("select#search_field") do
+    within("select#search_field") do
       expect(page).to have_css("option[selected]", text: "Title")
     end
     within(".index_title") do
-      expect(page).to have_content "1."
+      expect(page).to have_text "1."
     end
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "1 entry found"
+    within("#sortAndPerPage") do
+      expect(page).to have_text "1 entry found"
     end
   end
 
@@ -94,8 +94,8 @@ RSpec.describe "Search Page" do
     fill_in "q", with: 'history'
     click_on 'search'
     within "#documents" do
-      expect(page).to have_content "次按驟變"
-      expect(page).to have_content "DK861.K3 V5"
+      expect(page).to have_text "次按驟變"
+      expect(page).to have_text "DK861.K3 V5"
     end
   end
 
@@ -104,15 +104,15 @@ RSpec.describe "Search Page" do
     fill_in "q", with: 'history'
     click_on 'search'
     within "#appliedParams" do
-      expect(page).to have_content "Your selections:"
-      expect(page).to have_content "history"
+      expect(page).to have_text "Your selections:"
+      expect(page).to have_text "history"
     end
 
     expect(page).to have_css "#q[value='history']"
 
     click_on "Start Over"
 
-    expect(page).to have_content "Welcome!"
+    expect(page).to have_text "Welcome!"
     expect(page).to have_no_css "#q[value='history']"
   end
 end

data/spec/helpers/blacklight/url_helper_behavior_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Blacklight::UrlHelperBehavior do
   before do
     allow(controller).to receive_messages(controller_name: 'test', search_state_class: Blacklight::SearchState)
     allow(helper).to receive(:search_action_path) do |*args|
-      search_catalog_url *args
+      search_catalog_url(*args)
     end
 
     allow(helper).to receive_messages(blacklight_config: blacklight_config)
@@ -35,17 +35,17 @@ RSpec.describe Blacklight::UrlHelperBehavior do
     it "builds a link tag to catalog using session[:search] for query params" do
       allow(helper).to receive(:current_search_session).and_return double(query_params: query_params)
       tag = helper.link_back_to_catalog
-      expect(tag).to match /q=query/
-      expect(tag).to match /f=facets/
-      expect(tag).not_to match /page=/
-      expect(tag).not_to match /per_page=/
+      expect(tag).to include('q=query')
+      expect(tag).to include('f=facets')
+      expect(tag).not_to include('page=')
+      expect(tag).not_to include('per_page=')
     end
 
     it "builds a link tag to bookmarks using session[:search] for query params" do
       allow(helper).to receive(:current_search_session).and_return double(query_params: bookmarks_query_params)
       tag = helper.link_back_to_catalog
-      expect(tag).to match /Back to Bookmarks/
-      expect(tag).to match %r{/bookmarks}
+      expect(tag).to include('Back to Bookmarks')
+      expect(tag).to include('/bookmarks')
     end
 
     context "with a search context" do
@@ -53,16 +53,16 @@ RSpec.describe Blacklight::UrlHelperBehavior do
         allow(helper).to receive_messages(current_search_session: double(query_params: query_params))
         allow(helper).to receive_messages(search_session: { 'per_page' => 15, 'counter' => 31 })
         tag = helper.link_back_to_catalog
-        expect(tag).to match /page=3/
-        expect(tag).to match /per_page=15/
+        expect(tag).to include('page=3')
+        expect(tag).to include('per_page=15')
       end
 
       it "omits per_page if the value is the same as the default" do
         allow(helper).to receive_messages(current_search_session: double(query_params: query_params))
         allow(helper).to receive_messages(search_session: { 'per_page' => 10, 'counter' => 31 })
         tag = helper.link_back_to_catalog
-        expect(tag).to match /page=4/
-        expect(tag).not_to match /per_page=/
+        expect(tag).to include('page=4')
+        expect(tag).not_to include('per_page=')
       end
     end
 
@@ -92,8 +92,8 @@ RSpec.describe Blacklight::UrlHelperBehavior do
         expect(my_engine).to receive(:url_for)
           .with({ q: "query", f: "facets", controller: "catalog" })
           .and_return('link-url')
-        expect(tag).to match /Back to Search/
-        expect(tag).to match /link-url/
+        expect(tag).to include('Back to Search')
+        expect(tag).to include('link-url')
       end
     end
   end
@@ -130,11 +130,11 @@ RSpec.describe Blacklight::UrlHelperBehavior do
       end
 
       it "passes on the title attribute to the link_to_with_data method" do
-        expect(helper.link_to_document(document, "Some crazy long label...", title: "Some crazy longer label")).to match(/title="Some crazy longer label"/)
+        expect(helper.link_to_document(document, "Some crazy long label...", title: "Some crazy longer label")).to include('title="Some crazy longer label"')
       end
 
       it "doesn't add an erroneous title attribute if one isn't provided" do
-        expect(helper.link_to_document(document, "Some crazy long label...")).not_to match(/title=/)
+        expect(helper.link_to_document(document, "Some crazy long label...")).not_to include('title=')
       end
 
       context "with an integer id" do

data/spec/helpers/blacklight_helper_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe BlacklightHelper do
   before do
     allow(helper).to receive(:current_or_guest_user).and_return(User.new)
     allow(helper).to receive(:search_action_path) do |*args|
-      search_catalog_url *args
+      search_catalog_url(*args)
     end
   end
 

data/spec/helpers/catalog_helper_spec.rb

@@ -112,7 +112,7 @@ RSpec.describe CatalogHelper do
     context "with an ActiveRecord collection" do
       subject { helper.page_entries_info(Bookmark.page(1).per(25)) }
 
-      let(:user) { User.create! email: 'xyz@example.com', password: 'xyz12345' }
+      let(:user) { create_user email: 'xyz@example.com', password: 'xyz12345' }
 
       before { 50.times { Bookmark.create!(user: user) } }
 
@@ -135,9 +135,9 @@ RSpec.describe CatalogHelper do
 
       it "calls url_for on the engine scope" do
         expect(my_engine).to receive(:url_for).and_return('/rss-path')
-        expect(tag).to match /title="RSS for results"/
-        expect(tag).to match /rel="alternate"/
-        expect(tag).to match %r{type="application/rss\+xml"}
+        expect(tag).to include('title="RSS for results"')
+        expect(tag).to include('rel="alternate"')
+        expect(tag).to include('type="application/rss+xml"')
       end
     end
   end
@@ -157,9 +157,9 @@ RSpec.describe CatalogHelper do
 
       it "calls url_for on the engine scope" do
         expect(my_engine).to receive(:url_for).and_return('/atom-path')
-        expect(tag).to match /title="Atom for results"/
-        expect(tag).to match /rel="alternate"/
-        expect(tag).to match %r{type="application/atom\+xml"}
+        expect(tag).to include('title="Atom for results"')
+        expect(tag).to include('rel="alternate"')
+        expect(tag).to include('type="application/atom+xml"')
       end
     end
   end

data/spec/integration/generators/blacklight/user_generator_spec.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'generators/blacklight/user_generator'
+
+RSpec.describe Blacklight::UserGenerator do
+  describe "#validate_authentication_options" do
+    it "rejects multiple authentication providers" do
+      generator = described_class.new(["user"], devise: true, authentication: true)
+
+      expect { generator.validate_authentication_options }.to raise_error(Thor::Error, /either --devise or --authentication/)
+    end
+  end
+
+  describe "#blacklight_user_display_key_configuration" do
+    it "uses Rails authentication's email_address field when requested" do
+      generator = described_class.new(["user"], authentication: true)
+
+      expect(generator.send(:blacklight_user_display_key_configuration)).to eq "self.string_display_key = :email_address"
+    end
+
+    it "keeps the email configuration commented by default" do
+      generator = described_class.new(["user"])
+
+      expect(generator.send(:blacklight_user_display_key_configuration)).to eq "# self.string_display_key = :email"
+    end
+  end
+
+  describe "#inject_rails_authentication_guest_transfer" do
+    let(:destination) { Dir.mktmpdir }
+    let(:generator) { described_class.new(["user"], authentication: true) }
+    let(:sessions_path) { File.join(destination, "app/controllers/sessions_controller.rb") }
+
+    before { generator.destination_root = destination }
+
+    after { FileUtils.rm_rf(destination) }
+
+    it "injects the guest transfer call after starting a session" do
+      FileUtils.mkdir_p(File.dirname(sessions_path))
+      File.write(sessions_path, <<~RUBY)
+        class SessionsController < ApplicationController
+          def create
+            if user = User.authenticate_by(params.permit(:email_address, :password))
+              start_new_session_for user
+              redirect_to after_authentication_url
+            end
+          end
+        end
+      RUBY
+
+      generator.send(:inject_rails_authentication_guest_transfer)
+
+      expect(File.read(sessions_path)).to include("start_new_session_for user\n      transfer_guest_to_user\n")
+    end
+
+    it "is a no-op when there is no sessions controller" do
+      expect { generator.send(:inject_rails_authentication_guest_transfer) }.not_to raise_error
+    end
+  end
+end

data/spec/lib/blacklight/search_state/pivot_filter_field_spec.rb

@@ -73,7 +73,7 @@ RSpec.describe Blacklight::SearchState::PivotFilterField do
       new_state = filter.remove(value_class.new(fq: { some_other_field: '3' }, value: '1'))
 
       expect(new_state.params[:f]).not_to include :some_other_field
-      expect(new_state.filter('pivot_field').values&.map(&:fq)).to eql([some_other_field: nil])
+      expect(new_state.filter('pivot_field').values&.map(&:fq)).to eql([{ some_other_field: nil }])
     end
 
     it 'removes the filter parameter entirely if there are no filters left' do

data/spec/models/blacklight/configurable_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe "Blacklight::Configurable", :api do
     end
 
     it "inherited version should be a deep copy, not original" do
-      expect(TestCaseInheritence::Child.blacklight_config).not_to  be(TestCaseInheritence::Parent.blacklight_config)
+      expect(TestCaseInheritence::Child.blacklight_config).not_to be(TestCaseInheritence::Parent.blacklight_config)
 
       TestCaseInheritence::Child.blacklight_config.list << "child_only"
 

data/spec/models/blacklight/configuration_spec.rb

@@ -670,25 +670,6 @@ RSpec.describe Blacklight::Configuration, :api do
         expect(config.view_config(action_name: :show)).to have_attributes config.show.to_h
       end
 
-      it 'includes the default action mapping configuration' do
-        config.action_mapping.default.whatever = :some_value
-
-        expect(config.view_config(action_name: :show)).to have_attributes whatever: :some_value
-      end
-
-      it 'includes the action-specific mappings' do
-        config.action_mapping.foo.document_presenter_class = Blacklight::DocumentPresenter
-
-        expect(config.view_config(action_name: :foo)).to have_attributes config.action_mapping.foo.to_h
-      end
-
-      it 'allows the action mapping to specific a parent configuration with some more defaults' do
-        config.action_mapping.foo.parent_config = :bar
-        config.action_mapping.bar.whatever = :bar_value
-
-        expect(config.view_config(action_name: :foo)).to have_attributes whatever: :bar_value
-      end
-
       context 'with the :citation action' do
         it 'also includes the show config' do
           expect(config.view_config(action_name: :citation)).to have_attributes config.show.to_h

data/spec/models/blacklight/document/dublin_core_spec.rb

@@ -25,8 +25,8 @@ RSpec.describe "Blacklight::Document::DublinCore" do
   it "includes 'dc:'-prefixed semantic fields" do
     data = { 'id' => '123456', 'title_tsim' => ['654321'] }
     document = @mock_class.new(data)
-    expect(document.export_as_oai_dc_xml).to match  'xmlns:dc="http://purl.org/dc/elements/1.1/"'
-    expect(document.export_as_oai_dc_xml).to match  '<dc:title>654321</dc:title>'
+    expect(document.export_as_oai_dc_xml).to match 'xmlns:dc="http://purl.org/dc/elements/1.1/"'
+    expect(document.export_as_oai_dc_xml).to match '<dc:title>654321</dc:title>'
   end
 
   it "works with multi-value fields" do

data/spec/models/blacklight/facet_paginator_spec.rb

@@ -171,6 +171,6 @@ RSpec.describe Blacklight::FacetPaginator, :api do
     # this method is just for API compatability with kaminari 0.16.1
     subject { described_class.new([book], offset: 0, limit: nil).total_pages }
 
-    it { is_expected.to eq -1 }
+    it { is_expected.to eq(-1) }
   end
 end