blacklight 8.2.2 → 8.4.0

data/spec/features/search_filters_spec.rb

@@ -4,138 +4,138 @@ RSpec.describe "Facets" do
   it "works without a search term" do
     visit root_path
     within "#facet-language_ssim" do
-      click_link "Tibetan"
+      click_on "Tibetan"
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "1 - 6 of 6"
     end
 
-    expect(page).to have_selector(".blacklight-language_ssim")
-    expect(page).to have_selector(".blacklight-language_ssim.facet-limit-active")
+    expect(page).to have_css(".blacklight-language_ssim")
+    expect(page).to have_css(".blacklight-language_ssim.facet-limit-active")
 
     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")
+      expect(page).to have_css("span.selected", text: "Tibetan")
+      expect(page).to have_css("span.facet-count.selected", text: "6")
     end
 
-    click_link "India"
+    click_on "India"
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 2 of 2"
     end
     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")
+      expect(page).to have_css("span.selected", text: "Tibetan")
+      expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     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")
+      expect(page).to have_css("span.selected", text: "India")
+      expect(page).to have_css("span.facet-count.selected", text: "2")
     end
   end
 
   it "works in conjunction with a search term" do
     visit root_path
     fill_in "q", with: 'history'
-    click_button 'search'
+    click_on 'search'
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 10 of 11"
     end
 
     within "#facet-language_ssim" do
-      click_link "Tibetan"
+      click_on "Tibetan"
     end
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 2 of 2"
     end
     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")
+      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 "You searched for:"
       expect(page).to have_content "history"
     end
 
-    click_link "2004"
+    click_on "2004"
 
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 entry found"
     end
     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")
+      expect(page).to have_css("span.selected", text: "Tibetan")
+      expect(page).to have_css("span.facet-count.selected", text: "1")
     end
     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")
+      expect(page).to have_css("span.selected", text: "2004")
+      expect(page).to have_css("span.facet-count.selected", text: "1")
     end
   end
 
   it "allows removing filters" do
     visit root_path
     within "#facet-language_ssim" do
-      click_link "Tibetan"
+      click_on "Tibetan"
     end
     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")
+      expect(page).to have_css("span.selected", text: "Tibetan")
+      expect(page).to have_css("span.facet-count.selected", text: "6")
     end
     within "#facet-language_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
 
   it "retains filters when you change the search term" do
     visit root_path
     fill_in "q", with: 'history'
-    click_button 'search'
+    click_on 'search'
     within "#facet-language_ssim" do
-      click_link 'Tibetan'
+      click_on 'Tibetan'
     end
     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")
+      expect(page).to have_css("span.selected", text: "Tibetan")
+      expect(page).to have_css("span.facet-count.selected", text: "2")
     end
 
-    click_link '2004'
+    click_on '2004'
 
     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")
+      expect(page).to have_css("span.selected", text: "Tibetan")
+      expect(page).to have_css("span.facet-count.selected", text: "1")
     end
     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")
+      expect(page).to have_css("span.selected", text: "2004")
+      expect(page).to have_css("span.facet-count.selected", text: "1")
     end
     fill_in "q", with: 'china'
-    click_button 'search'
+    click_on 'search'
 
     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")
+      expect(page).to have_css("span.selected", text: "Tibetan")
+      expect(page).to have_css("span.facet-count.selected", text: "1")
     end
     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")
+      expect(page).to have_css("span.selected", text: "2004")
+      expect(page).to have_css("span.facet-count.selected", text: "1")
     end
   end
 
   it "retains the filters when we change sort" do
     visit root_path
     fill_in "q", with: 'history'
-    click_button 'search'
+    click_on 'search'
     within "#facet-language_ssim" do
-      click_link 'Tibetan'
+      click_on 'Tibetan'
     end
     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")
+      expect(page).to have_css("span.selected", text: "Tibetan")
+      expect(page).to have_css("span.facet-count.selected", text: "2")
     end
-    click_link 'title'
+    click_on 'title'
     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")
+      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 "You searched for:"
@@ -146,20 +146,20 @@ RSpec.describe "Facets" do
   it "retains the filters when we change per page number" do
     visit root_path
     fill_in "q", with: 'history'
-    click_button 'search'
+    click_on 'search'
     within "#facet-language_ssim" do
-      click_link 'Tibetan'
+      click_on 'Tibetan'
     end
     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")
+      expect(page).to have_css("span.selected", text: "Tibetan")
+      expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within '#per_page-dropdown' do
-      click_link '20'
+      click_on '20'
     end
     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")
+      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 "You searched for:"
@@ -167,46 +167,46 @@ RSpec.describe "Facets" do
     end
   end
 
