blacklight 8.2.2 → 8.4.0

data/spec/features/did_you_mean_spec.rb

@@ -6,10 +6,10 @@ RSpec.describe "Did You Mean" do
   describe "searching all fields" do
     it "has suggestions" do
       fill_in "q", with: 'politica'
-      click_button 'search'
+      click_on 'search'
 
       expect(page).to have_content("Did you mean")
-      click_link 'policy'
+      click_on 'policy'
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 - 2 of 2"
       end
@@ -22,15 +22,15 @@ RSpec.describe "Did You Mean" do
     it "has suggestions" do
       # yehudiyam is one letter away from a title word
       fill_in "q", with: 'yehudiyam'
-      click_button 'search'
+      click_on 'search'
 
       expect(page).to have_content("Did you mean")
-      click_link 'yehudiyim'
+      click_on 'yehudiyim'
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 entry found"
       end
       within ("select#search_field") do
-        expect(page).to have_selector("option[selected]", text: "Title")
+        expect(page).to have_css("option[selected]", text: "Title")
       end
     end
   end
@@ -41,15 +41,15 @@ RSpec.describe "Did You Mean" do
     it "has suggestions" do
       # shirma is one letter away from an author word
       fill_in "q", with: 'shirma'
-      click_button 'search'
+      click_on 'search'
 
       expect(page).to have_content("Did you mean")
-      click_link 'sharma'
+      click_on 'sharma'
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 entry found"
       end
       within ("select#search_field") do
-        expect(page).to have_selector("option[selected]", text: "Author")
+        expect(page).to have_css("option[selected]", text: "Author")
       end
     end
   end
@@ -60,15 +60,15 @@ RSpec.describe "Did You Mean" do
     it "has suggestions" do
       # wome is one letter away from an author word
       fill_in "q", with: 'wome'
-      click_button 'search'
+      click_on 'search'
 
       expect(page).to have_content("Did you mean")
-      click_link 'women'
+      click_on 'women'
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 - 3 of 3"
       end
       within ("select#search_field") do
-        expect(page).to have_selector("option[selected]", text: "Subject")
+        expect(page).to have_css("option[selected]", text: "Subject")
       end
     end
   end
@@ -76,23 +76,23 @@ RSpec.describe "Did You Mean" do
   describe "a multiword query" do
     it "does not have suggestions if there are no matches" do
       fill_in "q", with: 'ooofda ooofda'
-      click_button 'search'
+      click_on 'search'
 
-      expect(page).not_to have_content("Did you mean")
+      expect(page).to have_no_content("Did you mean")
     end
 
     it "has separate suggestions" do
       fill_in "q", with: 'politica boo'
-      click_button 'search'
+      click_on 'search'
 
       within(".suggest") do
         expect(page).to have_content("Did you mean")
         expect(page).to have_link('policy')
         expect(page).to have_link('bon')
-        expect(page).not_to have_link('policy bon')
+        expect(page).to have_no_link('policy bon')
       end
 
-      click_link 'bon'
+      click_on 'bon'
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 entry found"
       end
@@ -100,22 +100,22 @@ RSpec.describe "Did You Mean" do
 
     it "ignores repeated terms" do
       fill_in "q", with: 'boo boo'
-      click_button 'search'
+      click_on 'search'
 
       within(".suggest") do
         expect(page).to have_content("Did you mean")
         expect(page).to have_link('bon', count: 1)
-        expect(page).not_to have_link('bon bon')
+        expect(page).to have_no_link('bon bon')
       end
     end
   end
 
   it "shows suggestions if there aren't many hits" do
     fill_in "q", with: 'ayaz'
-    click_button 'search'
+    click_on 'search'
 
     expect(page).to have_content("Did you mean")
-    click_link 'bya'
+    click_on 'bya'
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 3 of 3"
     end
@@ -124,7 +124,7 @@ RSpec.describe "Did You Mean" do
   it "shows suggestions if at the threshold number" do
     # polit gives 5 results in 30 record demo index - 5 is default cutoff
     fill_in "q", with: 'polit'
-    click_button 'search'
+    click_on 'search'
     expect(page).to have_content("Did you mean")
   end
 
@@ -139,10 +139,10 @@ RSpec.describe "Did You Mean" do
 
     it "shows suggestions if there aren't many hits" do
       fill_in "q", with: 'Yoshido Hajime'
-      click_button 'search'
+      click_on 'search'
 
       expect(page).to have_content("Did you mean")
-      click_link 'yoshida Hajime'
+      click_on 'yoshida Hajime'
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 - 2 of 2"
       end

data/spec/features/facet_missing_spec.rb

@@ -14,12 +14,12 @@ RSpec.describe "Facet missing" do
       visit root_path
 
       within "#facet-subject_geo_ssim" do
-        click_link "[Missing]"
+        click_on "[Missing]"
       end
 
       within "#facet-subject_geo_ssim" do
