blacklight 6.14.0 → 7.0.0

data/spec/features/search_filters_spec.rb

@@ -1,34 +1,34 @@
 # frozen_string_literal: true
 
-describe "Facets" do
+RSpec.describe "Facets" do
   it "works without a search term" do
     visit root_path
-    within "#facet-language_facet" do
+    within "#facet-language_ssim" do
       click_link "Tibetan"
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "1 - 6 of 6"
     end
 
-    expect(page).to have_selector(".blacklight-language_facet")
-    expect(page).to have_selector(".blacklight-language_facet.facet_limit-active")
+    expect(page).to have_selector(".blacklight-language_ssim")
+    expect(page).to have_selector(".blacklight-language_ssim.facet-limit-active")
 
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "6")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "6")
     end
 
     click_link "India"
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 2 of 2"
     end
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "2")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "2")
     end
-    within "#facet-subject_geo_facet" do
-      expect(page).to have_selector("span.selected", :text => "India")
-      expect(page).to have_selector("span.facet-count.selected", :text => "2")
+    within "#facet-subject_geo_ssim" do
+      expect(page).to have_selector("span.selected", text: "India")
+      expect(page).to have_selector("span.facet-count.selected", text: "2")
     end
   end
 
@@ -37,18 +37,18 @@ describe "Facets" do
     fill_in "q", with: 'history'
     click_button 'search'
     within ("#sortAndPerPage") do
-      expect(page).to have_content "1 - 9 of 9"
+      expect(page).to have_content "1 - 10 of 11"
     end
 
-    within "#facet-language_facet" do
+    within "#facet-language_ssim" do
       click_link "Tibetan"
     end
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 2 of 2"
     end
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "2")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
       expect(page).to have_content "You searched for:"
@@ -60,29 +60,29 @@ describe "Facets" do
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 entry found"
     end
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "1")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "1")
     end
-    within(".blacklight-pub_date") do
-      expect(page).to have_selector("span.selected", :text => "2004")
-      expect(page).to have_selector("span.facet-count.selected", :text => "1")
+    within(".blacklight-pub_date_ssim") do
+      expect(page).to have_selector("span.selected", text: "2004")
+      expect(page).to have_selector("span.facet-count.selected", text: "1")
     end
   end
 
   it "allows removing filters" do
     visit root_path
-    within "#facet-language_facet" do
+    within "#facet-language_ssim" do
       click_link "Tibetan"
     end
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "6")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "6")
     end
-    within "#facet-language_facet" do
+    within "#facet-language_ssim" do
       click_link 'remove'
     end
-    expect(page).to_not have_link 'remove'
+    expect(page).not_to have_link 'remove'
     expect(page).to have_content('Welcome!')
   end
 
@@ -90,34 +90,34 @@ describe "Facets" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
-    within "#facet-language_facet" do
+    within "#facet-language_ssim" do
       click_link 'Tibetan'
     end
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "2")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "2")
     end
 
     click_link '2004'
 
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "1")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "1")
     end
-    within(".blacklight-pub_date") do
-      expect(page).to have_selector("span.selected", :text => "2004")
-      expect(page).to have_selector("span.facet-count.selected", :text => "1")
+    within(".blacklight-pub_date_ssim") do
+      expect(page).to have_selector("span.selected", text: "2004")
+      expect(page).to have_selector("span.facet-count.selected", text: "1")
     end
     fill_in "q", with: 'china'
     click_button 'search'
 
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "1")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "1")
     end
-    within(".blacklight-pub_date") do
-      expect(page).to have_selector("span.selected", :text => "2004")
-      expect(page).to have_selector("span.facet-count.selected", :text => "1")
+    within(".blacklight-pub_date_ssim") do
+      expect(page).to have_selector("span.selected", text: "2004")
+      expect(page).to have_selector("span.facet-count.selected", text: "1")
     end
   end
 
@@ -125,17 +125,17 @@ describe "Facets" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
-    within "#facet-language_facet" do
+    within "#facet-language_ssim" do
       click_link 'Tibetan'
     end
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "2")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "2")
     end
     click_link 'title'
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "2")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
       expect(page).to have_content "You searched for:"
