blacklight 6.19.1 → 7.1.0

data/spec/controllers/search_history_controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe SearchHistoryController do
+RSpec.describe SearchHistoryController do
   routes { Blacklight::Engine.routes }
 
   describe "index" do
@@ -10,25 +10,25 @@ describe SearchHistoryController do
       @three = Search.create
     end
 
-    it "onlies fetch searches with ids in the session" do
+    it "only fetches searches with ids in the session" do
       session[:history] = [@one.id, @three.id]
       get :index
       @searches = assigns(:searches)
       expect(@searches).to have(2).searches
       expect(@searches).to include(@one)
       expect(@searches).to include(@three)
-      expect(@searches).to_not include(@two)
+      expect(@searches).not_to include(@two)
     end
-    
+
     it "tolerates bad ids in session" do
       session[:history] = [@one.id, @three.id, "NOT_IN_DB"]
       get :index
       @searches = assigns(:searches)
       expect(@searches).to have(2).searches
       expect(@searches).to include(@one)
-      expect(@searches).to include(@three)      
+      expect(@searches).to include(@three)
     end
-    
+
     it "does not fetch any searches if there is no history" do
       session[:history] = []
       get :index

data/spec/features/alternate_controller_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-describe "Alternate Controller Behaviors" do
+RSpec.describe "Alternate Controller Behaviors" do
   it "has the correct per-page form" do
     visit search_alternate_path
     expect(page).to have_selector("form[action='#{search_alternate_url}']")
-    fill_in "q", :with=>"history"
+    fill_in "q", with: "history"
     click_button 'search'
     expect(current_path).to match /#{search_alternate_path}/
     within "#per_page-dropdown .dropdown-menu" do
@@ -16,7 +16,7 @@ describe "Alternate Controller Behaviors" do
   it "has the correct search field form" do
     visit search_alternate_path
     expect(page).to have_selector("form[action='#{search_alternate_url}']")
-    fill_in "q", :with=>"history"
+    fill_in "q", with: "history"
     click_button 'search'
     expect(current_path).to match /#{search_alternate_path}/
     click_on 'relevance'
@@ -26,7 +26,7 @@ describe "Alternate Controller Behaviors" do
   it "displays document thumbnails" do
     visit search_alternate_path
     expect(page).to have_selector("form[action='#{search_alternate_url}']")
-    fill_in "q", :with=>"history"
+    fill_in "q", with: "history"
     click_button 'search'
     expect(page).to have_selector ".document-thumbnail"
     expect(page).to have_selector ".document-thumbnail a[data-context-href]"

data/spec/features/autocomplete_spec.rb

@@ -1,6 +1,8 @@
-describe 'Autocomplete suggestions' do
+# frozen_string_literal: true
+
+RSpec.describe 'Autocomplete suggestions' do
   it 'search form has suggest path' do
     visit root_path
-    expect(page).to have_css 'input[data-autocomplete-path="/suggest"]'
+    expect(page).to have_css 'input[data-autocomplete-path="/catalog/suggest"]'
   end
 end

data/spec/features/bookmarks_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Bookmarks" do
+RSpec.describe "Bookmarks" do
   describe "navigating from the homepage" do
     it "has a link to the history page" do
       sign_in 'user1'
@@ -58,26 +58,26 @@ describe "Bookmarks" do
   end
 
   it "cites items in current bookmarks page" do
-    visit solr_document_path('2009373513')
+    visit solr_document_path('2009373513') # Ci an zhou bian
     click_button 'Bookmark'
 
-    visit solr_document_path('2007020969')
+    visit solr_document_path('2007020969') # Strong Medicine speaks
     click_button 'Bookmark'
 
     visit "/bookmarks?per_page=1"
-    expect(page).to have_content 'Ci an zhou bian'
-    expect(page).not_to have_content 'Strong Medicine speaks'
+    expect(page).to have_content 'Strong Medicine speaks'
+    expect(page).not_to have_content 'Ci an zhou bian'
 
     click_link 'Cite'