-        expect(page).to have_selector("span.selected", text: "[Missing")
-        expect(page).to have_selector("span.facet-count.selected", text: "13")
+        expect(page).to have_css("span.selected", text: "[Missing")
+        expect(page).to have_css("span.facet-count.selected", text: "13")
       end
 
       within "#sortAndPerPage" do
@@ -36,14 +36,14 @@ RSpec.describe "Facet missing" do
       visit root_path
 
       within "#facet-subject_geo_ssim" do
-        click_link "[Missing]"
+        click_on "[Missing]"
       end
 
       within "#facet-subject_geo_ssim" do
-        click_link "remove"
+        click_on "remove"
       end
 
-      expect(page).not_to have_link "remove"
+      expect(page).to have_no_link "remove"
       expect(page).to have_content("Welcome!")
     end
   end
@@ -53,14 +53,14 @@ RSpec.describe "Facet missing" do
       visit root_path
 
       within "#facet-subject_geo_ssim" do
-        click_link "[Missing]"
+        click_on "[Missing]"
       end
 
       within ".filter-subject_geo_ssim" do
-        click_link "Remove constraint Region: [Missing]"
+        click_on "Remove constraint Region: [Missing]"
       end
 
-      expect(page).not_to have_link "remove"
+      expect(page).to have_no_link "remove"
       expect(page).to have_content("Welcome!")
     end
   end

data/spec/features/facets_spec.rb

@@ -3,31 +3,31 @@
 RSpec.describe "Facets" do
   it "shows a single facet's values" do
     visit facet_catalog_path("language_ssim")
-    expect(page).to have_selector ".modal-title", text: "Language"
-    expect(page).to have_selector ".facet-select", text: "Tibetan"
+    expect(page).to have_css ".modal-title", text: "Language"
+    expect(page).to have_css ".facet-select", text: "Tibetan"
   end
 
   it "paginates through a facet's values" do
     visit facet_catalog_path("subject_ssim")
-    expect(page).to have_selector '.facet-values li:first', text: "Japanese drama"
+    expect(page).to have_css '.facet-values li:first', text: "Japanese drama"
     expect(page).to have_link "A-Z Sort"
-    expect(page).to have_selector '.sort-options .active', text: "Numerical Sort"
+    expect(page).to have_css '.sort-options .active', text: "Numerical Sort"
     within ".modal-footer" do
       click_on "Next »"
     end
-    expect(page).to have_selector '.facet-values li:first', text: "Jewish law"
+    expect(page).to have_css '.facet-values li:first', text: "Jewish law"
     expect(page).to have_link "« Previous"
   end
 
   it "is able to change the facet sort" do
     visit facet_catalog_path("subject_ssim")
-    expect(page).to have_selector '.facet-values li:first', text: "Japanese drama"
+    expect(page).to have_css '.facet-values li:first', text: "Japanese drama"
     within ".modal-footer" do
       click_on "A-Z Sort"
     end
-    expect(page).to have_selector '.facet-values li:first', text: "Accident insurance"
+    expect(page).to have_css '.facet-values li:first', text: "Accident insurance"
     expect(page).to have_link "Numerical Sort"
-    expect(page).to have_selector '.sort-options .active', text: "A-Z Sort"
+    expect(page).to have_css '.sort-options .active', text: "A-Z Sort"
   end
 
   it "is able to sort more facet window by letter" do
@@ -35,44 +35,44 @@ RSpec.describe "Facets" do
     within ".modal-footer" do
       click_on "A-Z Sort"
     end
-    expect(page).to have_selector '.facet-values li:first', text: "Accident insurance"
+    expect(page).to have_css '.facet-values li:first', text: "Accident insurance"
     expect(page).to have_css '.facet-values li', count: 20
     click_on 'B'
-    expect(page).to have_selector '.facet-values li:first', text: "Buddhism"
+    expect(page).to have_css '.facet-values li:first', text: "Buddhism"
     expect(page).to have_css '.facet-values li', count: 1
     click_on 'T'
-    expect(page).to have_selector '.facet-values li:first', text: "Teaching"
+    expect(page).to have_css '.facet-values li:first', text: "Teaching"
     expect(page).to have_css '.facet-values li', count: 4
     click_on 'All'
-    expect(page).to have_selector '.facet-values li:first', text: "Accident insurance"
+    expect(page).to have_css '.facet-values li:first', text: "Accident insurance"
     expect(page).to have_css '.facet-values li', count: 20
     find(:css, ".facet-pagination.bottom").click_on "Numerical Sort"
-    expect(page).to have_selector '.facet-values li:first', text: "Japanese drama"
+    expect(page).to have_css '.facet-values li:first', text: "Japanese drama"
     expect(page).to have_css '.facet-values li', count: 20
   end
 
-  it 'is able to expand facets when javascript is enabled', js: true do
+  it 'is able to expand facets when javascript is enabled', :js do
     visit root_path
 
     expect(page).to have_css('#facet-format', visible: false)
 
-    page.find('h3.facet-field-heading button', text: 'Format').click
+    click_on 'Format'
 
     sleep(1) # let facet animation finish and wait for it to potentially re-collapse
 
     expect(page).to have_css('#facet-format', visible: true) # assert that it didn't re-collapse
   end
 