-  it "is collapsed when not selected", js: true do
+  it "is collapsed when not selected", :js do
     visit root_path
 
     within(".blacklight-subject_ssim") do
-      expect(page).not_to have_selector(".card-body", visible: true)
+      expect(page).to have_no_css(".card-body", visible: true)
     end
   end
 
-  it "expands when the heading button is clicked", js: true do
+  it "expands when the heading button is clicked", :js do
     visit root_path
 
     within(".blacklight-subject_ssim") do
-      expect(page).not_to have_selector(".card-body", visible: true)
-      find(".card-header button").click
-      expect(page).to have_selector(".card-body", visible: true)
+      expect(page).to have_no_css(".card-body", visible: true)
+      click_on 'Topic'
+      expect(page).to have_css(".card-body", visible: true)
     end
   end
 
-  it "expands when the button is clicked", js: true do
+  it "expands when the button is clicked", :js do
     visit root_path
 
     within(".blacklight-subject_ssim") do
-      expect(page).not_to have_selector(".card-body", visible: true)
+      expect(page).to have_no_css(".card-body", visible: true)
       find(".card-header").click
-      expect(page).to have_selector(".card-body", visible: true)
+      expect(page).to have_css(".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 do
     visit root_path
 
     within(".blacklight-subject_ssim") do
       page.find('h3.facet-field-heading', text: 'Topic').click
-      expect(page).to have_selector(".panel-collapse", visible: true)
+      expect(page).to have_css(".panel-collapse", visible: true)
     end
     within(".blacklight-subject_ssim") do
-      click_link "Japanese drama"
+      click_on "Japanese drama"
     end
     within(".blacklight-subject_ssim") do
-      expect(page).to have_selector(".panel-collapse", visible: true)
+      expect(page).to have_css(".panel-collapse", visible: true)
     end
   end
 end

data/spec/features/search_history_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe "Search History Page" do
   describe "navigating from the homepage" do
     it "has a link to the history page" do
       visit root_path
-      click_link 'History'
+      click_on 'History'
       expect(page).to have_content 'Search History'
       expect(page).to have_content 'You have no search history'
     end
@@ -14,18 +14,18 @@ RSpec.describe "Search History Page" do
     before do
       visit root_path
       fill_in "q", with: 'book'
-      click_button 'search'
-      click_link 'History'
+      click_on 'search'
+      click_on 'History'
     end
 
     it "shows searches" do
       expect(page).to have_content 'Your recent searches'
       expect(page).to have_content 'book'
-      expect(page).not_to have_content 'dang'
+      expect(page).to have_no_content 'dang'
       visit root_path
       fill_in "q", with: 'dang'
-      click_button 'search'
-      click_link 'History'
+      click_on 'search'
+      click_on 'History'
       expect(page).to have_content 'book'
       expect(page).to have_content 'dang'
     end
@@ -35,18 +35,18 @@ RSpec.describe "Search History Page" do
     before do
       visit root_path
       fill_in "q", with: 'book'
-      click_button 'search'
+      click_on 'search'
       fill_in "q", with: 'dang'
-      click_button 'search'
-      click_link 'History'
+      click_on 'search'
+      click_on 'History'
     end
 
     it "is able to clear the history" do
-      click_link "Clear Search History"
+      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).not_to have_content 'book'
-      expect(page).not_to have_content 'dang'
+      expect(page).to have_no_content 'book'
+      expect(page).to have_no_content 'dang'
     end
   end
 end

data/spec/features/search_pagination_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe "Search Pagination" do
   it "has results with pagination" do
     visit root_path
     fill_in "q", with: ''
-    click_button 'search'
+    click_on 'search'
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 10 of "
       within '#per_page-dropdown' do
@@ -15,11 +15,11 @@ RSpec.describe "Search Pagination" do
       end
     end
     within '#sortAndPerPage' do
-      click_link "Next »"
+      click_on "Next »"
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "11 - 20 of "
-      click_link "« Previous"
+      click_on "« Previous"
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "1 - 10 of "
@@ -29,13 +29,13 @@ RSpec.describe "Search Pagination" do
   it "is able to change the number of items per page" do
     visit root_path
     fill_in "q", with: ''
-    click_button 'search'
+    click_on 'search'
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 10 of "
     end
 
     within ("#per_page-dropdown") do
-      click_link '20'
+      click_on '20'
     end
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 20 of "
@@ -59,7 +59,7 @@ RSpec.describe "Search Pagination" do
     it "uses the configured values" do
       visit root_path
       fill_in "q", with: ''
-      click_button 'search'
+      click_on 'search'
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 - 15 of "
         within '#per_page-dropdown' do
@@ -68,7 +68,7 @@ RSpec.describe "Search Pagination" do
         end
       end
       within ("#per_page-dropdown") do