-    expect(page).to have_content 'Ci an zhou bian'
-    expect(page).not_to have_content 'Strong Medicine speaks'
+    expect(page).to have_content 'Strong Medicine speaks'
+    expect(page).not_to have_content 'Ci an zhou bian'
 
     visit "/bookmarks?per_page=1"
     click_link "2"
-    expect(page).to have_content 'Strong Medicine speaks'
+    expect(page).to have_content 'Ci an zhou bian'
 
     click_link 'Cite'
-    expect(page).to have_content 'Strong Medicine speaks'
-    expect(page).not_to have_content 'Ci an zhou bian'
+    expect(page).not_to have_content 'Strong Medicine speaks'
+    expect(page).to have_content 'Ci an zhou bian'
   end
 end

data/spec/features/did_you_mean_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Did You Mean" do
+RSpec.describe "Did You Mean" do
   before { visit root_path }
 
   describe "searching all fields" do
@@ -18,6 +18,7 @@ describe "Did You Mean" do
 
   describe "for a title search" do
     before { select 'Title', from: 'search_field' }
+
     it "has suggestions" do
       # yehudiyam is one letter away from a title word
       fill_in "q", with: 'yehudiyam'
@@ -36,6 +37,7 @@ describe "Did You Mean" do
 
   describe "for an author search" do
     before { select 'Author', from: 'search_field' }
+
     it "has suggestions" do
       # shirma is one letter away from an author word
       fill_in "q", with: 'shirma'
@@ -54,6 +56,7 @@ describe "Did You Mean" do
 
   describe "for an subject search" do
     before { select 'Subject', from: 'search_field' }
+
     it "has suggestions" do
       # wome is one letter away from an author word
       fill_in "q", with: 'wome'
@@ -75,7 +78,7 @@ describe "Did You Mean" do
       fill_in "q", with: 'ooofda ooofda'
       click_button 'search'
 
-      expect(page).to_not have_content("Did you mean")
+      expect(page).not_to have_content("Did you mean")
     end
 
     it "has separate suggestions" do
@@ -88,13 +91,13 @@ describe "Did You Mean" do
         expect(page).to have_link('bon')
         expect(page).not_to have_link('policy bon')
       end
-      
+
       click_link 'bon'
       within ("#sortAndPerPage") do
         expect(page).to have_content "1 entry found"
       end
     end
-    
+
     it "ignores repeated terms" do
       fill_in "q", with: 'boo boo'
       click_button 'search'
@@ -118,18 +121,10 @@ describe "Did You Mean" do
     end
   end
 
-  it "does not show suggestions if there are many results" do
-    # histori gives 9 results in 30 record demo index
-    fill_in "q", with: 'histori'
-    click_button 'search'
-    expect(page).to_not have_content("Did you mean")
-  end
-
   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'
     expect(page).to have_content("Did you mean")
   end
-
 end

data/spec/features/facets_spec.rb

@@ -1,37 +1,37 @@
 # frozen_string_literal: true
 
-describe "Facets" do
+RSpec.describe "Facets" do
   it "shows a single facet's values" do
-    visit facet_catalog_path("language_facet")
-    expect(page).to have_selector ".modal-title", :text => "Language"
-    expect(page).to have_selector ".facet_select", :text => "Tibetan"
+    visit facet_catalog_path("language_ssim")
+    expect(page).to have_selector ".modal-title", text: "Language"
+    expect(page).to have_selector ".facet-select", text: "Tibetan"
   end
-  
+
   it "paginates through a facet's values" do
-    visit facet_catalog_path("subject_topic_facet")
+    visit facet_catalog_path("subject_ssim")
     expect(page).to have_selector '.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_selector '.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_link "« Previous"
   end
-  
+
   it "is able to change the facet sort" do
-    visit facet_catalog_path("subject_topic_facet")
+    visit facet_catalog_path("subject_ssim")
     expect(page).to have_selector '.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_link "Numerical Sort"
-    expect(page).to have_selector '.sort_options .active', text: "A-Z Sort"
+    expect(page).to have_selector '.sort-options .active', text: "A-Z Sort"
   end