-  it 'is able to expand pivot facets when javascript is enabled', js: true do
+  it 'is able to expand pivot facets when javascript is enabled', :js do
     visit root_path
 
-    page.find('h3.facet-field-heading button', text: 'Pivot Field').click
+    click_on 'Pivot Field'
 
     within '#facet-example_pivot_field' do
       expect(page).to have_css('.facet-leaf-node', text: "Book 30", normalize_ws: true)
-      expect(page).not_to have_css('.facet-select', text: 'Tibetan')
+      expect(page).to have_no_css('.facet-select', text: 'Tibetan')
       page.find('.facet-toggle-handle').click
-      click_link 'Tibetan'
+      click_on 'Tibetan'
     end
 
     expect(page).to have_css('.constraint-value', text: 'Format Book')
@@ -83,7 +83,8 @@ RSpec.describe "Facets" do
     it 'changes to the button on button click in Firefox' do
       pending 'Capybara::NotSupportedByDriverError: Capybara::Driver::Base#evaluate_script'
       visit root_path
-      page.find('h3.facet-field-heading button', text: 'Format').click
+      click_on 'Format'
+
       focused_element_data_target = page.evaluate_script("document.activeElement")['data-bs-target']
       expect(focused_element_data_target).to eq '#facet-format'
     end

data/spec/features/modal_spec.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.describe 'Modal' do
-  it 'can open and dismiss the email modal', js: true do
+  it 'can open and dismiss the email modal', :js do
     visit solr_document_path('2007020969')
     expect(page).to have_no_selector 'dialog#blacklight-modal'
-    click_link 'Email'
-    expect(page).to have_selector 'dialog#blacklight-modal'
-    click_button '×'
+    click_on 'Email'
+    expect(page).to have_css 'dialog#blacklight-modal'
+    click_on '×'
     expect(page).to have_no_selector 'dialog#blacklight-modal'
   end
 end

data/spec/features/record_view_spec.rb

@@ -15,13 +15,13 @@ RSpec.describe "Record View" do
     expect(page).to have_content "E99.D2 H437 2008"
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
-    expect(page).to have_selector("link[rel=alternate]")
+    expect(page).to have_css("link[rel=alternate]")
     Capybara.ignore_hidden_elements = tmp_value
   end
 
   it "does not display blank titles" do
     visit solr_document_path('2008305903')
-    expect(page).not_to have_content "More Information:"
+    expect(page).to have_no_content "More Information:"
   end
 
   it "does not display vernacular records" do

data/spec/features/search_context_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe "Search Results context" do
-  it "passes the current search id through", js: true do
+  it "passes the current search id through", :js do
     search_for ''
     click_on 'Pluvial nectar of blessings'
     search_id = Search.last.id.to_s
@@ -16,11 +16,11 @@ RSpec.describe "Search Results context" do
     expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&document_id=2004310986&search_id=#{search_id}"
   end
 
-  it "redirects context urls to the original url", js: true 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).not_to have_content "/track"
+    expect(page.current_url).to have_no_content "/track"
   end
 
   it 'shows "Back to Search" and "Start Over links"' do
@@ -38,12 +38,12 @@ RSpec.describe "Search Results context" do
 
     # Go to the number 9 result separately
     visit '/catalog/2003546302'
-    expect(page).not_to have_selector '.page-links'
-    expect(page).not_to have_content "« Previous | 10 of 30 | Next »"
+    expect(page).to have_no_css '.page-links'
+    expect(page).to have_no_content "« 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: true 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"
       find_all('.index_title a').last.click

data/spec/features/search_crawler_spec.rb

@@ -2,27 +2,27 @@
 
 RSpec.describe "Search History Page" do
   describe "crawler search" do
-    let(:original_proc) { ::CatalogController.blacklight_config.crawler_detector }
+    let(:original_proc) { CatalogController.blacklight_config.crawler_detector }
 
     before do
-      ::CatalogController.blacklight_config.crawler_detector = ->(req) { req.env['HTTP_USER_AGENT'] =~ /Googlebot/ }
+      CatalogController.blacklight_config.crawler_detector = ->(req) { req.env['HTTP_USER_AGENT'] =~ /Googlebot/ }
     end
 
     after do
-      ::CatalogController.blacklight_config.crawler_detector = original_proc
+      CatalogController.blacklight_config.crawler_detector = original_proc
     end
 
     it "remembers human searches" do
       visit root_path
       fill_in "q", with: 'chicken'
-      expect { click_button 'search' }.to change(Search, :count).by(1)
+      expect { click_on 'search' }.to change(Search, :count).by(1)
     end
 
     it "doesn't remember bot searches" do
       page.driver.header('User-Agent', 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)')
       visit root_path
       fill_in "q", with: 'chicken'
-      expect { click_button 'search' }.not_to change(Search, :count)
+      expect { click_on 'search' }.not_to change(Search, :count)
     end
   end
 end