blacklight 9.0.0 → 9.1.0

data/spec/features/advanced_search_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe "Blacklight Advanced Search Form" do
         expect(page).to have_css('.blacklight-language_ssim')
 
         within('.blacklight-language_ssim') do
-          expect(page).to have_content 'Language'
+          expect(page).to have_text 'Language'
         end
       end
 
@@ -53,15 +53,15 @@ RSpec.describe "Blacklight Advanced Search Form" do
     it 'scopes searches to fields' do
       fill_in 'Title', with: 'Medicine'
       click_on 'advanced-search-submit'
-      expect(page).to have_content 'Remove constraint Title: Medicine'
-      expect(page).to have_content 'Strong Medicine speaks'
+      expect(page).to have_text 'Remove constraint Title: Medicine'
+      expect(page).to have_text 'Strong Medicine speaks'
       expect(page).to have_css('article.document', count: 1)
     end
 
     it 'does not render spellcheck/did you mean? section' do
       fill_in 'All Fields', with: 'tibet'
       click_on 'advanced-search-submit'
-      expect(page).to have_content 'Remove constraint All Fields: tibet'
+      expect(page).to have_text 'Remove constraint All Fields: tibet'
       expect(page).to have_css('article.document', count: 2)
       expect(page).to have_no_css('#spell')
     end
@@ -73,16 +73,16 @@ RSpec.describe "Blacklight Advanced Search Form" do
         check 'Urdu 3'
       end
       click_on 'advanced-search-submit'
-      expect(page).to have_content 'Pākistānī ʻaurat dorāhe par'
-      expect(page).to have_no_content 'Ajikto kŭrŏk chŏrŏk sasimnikka : and 아직도　그럭　저럭　사십니까'
+      expect(page).to have_text 'Pākistānī ʻaurat dorāhe par'
+      expect(page).to have_no_text 'Ajikto kŭrŏk chŏrŏk sasimnikka : and 아직도　그럭　저럭　사십니까'
       expect(page).to have_css('article.document', count: 1)
     end
 
     it 'handles boolean queries' do
       fill_in 'All Fields', with: 'history NOT strong'
       click_on 'advanced-search-submit'
-      expect(page).to have_content('Ci an zhou bian')
-      expect(page).to have_no_content('Strong Medicine speaks')
+      expect(page).to have_text('Ci an zhou bian')
+      expect(page).to have_no_text('Strong Medicine speaks')
       expect(page).to have_css('article.document', count: 10)
     end
 
@@ -90,7 +90,7 @@ RSpec.describe "Blacklight Advanced Search Form" do
       fill_in 'All Fields', with: 'history'
       fill_in 'Author', with: 'hearth'
       click_on 'advanced-search-submit'
-      expect(page).to have_content('Strong Medicine speaks')
+      expect(page).to have_text('Strong Medicine speaks')
       expect(page).to have_css('article.document', count: 1)
     end
 
@@ -99,10 +99,23 @@ RSpec.describe "Blacklight Advanced Search Form" do
       fill_in 'All Fields', with: 'history'
       fill_in 'Subject', with: 'women'
       click_on 'advanced-search-submit'
-      expect(page).to have_content('Ci an zhou bian')
-      expect(page).to have_content('Pākistānī ʻaurat dorāhe par')
+      expect(page).to have_text('Ci an zhou bian')
+      expect(page).to have_text('Pākistānī ʻaurat dorāhe par')
       expect(page).to have_css('article.document', count: 10)
     end
+
+    it 'returns all records when no query is present' do
+      click_on 'advanced-search-submit'
+      expect(page).to have_text('1 - 10 of 30')
+    end
+
+    it 'performs a faceted search when query is present' do
+      within '#facet-language_ssim' do
+        check 'Urdu 3'
+      end
+      click_on 'advanced-search-submit'
+      expect(page).to have_css('article.document', count: 3)
+    end
   end
 
   describe "prepopulated advanced search form" do
@@ -135,8 +148,8 @@ RSpec.describe "Blacklight Advanced Search Form" do
     it "does not have multiple parameters for a search field" do
       fill_in 'Title', with: 'bread'
       click_on 'advanced-search-submit'
-      expect(page.current_url).to match(/bread/)
-      expect(page.current_url).not_to match(/medicine/)
+      expect(page.current_url).to include('bread')
+      expect(page.current_url).not_to include('medicine')
     end
 
     it "clears the prepopulated fields when the Start Over button is pressed" do
@@ -149,14 +162,14 @@ RSpec.describe "Blacklight Advanced Search Form" do
 
     it 'creates constraints for fields not included in advanced search form' do
       within('div.constraints') do