-  
+
   it "is able to sort more facet window by letter" do
-    visit facet_catalog_path("subject_topic_facet")
+    visit facet_catalog_path("subject_ssim")
     within ".modal-footer" do
       click_on "A-Z Sort"
     end
@@ -43,10 +43,10 @@ describe "Facets" do
     click_on 'T'
     expect(page).to have_selector '.facet-values li:first', text: "Teaching"
     expect(page).to have_css '.facet-values li', count: 4
-    click_on 'Clear Filter'
+    click_on 'All'
     expect(page).to have_selector '.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"
+    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', count: 20
   end
@@ -66,8 +66,8 @@ describe "Facets" do
   describe '"More" links' do
     it 'has default more link with sr-only text' do
       visit root_path
-      within '#facet-language_facet' do
-        expect(page).to have_css 'li.more_facets_link', text: 'more Language'
+      within '#facet-language_ssim' do
+        expect(page).to have_css 'li.more_facets', text: 'more Language'
       end
     end
   end

data/spec/features/record_view_spec.rb

@@ -1,39 +1,33 @@
 # frozen_string_literal: true
 
-describe "Record View" do
+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 "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 "Format:"
+    expect(page).to have_content "Book"
     expect(page).to have_content "Call number:"
     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]")
     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).not_to have_content "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 "臺北縣板橋市" 
-  end
-  it "does not display 404" do
-    visit solr_document_path('this_id_does_not_exist')
-    expect(page.driver.status_code).to eq 404
-    expect(page).to have_content "The page you were looking for doesn't exist." 
+    expect(page).to have_content "次按驟變"
+    expect(page).to have_content "林行止"
+    expect(page).to have_content "臺北縣板橋市"
   end
 end

data/spec/features/search_context_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-describe "Search Results context", js: true do
+RSpec.describe "Search Results context", js: true do
   it "passes the current search id through" do
     search_for ''
-    search_id =  Search.last.id.to_s
+    search_id = Search.last.id.to_s
     click_on 'Pluvial nectar of blessings'
     expect(page).to have_content "« Previous | 10 of 30 | Next »"
     prev = page.find(".pagination-search-widgets .previous")
@@ -14,23 +14,23 @@ describe "Search Results context", js: true do
     prev = page.find(".pagination-search-widgets .previous")
     expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&search_id=#{search_id}"
   end
-  
+
   it "redirects context urls to the original url" do
     search_for ''
     first('.index_title a').click
     expect(page).to have_content "« Previous | 1 of 30 | Next »"
-    expect(page.current_url).to_not have_content "/track"
+    expect(page.current_url).not_to have_content "/track"
   end
 
   it 'shows "Back to Search" and "Start Over links"' do
     search_for 'Bod kyi naṅ chos ṅo sprod sñiṅ bsdus'
     first('.index_title a').click
-    within '.pagination-search-widgets' do
+    within '.constraints-container' do
       expect(page).to have_css 'a', text: 'Back to Search'
       expect(page).to have_css 'a', text: 'Start Over'
     end
   end
-  
+
   context "navigating between search results using context pagination" do
     it "updates the back to search link with the current search pagination context" do
       search_for ''
@@ -44,7 +44,6 @@ describe "Search Results context", js: true do
   end
 end
 
-
 def search_for q
   visit root_path
   fill_in "q", with: q

data/spec/features/search_crawler_spec.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe "Search History Page" do
-
   describe "crawler search" do
     let(:original_proc) { ::CatalogController.blacklight_config.crawler_detector }
 
     before do
-      ::CatalogController.blacklight_config.crawler_detector = lambda { |req| req.env['HTTP_USER_AGENT'] =~ /Googlebot/ }
+      ::CatalogController.blacklight_config.crawler_detector = ->(req) { req.env['HTTP_USER_AGENT'] =~ /Googlebot/ }
     end
 
     after do
@@ -16,15 +15,14 @@ RSpec.describe "Search History Page" do
     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_button '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' }.to_not change { Search.count }
+      expect { click_button 'search' }.not_to change(Search, :count)
     end
   end
-
 end

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