blacklight 6.25.0 → 7.0.0.rc1

data/spec/features/facets_spec.rb

@@ -1,17 +1,17 @@
 # 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")
+    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_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
@@ -20,18 +20,18 @@ describe "Facets" do
   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
@@ -46,7 +46,7 @@ describe "Facets" do
     click_on 'Clear Filter'
     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,6 +1,6 @@
 # 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:" 
@@ -31,9 +31,4 @@ describe "Record View" do
     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." 
-  end
 end

data/spec/features/search_context_spec.rb

@@ -1,6 +1,6 @@
 # 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
@@ -25,7 +25,7 @@ describe "Search Results context", js: true do
   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

data/spec/features/search_filters_spec.rb

@@ -1,19 +1,19 @@
 # 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
+    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
@@ -22,11 +22,11 @@ describe "Facets" do
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 - 2 of 2"
     end
-    within "#facet-language_facet" do
+    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
+    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
@@ -37,16 +37,16 @@ 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
+    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
@@ -60,11 +60,11 @@ describe "Facets" do
     within ("#sortAndPerPage") do
       expect(page).to have_content "1 entry found"
     end
-    within "#facet-language_facet" do
+    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
+    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
@@ -72,14 +72,14 @@ describe "Facets" do
 
   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
+    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'
@@ -90,32 +90,32 @@ 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
+    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
+    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
+    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
+    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
+    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
@@ -125,15 +125,15 @@ 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
+    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
+    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
@@ -147,17 +147,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
+    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
+    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
@@ -169,39 +169,39 @@ describe "Facets" 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-block", :visible => true)
     end
   end
   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-block", :visible => true)
+      find(".card-header").click
+      expect(page).to     have_selector(".card-block", :visible => true)
     end
   end
   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-block", :visible => true)
+      find(".card-header").click
+      expect(page).to     have_selector(".card-block", :visible => true)
     end
   end
   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
+    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
+    within(".blacklight-subject_ssim") do
       expect(page).to have_selector(".panel-collapse", :visible => true)
     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
@@ -47,29 +47,4 @@ describe "Search History Page" do
       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'
-    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: ''

data/spec/features/search_results_spec.rb

@@ -1,6 +1,6 @@
 # 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
@@ -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
@@ -73,7 +72,7 @@ def position_in_result_page(page, id)
   end
   i.to_i
 end
-        
+
 def number_of_results_for_query(query)
   visit root_path
   fill_in "q", :with => query

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,11 +1,6 @@
 # frozen_string_literal: true
 
 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]')
-  end
-
   it "shows welcome" do
     visit root_path
     expect(page).to have_selector("input#q")
@@ -16,8 +11,8 @@ RSpec.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).to_not have_link "Start Over"
+
     expect(page).to have_content "Welcome!"
     tmp_value = Capybara.ignore_hidden_elements
     Capybara.ignore_hidden_elements = false
@@ -30,7 +25,7 @@ RSpec.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']")
@@ -54,7 +49,7 @@ RSpec.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')
@@ -63,7 +58,7 @@ RSpec.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