-        expect(page).to have_content('Format:Book')
+        expect(page).to have_text('Format:Book')
       end
     end
 
     it 'does not create constraints for fields included in the advanced search form' do
       within('div.constraints') do
-        expect(page).to have_no_content('Title:medicine')
-        expect(page).to have_no_content('Language:Tibetan')
+        expect(page).to have_no_text('Title:medicine')
+        expect(page).to have_no_text('Language:Tibetan')
       end
     end
   end

data/spec/features/alternate_controller_spec.rb

@@ -6,11 +6,11 @@ RSpec.describe "Alternate Controller Behaviors" do
     expect(page).to have_css("form[action='#{search_alternate_url}']")
     fill_in "q", with: "history"
     click_on 'search'
-    expect(current_path).to match /#{search_alternate_path}/
+    expect(current_path).to match(/#{search_alternate_path}/)
     within "#per_page-dropdown .dropdown-menu" do
       click_on '10 per page'
     end
-    expect(current_path).to match /#{search_alternate_path}/
+    expect(current_path).to match(/#{search_alternate_path}/)
   end
 
   it "has the correct search field form" do
@@ -18,9 +18,9 @@ RSpec.describe "Alternate Controller Behaviors" do
     expect(page).to have_css("form[action='#{search_alternate_url}']")
     fill_in "q", with: "history"
     click_on 'search'
-    expect(current_path).to match /#{search_alternate_path}/
+    expect(current_path).to match(/#{search_alternate_path}/)
     click_on 'relevance'
-    expect(current_path).to match /#{search_alternate_path}/
+    expect(current_path).to match(/#{search_alternate_path}/)
   end
 
   it "displays document thumbnails" do

data/spec/features/axe_spec.rb

@@ -1,33 +1,45 @@
 # frozen_string_literal: true
 
 RSpec.describe 'Accessibility testing', :js, api: false do
-  it 'validates the home page' do
-    visit root_path
-    expect(page).to be_axe_clean
-  end
+  %w[dark light].each do |theme|
+    context "with #{theme} theme" do
+      before do
+        visit root_path
+        find_by_id('bl-theme-switcher').click
+        find("[data-bs-theme-value='#{theme}']").click
+      end
 
-  it 'validates the catalog page' do
-    visit root_path
-    fill_in "q", with: 'history'
-    click_on 'search'
+      it 'validates the home page' do
+        visit root_path
+        expect(page).to be_axe_clean
+      end
 
-    expect(page).to be_axe_clean
+      it 'validates the catalog page' do
+        visit root_path
+        fill_in "q", with: 'history'
+        click_on 'search'
+        wait_for_turbo
 
-    within '.accordion-item.blacklight-language_ssim' do
-      click_on 'Language'
-      click_on "Tibetan"
-    end
+        expect(page).to be_axe_clean
 
-    expect(page).to be_axe_clean
-  end
+        within '.accordion-item.blacklight-language_ssim' do
+          click_on 'Language'
+          click_on "Tibetan"
+        end
+        wait_for_turbo
 
-  it 'validates the advanced search form' do
-    visit advanced_search_catalog_path
-    expect(page).to be_axe_clean
-  end
+        expect(page).to be_axe_clean
+      end
+
+      it 'validates the advanced search form' do
+        visit advanced_search_catalog_path
+        expect(page).to be_axe_clean
+      end
 
-  it 'validates the single results page' do
-    visit solr_document_path('2007020969')
-    expect(page).to be_axe_clean
+      it 'validates the single results page' do
+        visit solr_document_path('2007020969')
+        expect(page).to be_axe_clean
+      end
+    end
   end
 end

data/spec/features/bookmarks_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe "Bookmarks" do
       sign_in 'user1'
       visit root_path
       click_on 'Bookmarks'
-      expect(page).to have_content 'You have no bookmarks'
+      expect(page).to have_text 'You have no bookmarks'
     end
   end
 
@@ -20,8 +20,8 @@ RSpec.describe "Bookmarks" do
     click_on 'Bookmark'
     click_on 'Bookmarks'
     click_on 'Clear Bookmarks'
-    expect(page).to have_content 'Cleared your bookmarks.'
-    expect(page).to have_content 'You have no bookmarks'
+    expect(page).to have_text 'Cleared your bookmarks.'
+    expect(page).to have_text 'You have no bookmarks'
   end
 
   it "add and remove bookmarks from search results" do
@@ -30,11 +30,11 @@ RSpec.describe "Bookmarks" do
     fill_in "q", with: 'Sumadhvavijayaḥ'
     click_on 'search'
     click_on 'Bookmark'
-    expect(page).to have_content 'Successfully added bookmark.'
+    expect(page).to have_text 'Successfully added bookmark.'
     fill_in "q", with: 'Sumadhvavijayaḥ'
     click_on 'search'
     click_on 'Remove bookmark'
-    expect(page).to have_content 'Successfully removed bookmark.'
+    expect(page).to have_text 'Successfully removed bookmark.'
   end
 
   it "adds and delete bookmarks from the show page" do
@@ -42,7 +42,7 @@ RSpec.describe "Bookmarks" do
     visit solr_document_path('2007020969')
     click_on 'Bookmark'
     click_on 'Remove bookmark'
-    expect(page).to have_content 'Successfully removed bookmark.'
+    expect(page).to have_text 'Successfully removed bookmark.'
   end
 
   context 'when bookmark_icon_component is set to nil' do
@@ -72,7 +72,7 @@ RSpec.describe "Bookmarks" do
     sign_in 'user1'
     visit bookmarks_path
     expect(page).to have_button("Remove bookmark")
-    expect(page).to have_content("Strong Medicine speaks")
+    expect(page).to have_text("Strong Medicine speaks")
   end
 
   it "cites items in bookmarks" do
@@ -80,7 +80,7 @@ RSpec.describe "Bookmarks" do
     click_on 'Bookmark'
     click_on 'Bookmarks'
     click_on 'Cite'
-    expect(page).to have_content 'Strong Medicine speaks'
+    expect(page).to have_text 'Strong Medicine speaks'
   end
 
   it "cites all items in current bookmarks" do
@@ -91,12 +91,12 @@ RSpec.describe "Bookmarks" do
     click_on 'Bookmark'
 
     visit "/bookmarks?per_page=1"
-    expect(page).to have_content 'Strong Medicine speaks'
-    expect(page).to have_no_content 'Ci an zhou bian'
+    expect(page).to have_text 'Strong Medicine speaks'
+    expect(page).to have_no_text 'Ci an zhou bian'
 
     click_on 'Cite'
-    expect(page).to have_content 'Strong Medicine speaks'
-    expect(page).to have_content 'Ci an zhou bian'
+    expect(page).to have_text 'Strong Medicine speaks'
+    expect(page).to have_text 'Ci an zhou bian'
   end
 
   context "when the bookmark icon is configured (default)" do
@@ -126,7 +126,7 @@ RSpec.describe "Bookmarks" do
       expect(page).to have_no_css('#bookmarks_nav')
       find('.blacklight-icons-bookmark').click
 
-      expect(page).to have_content 'In Bookmarks'
+      expect(page).to have_text 'In Bookmarks'
 
       visit solr_document_path('2007020969')
       expect(find('.toggle-bookmark-input', visible: false)).to be_checked

data/spec/features/dark_mode_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+RSpec.describe 'Dark mode', :js do
+  it 'sets data-bs-theme="dark" on the html element when dark mode is selected' do
+    visit root_path
+
+    find_by_id('bl-theme-switcher').click
+    find('[data-bs-theme-value="dark"]').click
+
+    expect(page).to have_css('html[data-bs-theme="dark"]')
+  end
+
+  it 'sets data-bs-theme="light" on the html element when light mode is selected' do
+    visit root_path
+
+    find_by_id('bl-theme-switcher').click
+    find('[data-bs-theme-value="dark"]').click
+
+    find_by_id('bl-theme-switcher').click
+    find('[data-bs-theme-value="light"]').click
+
+    expect(page).to have_css('html[data-bs-theme="light"]')
+  end
+
+  context 'when dark mode support is disabled in the configuration' do
+    before do
+      allow(Blacklight::Configuration).to receive(:new).and_wrap_original do |m, *args|
+        config = m.call(*args)
+        config.dark_mode_support = false
+        config
+      end
+    end
+
+    it 'uses light mode and does not render the theme switcher' do
+      visit root_path
+
+      expect(page).to have_link('Login') # avoid negation right after visiting
+      expect(page).to have_no_css('html[data-bs-theme="dark"]')
+      expect(page).to have_no_css('#bl-theme-switcher')
+    end
+  end
+end

data/spec/features/did_you_mean_spec.rb

@@ -8,10 +8,10 @@ RSpec.describe "Did You Mean" do
       fill_in "q", with: 'politica'
       click_on 'search'
 
-      expect(page).to have_content("Did you mean")
+      expect(page).to have_text("Did you mean")
       click_on 'policy'
-      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
     end
   end
@@ -24,12 +24,12 @@ RSpec.describe "Did You Mean" do
       fill_in "q", with: 'yehudiyam'
       click_on 'search'
 
-      expect(page).to have_content("Did you mean")
+      expect(page).to have_text("Did you mean")
       click_on 'yehudiyim'
-      within ("#sortAndPerPage") do
-        expect(page).to have_content "1 entry found"
+      within("#sortAndPerPage") do
+        expect(page).to have_text "1 entry found"
       end
-      within ("select#search_field") do
+      within("select#search_field") do
         expect(page).to have_css("option[selected]", text: "Title")
       end
     end
@@ -43,12 +43,12 @@ RSpec.describe "Did You Mean" do
       fill_in "q", with: 'shirma'
       click_on 'search'
 
-      expect(page).to have_content("Did you mean")
+      expect(page).to have_text("Did you mean")
       click_on 'sharma'
-      within ("#sortAndPerPage") do
-        expect(page).to have_content "1 entry found"
+      within("#sortAndPerPage") do
+        expect(page).to have_text "1 entry found"
       end
-      within ("select#search_field") do
+      within("select#search_field") do
         expect(page).to have_css("option[selected]", text: "Author")
       end
     end
@@ -62,12 +62,12 @@ RSpec.describe "Did You Mean" do
       fill_in "q", with: 'wome'
       click_on 'search'
 
-      expect(page).to have_content("Did you mean")
+      expect(page).to have_text("Did you mean")
       click_on 'women'
-      within ("#sortAndPerPage") do
-        expect(page).to have_content "1 - 3 of 3"
+      within("#sortAndPerPage") do
+        expect(page).to have_text "1 - 3 of 3"
       end
-      within ("select#search_field") do
+      within("select#search_field") do
         expect(page).to have_css("option[selected]", text: "Subject")
       end
     end
@@ -78,7 +78,7 @@ RSpec.describe "Did You Mean" do
       fill_in "q", with: 'ooofda ooofda'
       click_on 'search'
 
-      expect(page).to have_no_content("Did you mean")
+      expect(page).to have_no_text("Did you mean")
     end
 
     it "has separate suggestions" do
@@ -86,15 +86,15 @@ RSpec.describe "Did You Mean" do
       click_on 'search'
 
       within(".suggest") do
-        expect(page).to have_content("Did you mean")
+        expect(page).to have_text("Did you mean")
         expect(page).to have_link('policy')
         expect(page).to have_link('bon')
         expect(page).to have_no_link('policy bon')
       end
 
       click_on 'bon'
-      within ("#sortAndPerPage") do
-        expect(page).to have_content "1 entry found"
+      within("#sortAndPerPage") do
+        expect(page).to have_text "1 entry found"
       end
     end
 
@@ -103,7 +103,7 @@ RSpec.describe "Did You Mean" do
       click_on 'search'
 
       within(".suggest") do
-        expect(page).to have_content("Did you mean")
+        expect(page).to have_text("Did you mean")
         expect(page).to have_link('bon', count: 1)
         expect(page).to have_no_link('bon bon')
       end
@@ -114,10 +114,10 @@ RSpec.describe "Did You Mean" do
     fill_in "q", with: 'ayaz'
     click_on 'search'
 
-    expect(page).to have_content("Did you mean")
+    expect(page).to have_text("Did you mean")
     click_on 'bya'
-    within ("#sortAndPerPage") do
-      expect(page).to have_content "1 - 3 of 3"
+    within("#sortAndPerPage") do
+      expect(page).to have_text "1 - 3 of 3"
     end
   end
 
@@ -125,7 +125,7 @@ RSpec.describe "Did You Mean" do
     # polit gives 5 results in 30 record demo index - 5 is default cutoff
     fill_in "q", with: 'polit'
     click_on 'search'
-    expect(page).to have_content("Did you mean")
+    expect(page).to have_text("Did you mean")
   end
 
   context 'spellcheck collations are enabled' do
@@ -141,10 +141,10 @@ RSpec.describe "Did You Mean" do
       fill_in "q", with: 'Yoshido Hajime'
       click_on 'search'
 
-      expect(page).to have_content("Did you mean")
+      expect(page).to have_text("Did you mean")
       click_on 'yoshida Hajime'
-      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
     end
   end

data/spec/features/facet_missing_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe "Facet missing" do
       end
 
       within "#sortAndPerPage" do
-        expect(page).to have_content "1 - 10 of 13"
+        expect(page).to have_text "1 - 10 of 13"
       end
 
       expect(page).to have_css(".constraint-value", text: "Region")
@@ -44,7 +44,7 @@ RSpec.describe "Facet missing" do
       end
 
       expect(page).to have_no_link "remove"
-      expect(page).to have_content("Welcome!")
+      expect(page).to have_text("Welcome!")
     end
   end
 
@@ -61,7 +61,7 @@ RSpec.describe "Facet missing" do
       end
 
       expect(page).to have_no_link "remove"
-      expect(page).to have_content("Welcome!")
+      expect(page).to have_text("Welcome!")
     end
   end
 end

data/spec/features/record_view_spec.rb

@@ -3,16 +3,16 @@
 RSpec.describe "Record View" do
   it "displays a normal record" do
     visit solr_document_path('2007020969')
-    expect(page).to have_content "Title:"
-    expect(page).to have_content "Strong Medicine speaks"
-    expect(page).to have_content "Subtitle:"
-    expect(page).to have_content "a Native American elder has her say : an oral history"
-    expect(page).to have_content "Author:"
-    expect(page).to have_content "Hearth, Amy Hill, 1958-"
-    expect(page).to have_content "Format:"
-    expect(page).to have_content "Book"
-    expect(page).to have_content "Call number:"
-    expect(page).to have_content "E99.D2 H437 2008"
+    expect(page).to have_text "Title:"
+    expect(page).to have_text "Strong Medicine speaks"
+    expect(page).to have_text "Subtitle:"
+    expect(page).to have_text "a Native American elder has her say : an oral history"
+    expect(page).to have_text "Author:"
+    expect(page).to have_text "Hearth, Amy Hill, 1958-"
+    expect(page).to have_text "Format:"
+    expect(page).to have_text "Book"
+    expect(page).to have_text "Call number:"
+    expect(page).to have_text "E99.D2 H437 2008"
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
     expect(page).to have_css("link[rel=alternate]")
@@ -21,13 +21,13 @@ RSpec.describe "Record View" do
 
   it "does not display blank titles" do
     visit solr_document_path('2008305903')
-    expect(page).to have_no_content "More Information:"
+    expect(page).to have_no_text "More Information:"
   end
 
   it "does not display vernacular records" do
     visit solr_document_path('2009373513')
-    expect(page).to have_content "次按驟變"
-    expect(page).to have_content "林行止"
-    expect(page).to have_content "臺北縣板橋市"
+    expect(page).to have_text "次按驟變"
+    expect(page).to have_text "林行止"
+    expect(page).to have_text "臺北縣板橋市"
   end
 end

data/spec/features/search_context_spec.rb

@@ -5,12 +5,12 @@ RSpec.describe "Search Results context" do
     search_for ''
     click_on 'Pluvial nectar of blessings'
     search_id = Search.last.id.to_s
-    expect(page).to have_content "« Previous | 10 of 30 | Next »"
+    expect(page).to have_text "« Previous | 10 of 30 | Next »"
     prev = page.find(".pagination-search-widgets .previous")
     expect(prev['data-context-href']).to eq "/catalog/2003546302/track?counter=9&document_id=2003546302&search_id=#{search_id}"
 
     click_on "« Previous"
-    expect(page).to have_content "U21.2 .W85 2003"
+    expect(page).to have_text "U21.2 .W85 2003"
 
     prev = page.find(".pagination-search-widgets .previous")
     expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&document_id=2004310986&search_id=#{search_id}"
@@ -19,8 +19,8 @@ RSpec.describe "Search Results context" do
   it "redirects context urls to the original url", :js do
     search_for ''
     first('.index_title a').click
-    expect(page).to have_content "« Previous | 1 of 30 | Next »"
-    expect(page.current_url).to have_no_content "/track"
+    expect(page).to have_text "« Previous | 1 of 30 | Next »"
+    expect(page.current_url).to have_no_text "/track"
   end
 
   it 'shows "Back to Search" and "Start Over links"' do
@@ -39,19 +39,19 @@ RSpec.describe "Search Results context" do
     # Go to the number 9 result separately
     visit '/catalog/2003546302'
     expect(page).to have_no_css '.page-links'
-    expect(page).to have_no_content "« Previous | 10 of 30 | Next »"
+    expect(page).to have_no_text "« Previous | 10 of 30 | Next »"
   end
 
   context "navigating between search results using context pagination" do
     it "updates the back to search link with the current search pagination context", :js do
       search_for ''
-      expect(page).to have_content "1 - 10"
+      expect(page).to have_text "1 - 10"
       find_all('.index_title a').last.click
       click_on "Next »"
 
-      expect(page).to have_content "Naqdī barā-yi tamām-i"
+      expect(page).to have_text "Naqdī barā-yi tamām-i"
       click_on "Back to Search"
-      expect(page).to have_content "11 - 20"
+      expect(page).to have_text "11 - 20"
     end
   end
 end