-        click_link '30'
+        click_on '30'
       end
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 - 30 of "
@@ -79,15 +79,15 @@ RSpec.describe "Search Pagination" do
   it "resets the page offset to 1 when changing per page" do
     visit root_path
     fill_in "q", with: ''
-    click_button 'search'
+    click_on 'search'
     within "#sortAndPerPage" do
-      click_link "Next »"
+      click_on "Next »"
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "11 - 20 of "
     end
     within ("#per_page-dropdown") do
-      click_link '20'
+      click_on '20'
     end
     within "#sortAndPerPage" do
       expect(page).to have_content "1 - 20 of "

data/spec/features/search_results_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe "Search Results" do
     visit root_path
     fill_in "q", with: "inmul"
     select "Author", from: "search_field"
-    click_button 'search'
+    click_on 'search'
     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"

data/spec/features/search_sort_spec.rb

@@ -4,19 +4,19 @@ RSpec.describe "Search Sort" do
   it "sorts on facet results with no search terms" do
     visit root_path
     within "#facet-language_ssim" do
-      click_link 'English'
+      click_on 'English'
     end
     expect(page).to have_content 'Sort by relevance'
-    click_link 'title'
+    click_on 'title'
     expect(page).to have_content 'Sort by title'
   end
 
   it "sorts on search" do
     visit root_path
     fill_in "q", with: 'bod'
-    click_button 'search'
+    click_on 'search'
     expect(page).to have_content 'Sort by relevance'
-    click_link 'title'
+    click_on 'title'
     expect(page).to have_content 'Sort by title'
   end
 end

data/spec/features/search_spec.rb

@@ -3,25 +3,25 @@
 RSpec.describe "Search Page" do
   it 'declares the page language in the html lang attribute' do
     visit root_path
-    expect(page).to have_selector('html[lang=en]')
+    expect(page).to have_css('html[lang=en]')
   end
 
   it "shows welcome" do
     visit root_path
-    expect(page).to have_selector("input#q")
+    expect(page).to have_field("search for")
     within ("select#search_field") do
-      expect(page).to have_selector('option', text: 'All Fields')
-      expect(page).to have_selector('option', text: 'Title')
-      expect(page).to have_selector('option', text: 'Author')
-      expect(page).to have_selector('option', text: 'Subject')
+      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')
+      expect(page).to have_css('option', text: 'Subject')
     end
-    expect(page).to have_selector("button[type='submit'] .submit-search-text")
-    expect(page).not_to have_link "Start Over"
+    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!"
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
-    expect(page).to have_selector("link[rel=stylesheet]")
+    expect(page).to have_css("link[rel=stylesheet]")
     Capybara.ignore_hidden_elements = tmp_value
   end
 
@@ -29,18 +29,18 @@ RSpec.describe "Search Page" do
     visit root_path
     fill_in "q", with: 'history'
     select 'All Fields', from: 'search_field'
-    click_button 'search'
+    click_on 'search'
 
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
-    expect(page).to have_selector("link[rel=alternate][type='application/rss+xml']")
-    expect(page).to have_selector("link[rel=alternate][type='application/atom+xml']")
-    expect(page).to have_selector("link[rel=alternate][type='application/json']")
+    expect(page).to have_css("link[rel=alternate][type='application/rss+xml']")
+    expect(page).to have_css("link[rel=alternate][type='application/atom+xml']")
+    expect(page).to have_css("link[rel=alternate][type='application/json']")
 
     # opensearch
-    expect(page).to have_selector("meta[name=totalResults]")
-    expect(page).to have_selector("meta[name=startIndex]")
-    expect(page).to have_selector("meta[name=itemsPerPage]")
+    expect(page).to have_css("meta[name=totalResults]")
+    expect(page).to have_css("meta[name=startIndex]")
+    expect(page).to have_css("meta[name=itemsPerPage]")
     Capybara.ignore_hidden_elements = tmp_value
 
     within "#appliedParams" do
@@ -49,7 +49,7 @@ RSpec.describe "Search Page" do
     end
 
     within ("select#search_field") do
-      expect(page).to have_selector("option[selected]", text: "All Fields")
+      expect(page).to have_css("option[selected]", text: "All Fields")
     end
 
     within ("#sortAndPerPage") do
@@ -63,7 +63,7 @@ RSpec.describe "Search Page" do
       end
     end
     within "#documents" do
-      expect(page).to have_selector(".document", count: 10)
+      expect(page).to have_css(".document", count: 10)
     end
   end
 
@@ -71,7 +71,7 @@ RSpec.describe "Search Page" do
     visit root_path
     fill_in "q", with: 'inmul'
     select 'Title', from: 'search_field'
-    click_button 'search'
+    click_on 'search'
 
     within "#appliedParams" do
       expect(page).to have_content "You searched for:"