@@ -147,62 +147,62 @@ describe "Facets" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
-    within "#facet-language_facet" do
+    within "#facet-language_ssim" do
       click_link 'Tibetan'
     end
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "2")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "2")
     end
     within '#per_page-dropdown' do
       click_link '20'
     end
-    within "#facet-language_facet" do
-      expect(page).to have_selector("span.selected", :text => "Tibetan")
-      expect(page).to have_selector("span.facet-count.selected", :text => "2")
+    within "#facet-language_ssim" do
+      expect(page).to have_selector("span.selected", text: "Tibetan")
+      expect(page).to have_selector("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
       expect(page).to have_content "You searched for:"
       expect(page).to have_content "history"
     end
   end
-  it "is collapsed when not selected", :js => true do
+  it "is collapsed when not selected", js: true do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
-    within(".blacklight-subject_topic_facet") do
-      expect(page).not_to have_selector(".panel-collapse", :visible => true)
+    within(".blacklight-subject_ssim") do
+      expect(page).not_to have_selector(".card-body", visible: true)
     end
   end
-  it "expands when the heading is clicked", :js => true do
+  it "expands when the heading is clicked", js: true do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
-    within(".blacklight-subject_topic_facet") do
-      expect(page).not_to have_selector(".panel-collapse", :visible => true)
-      find(".panel-heading").click
-      expect(page).to     have_selector(".panel-collapse", :visible => true)
+    within(".blacklight-subject_ssim") do
+      expect(page).not_to have_selector(".card-body", visible: true)
+      find(".card-header").click
+      expect(page).to     have_selector(".card-body", visible: true)
     end
   end
-  it "expands when the anchor is clicked", :js => true do
+  it "expands when the anchor is clicked", js: true do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
-    within(".blacklight-subject_topic_facet") do
-      expect(page).not_to have_selector(".panel-collapse", :visible => true)
-      find(".panel-heading").click
-      expect(page).to     have_selector(".panel-collapse", :visible => true)
+    within(".blacklight-subject_ssim") do
+      expect(page).not_to have_selector(".card-body", visible: true)
+      find(".card-header").click
+      expect(page).to have_selector(".card-body", visible: true)
     end
   end
-  it "keeps selected facets expanded on page load", :js => true do
+  it "keeps selected facets expanded on page load", js: true do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
-    within(".blacklight-subject_topic_facet") do
-      find(".panel-heading").click
-      expect(page).to have_selector(".panel-collapse", :visible => true)
+    within(".blacklight-subject_ssim") do
+      click_link "Topic"
+      expect(page).to have_selector(".panel-collapse", visible: true)
     end
-    within(".blacklight-subject_topic_facet") do
+    within(".blacklight-subject_ssim") do
       click_link "Japanese drama"
     end
-    within(".blacklight-subject_topic_facet") do
-      expect(page).to have_selector(".panel-collapse", :visible => true)
+    within(".blacklight-subject_ssim") do
+      expect(page).to have_selector(".panel-collapse", visible: true)
     end
   end
 end

data/spec/features/search_formats_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search Formats" do
+RSpec.describe "Search Formats" do
   it "has an RSS XML response" do
     visit "/catalog.rss?q="
     expect(page).to have_content "Blacklight Search Results"

data/spec/features/search_history_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search History Page" do
+RSpec.describe "Search History Page" do
   describe "navigating from the homepage" do
     it "has a link to the history page" do
       visit root_path
@@ -17,10 +17,11 @@ describe "Search History Page" do
       click_button 'search'
       click_link 'History'
     end
+
     it "shows searches" do
       expect(page).to have_content 'Your recent searches'
       expect(page).to have_content 'book'
-      expect(page).to_not have_content 'dang'
+      expect(page).not_to have_content 'dang'
       visit root_path
       fill_in "q", with: 'dang'
       click_button 'search'
@@ -39,37 +40,13 @@ describe "Search History Page" do
       click_button 'search'
       click_link 'History'
     end
+
     it "is able to clear the history" do
       click_link "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_not have_content 'book'
-      expect(page).to_not have_content 'dang'
-    end
-  end
-
-  describe "when logged in" do
-    before do
-      sign_in 'user1'
-      fill_in "q", with: 'book'
-      click_button 'search'
-      click_link 'History'
-    end
-
-    it "saves and forget the search" do
-      click_button 'save'
-      expect(page).to have_content 'Successfully saved your search.'
-      click_button 'forget'
-      expect(page).to have_content 'Successfully removed that saved search.'
-      expect(page).to have_button 'save'
-    end
-
-    it "does not show results after logging out" do
-      click_button 'save'
-      expect(page).to have_content 'Successfully saved your search.'
-      click_link 'Log Out'
-      click_link 'History'
-      expect(page).to_not have_content 'book'
+      expect(page).not_to have_content 'book'
+      expect(page).not_to have_content 'dang'
     end
   end
 end

data/spec/features/search_pagination_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search Pagination" do
+RSpec.describe "Search Pagination" do
   it "has results with pagination" do
     visit root_path
     fill_in "q", with: ''
@@ -13,7 +13,6 @@ describe "Search Pagination" do
         expect(page).to have_link('50')
         expect(page).to have_link('100')
       end
-
     end
     within '#sortAndPerPage' do
       click_link "Next »"
@@ -46,14 +45,17 @@ describe "Search Pagination" do
   describe "when the application is configured for other per page values" do
     let!(:original_per_page) { CatalogController.blacklight_config[:per_page] }
     let!(:original_rows) { CatalogController.blacklight_config[:default_solr_params][:rows] }
+
     before do
       CatalogController.blacklight_config[:per_page] = [15, 30]
       CatalogController.blacklight_config[:default_solr_params][:rows] = 15
     end
+
     after do
       CatalogController.blacklight_config[:per_page] = original_per_page
       CatalogController.blacklight_config[:default_solr_params][:rows] = original_rows
     end
+
     it "uses the configured values" do
       visit root_path
       fill_in "q", with: ''

data/spec/features/search_results_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-describe "Search Results" do
+RSpec.describe "Search Results" do
   it "has for an empty query" do
     search_for ''
     expect(number_of_results_from_page(page)).to eq 30
-    expect(page).to have_xpath("//a[contains(@href, #{2007020969})]")
+    expect(page).to have_xpath("//a[contains(@href, 2007020969)]")
     search_for 'korea'
     expect(number_of_results_from_page(page)).to eq 4
   end
@@ -12,7 +12,7 @@ describe "Search Results" do
   it "finds same result set with or without diacritcs" do
     search_for 'inmul'
     expect(number_of_results_from_page(page)).to eq 1
-    expect(page).to have_xpath("//a[contains(@href, #{77826928})]")
+    expect(page).to have_xpath("//a[contains(@href, 77826928)]")
 
     search_for 'inmül'
     expect(number_of_results_from_page(page)).to eq 1
@@ -20,7 +20,7 @@ describe "Search Results" do
   it "finds same result set for a case-insensitive query" do
     search_for 'inmul'
     expect(number_of_results_from_page(page)).to eq 1
-    expect(page).to have_xpath("//a[contains(@href, #{77826928})]")
+    expect(page).to have_xpath("//a[contains(@href, 77826928)]")
 
     search_for 'INMUL'
     expect(number_of_results_from_page(page)).to eq 1
@@ -29,8 +29,7 @@ describe "Search Results" do
   it "orders by relevancy" do
     search_for "Korea"
     expect(position_in_result_page(page, '77826928')).to eq 1
-    expect(position_in_result_page(page, '94120425')).to eq 2
-    
+    expect(position_in_result_page(page, '94120425')).to eq 4
   end
 
   it "has an opensearch description document" do
@@ -55,11 +54,10 @@ describe "Search Results" do
     expect(page).to have_content "No results found for your search"
     expect(page).to have_content "you searched by Author"
     click_on "try searching everything"
-    expect(page).to have_xpath("//a[contains(@href, #{77826928})]")
+    expect(page).to have_xpath("//a[contains(@href, 77826928)]")
   end
 end
 
-
 def search_for q
   visit root_path
   fill_in "q", with: q
@@ -69,14 +67,14 @@ end
 def position_in_result_page(page, id)
   i = -1
   page.all(".index_title a").each_with_index do |link, idx|
-    i = (idx+1) if link['href'] =~ Regexp.new(Regexp.escape(id) + "$")
+    i = (idx + 1) if link['href'] =~ Regexp.new(Regexp.escape(id) + "$")
   end
   i.to_i
 end
-        
+
 def number_of_results_for_query(query)
   visit root_path
-  fill_in "q", :with => query
+  fill_in "q", with: query
   click_button "search"
   get_number_of_results_from_page(page)
 end
@@ -84,7 +82,11 @@ end
 def number_of_results_from_page(page)
   tmp_value = Capybara.ignore_hidden_elements
   Capybara.ignore_hidden_elements = false
-  val = page.find("meta[name=totalResults]")['content'].to_i rescue 0
+  val = begin
+          page.find("meta[name=totalResults]")['content'].to_i
+        rescue StandardError
+          0
+        end
   Capybara.ignore_hidden_elements = tmp_value
   val
 end

data/spec/features/search_sort_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-describe "Search Sort" do
+RSpec.describe "Search Sort" do
   it "sorts on facet results with no search terms" do
     visit root_path
-    within "#facet-language_facet" do
+    within "#facet-language_ssim" do
       click_link 'English'
     end
     expect(page).to have_content 'Sort by relevance'

data/spec/features/search_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search Page" do
+RSpec.describe "Search Page" do
   it "shows welcome" do
     visit root_path
     expect(page).to have_selector("input#q")
@@ -11,8 +11,8 @@ describe "Search Page" do
       expect(page).to have_selector('option', text: 'Subject')
     end
     expect(page).to have_selector("button[type='submit'] .submit-search-text")
-    expect(page).to_not have_selector("#startOverLink")
-   
+    expect(page).not_to have_link "Start Over"
+
     expect(page).to have_content "Welcome!"
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
@@ -25,7 +25,7 @@ describe "Search Page" do
     fill_in "q", with: 'history'
     select 'All Fields', from: 'search_field'
     click_button 'search'
-   
+
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
     expect(page).to have_selector("link[rel=alternate][type='application/rss+xml']")
@@ -49,7 +49,7 @@ describe "Search Page" do
 
     within ("#sortAndPerPage") do
       expect(page).to have_content "Sort by"
-      expect(page).to have_content "1 - 9 of 9"
+      expect(page).to have_content "1 - 10 of 11"
       within '#sort-dropdown' do
         expect(page).to have_link('relevance')
         expect(page).to have_link('year')
@@ -58,7 +58,7 @@ describe "Search Page" do
       end
     end
     within "#documents" do
-      expect(page).to have_selector(".document", count: 9)
+      expect(page).to have_selector(".document", count: 10)
     end
   end
 
@@ -108,12 +108,11 @@ describe "Search Page" do
     click_link "Start Over"
 
     expect(page).to have_content "Welcome!"
-    expect(page).to_not have_selector "#q[value='history']"
+    expect(page).not_to have_selector "#q[value='history']"
   end
 
   it "handles searches with invalid facet parameters" do
-    visit root_path f: { missing_s: [1]}
+    visit root_path f: { missing_s: [1] }
     expect(page).to have_content "No results found for your search"
   end
 end
-

data/spec/features/sitelinks_search_box.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-feature 'Sitelinks search box' do
-  scenario 'is home page' do
+describe 'Sitelinks search box' do
+  it 'is home page' do
     visit root_path
     expect(page).to have_css 'script[type="application/ld+json"]'
   end
-  scenario 'on search page' do
+  it 'on search page' do
     visit search_catalog_path q: 'book'
-    expect(page).to_not have_css 'script[type="application/ld+json"]'
+    expect(page).not_to have_css 'script[type="application/ld+json"]'
   end
 end