@@ -79,7 +79,7 @@ RSpec.describe "Search Page" do
       expect(page).to have_content "inmul"
     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
     within(".index_title") do
       expect(page).to have_content "1."
@@ -92,7 +92,7 @@ RSpec.describe "Search Page" do
   it "shows vernacular (Linked 880) and call number" do
     visit root_path
     fill_in "q", with: 'history'
-    click_button 'search'
+    click_on 'search'
     within "#documents" do
       expect(page).to have_content "次按驟變"
       expect(page).to have_content "DK861.K3 V5"
@@ -102,17 +102,17 @@ RSpec.describe "Search Page" do
   it "allows you to clear the search" do
     visit root_path
     fill_in "q", with: 'history'
-    click_button 'search'
+    click_on 'search'
     within "#appliedParams" do
       expect(page).to have_content "You searched for:"
       expect(page).to have_content "history"
     end
 
-    expect(page).to have_selector "#q[value='history']"
+    expect(page).to have_css "#q[value='history']"
 
-    click_link "Start Over"
+    click_on "Start Over"
 
     expect(page).to have_content "Welcome!"
-    expect(page).not_to have_selector "#q[value='history']"
+    expect(page).to have_no_css "#q[value='history']"
   end
 end

data/spec/features/sitelinks_search_box_spec.rb

@@ -3,11 +3,11 @@
 RSpec.describe 'Sitelinks search box' do
   it 'is home page' do
     visit root_path
-    expect(page).to have_selector 'script[type="application/ld+json"]', visible: :hidden
+    expect(page).to have_css 'script[type="application/ld+json"]', visible: :hidden
   end
 
   it 'on search page' do
     visit search_catalog_path q: 'book'
-    expect(page).not_to have_selector 'script[type="application/ld+json"]', visible: :hidden
+    expect(page).to have_no_css 'script[type="application/ld+json"]', visible: :hidden
   end
 end

data/spec/features/sms_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe 'SMS functionality' do
   before { visit solr_document_path('2007020969') }
 
   it 'displays SMS modal with form' do
-    click_link 'SMS'
+    click_on 'SMS'
     expect(find('div.modal-header')).to have_text 'SMS This'
     fill_in 'Phone Number:', with: '555-555-5555'
     select 'Verizon', from: 'Carrier'

data/spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
 
     it 'wraps the facet data in a presenter' do
       presenter = helper.facet_field_presenter(facet_config, display_facet)
-      expect(presenter).to be_a_kind_of Blacklight::FacetFieldPresenter
+      expect(presenter).to be_a Blacklight::FacetFieldPresenter
       expect(presenter.facet_field).to eq facet_config
       expect(presenter.display_facet).to eq display_facet
       expect(presenter.view_context).to eq helper
@@ -23,7 +23,7 @@ RSpec.describe Blacklight::FacetsHelperBehavior do
       stub_const('SomePresenter', Class.new(Blacklight::FacetFieldPresenter))
       facet_config.presenter = SomePresenter
       presenter = helper.facet_field_presenter(facet_config, display_facet)
-      expect(presenter).to be_a_kind_of SomePresenter
+      expect(presenter).to be_a SomePresenter
     end
   end
 end

data/spec/helpers/blacklight/layout_helper_behavior_spec.rb

@@ -30,9 +30,26 @@ RSpec.describe Blacklight::LayoutHelperBehavior do
   end
 
   describe '#container_classes' do
-    it 'returns a string of classe(s)' do
-      expect(helper.container_classes).to be_an String
-      expect(helper.container_classes).to eq 'container'
+    before do
+      allow(view).to receive(:blacklight_config).and_return(config)
+    end
+
+    context 'when not full-width' do
+      let(:config) { Blacklight::Configuration.new }
+
+      it 'returns a string of classe(s)' do
+        expect(helper.container_classes).to be_an String
+        expect(helper.container_classes).to eq 'container'
+      end
+    end
+
+    context 'when full-width' do
+      let(:config) { Blacklight::Configuration.new(full_width_layout: true) }
+
+      it 'returns a string of classe(s)' do
+        expect(helper.container_classes).to be_an String
+        expect(helper.container_classes).to eq 'container-fluid'
+      end
     end
   end
 

data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb

@@ -40,8 +40,9 @@ RSpec.describe Blacklight::RenderPartialsHelperBehavior do
     end
 
     it "gets the document format from document_partial_name" do
-      allow(helper).to receive(:document_partial_name).with(doc, :xyz)
+      allow(helper).to receive(:document_partial_name)
       helper.render_document_partial(doc, :xyz)
+      expect(helper).to have_received(:document_partial_name).with(doc, :xyz)
     end
   end