blacklight 6.2.0 → 6.3.0

data/spec/controllers/saved_searches_controller_spec.rb

@@ -16,23 +16,18 @@ describe SavedSearchesController do
   end
 
   describe "save" do
-    it "should let you save a search" do
-
+    it "lets you save a search" do
       request.env["HTTP_REFERER"] = "where_i_came_from"
       session[:history] = [@one.id]
-      post :save, :id => @one.id
+      post :save, params: { id: @one.id }
       expect(response).to redirect_to "where_i_came_from"
     end
 
-    it "should not let you save a search that isn't in your search history" do
+    it "does not let you save a search that isn't in your search history" do
       session[:history] = [@one.id]
       expect {
-        post :save, :id => @two.id
+        post :save, params: { id: @two.id }
       }.to raise_error ActiveRecord::RecordNotFound
     end
-
   end
-
-
-
 end

data/spec/controllers/search_history_controller_spec.rb

@@ -11,7 +11,7 @@ describe SearchHistoryController do
       @three = Search.create
     end
 
-    it "should only fetch searches with ids in the session" do
+    it "onlies fetch searches with ids in the session" do
       session[:history] = [@one.id, @three.id]
       get :index
       @searches = assigns(:searches)
@@ -21,7 +21,7 @@ describe SearchHistoryController do
       expect(@searches).to_not include(@two)
     end
     
-    it "should tolerate bad ids in session" do
+    it "tolerates bad ids in session" do
       session[:history] = [@one.id, @three.id, "NOT_IN_DB"]
       get :index
       @searches = assigns(:searches)
@@ -30,14 +30,11 @@ describe SearchHistoryController do
       expect(@searches).to include(@three)      
     end
     
-    it "should not fetch any searches if there is no history" do
+    it "does not fetch any searches if there is no history" do
       session[:history] = []
       get :index
       @searches = assigns(:searches)
       expect(@searches).to be_empty
     end
   end
-
-
-
 end

data/spec/controllers/suggest_controller_spec.rb

@@ -5,11 +5,11 @@ describe SuggestController do
   routes { Blacklight::Engine.routes }
   describe 'GET index' do
     it 'returns JSON' do
-      get :index, format: 'json'
+      get :index, params: { format: 'json' }
       expect(response.body).to eq [].to_json
     end
     it 'returns suggestions' do
-      get :index, format: 'json', q: 'new'
+      get :index, params: { format: 'json', q: 'new' }
       json = JSON.parse(response.body)
       expect(json.count).to eq 3
       expect(json.first['term']).to eq 'new jersey'

data/spec/features/alternate_controller_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe "Alternate Controller Behaviors" do
-  it "should have the correct per-page form" 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"
@@ -14,7 +14,7 @@ describe "Alternate Controller Behaviors" do
     expect(current_path).to match /#{search_alternate_path}/
   end
 
-  it "should have the correct search field form" 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"
@@ -24,7 +24,7 @@ describe "Alternate Controller Behaviors" do
     expect(current_path).to match /#{search_alternate_path}/
   end
 
-  it "should display document thumbnails" 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"

data/spec/features/bookmarks_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe "Bookmarks" do
   describe "navigating from the homepage" do
-    it "should have a link to the history page" do
+    it "has a link to the history page" do
       sign_in 'user1'
       visit root_path
       click_link 'Bookmarks'
@@ -11,7 +11,7 @@ describe "Bookmarks" do
     end
   end
 
-  it "should clear bookmarks" do
+  it "clears bookmarks" do
     visit solr_document_path('2007020969')
     click_button 'Bookmark'
     click_link 'Bookmarks'
@@ -33,7 +33,7 @@ describe "Bookmarks" do
     expect(page).to have_content 'Successfully removed bookmark.'
   end
 
-  it "should add and delete bookmarks from the show page" do
+  it "adds and delete bookmarks from the show page" do
     sign_in 'user1'
     visit solr_document_path('2007020969')
     click_button 'Bookmark'
@@ -41,7 +41,7 @@ describe "Bookmarks" do
     expect(page).to have_content 'Successfully removed bookmark.'
   end
 
-  it "should add bookmarks after a user logs in" do
+  it "adds bookmarks after a user logs in" do
     visit solr_document_path('2007020969')
     click_button 'Bookmark'
     sign_in 'user1'
@@ -50,7 +50,7 @@ describe "Bookmarks" do
     expect(page).to have_content("Strong Medicine speaks")
   end
 
-  it "should cite items in bookmarks" do
+  it "cites items in bookmarks" do
     visit solr_document_path('2007020969')
     click_button 'Bookmark'
     click_link 'Bookmarks'
@@ -58,7 +58,7 @@ describe "Bookmarks" do
     expect(page).to have_content 'Strong Medicine speaks'
   end
 
-  it "should cite items in current bookmarks page" do
+  it "cites items in current bookmarks page" do
     visit solr_document_path('2009373513')
     click_button 'Bookmark'
 

data/spec/features/did_you_mean_spec.rb

@@ -5,7 +5,7 @@ describe "Did You Mean" do
   before { visit root_path }
 
   describe "searching all fields" do
-    it "should have suggestions" do
+    it "has suggestions" do
       fill_in "q", with: 'politica'
       click_button 'search'
 
@@ -19,7 +19,7 @@ describe "Did You Mean" do
 
   describe "for a title search" do
     before { select 'Title', from: 'search_field' }
-    it "should have suggestions" do
+    it "has suggestions" do
       # yehudiyam is one letter away from a title word
       fill_in "q", with: 'yehudiyam'
       click_button 'search'
@@ -37,7 +37,7 @@ describe "Did You Mean" do
 
   describe "for an author search" do
     before { select 'Author', from: 'search_field' }
-    it "should have suggestions" do
+    it "has suggestions" do
       # shirma is one letter away from an author word
       fill_in "q", with: 'shirma'
       click_button 'search'
@@ -55,7 +55,7 @@ describe "Did You Mean" do
 
   describe "for an subject search" do
     before { select 'Subject', from: 'search_field' }
-    it "should have suggestions" do
+    it "has suggestions" do
       # wome is one letter away from an author word
       fill_in "q", with: 'wome'
       click_button 'search'
@@ -72,14 +72,14 @@ describe "Did You Mean" do
   end
 
   describe "a multiword query" do
-    it "should not have suggestions if there are no matches" do
+    it "does not have suggestions if there are no matches" do
       fill_in "q", with: 'ooofda ooofda'
       click_button 'search'
 
       expect(page).to_not have_content("Did you mean")
     end
 
-    it "should have separate suggestions" do
+    it "has separate suggestions" do
       fill_in "q", with: 'politica boo'
       click_button 'search'
 
@@ -96,7 +96,7 @@ describe "Did You Mean" do
       end
     end
     
-    it "should ignore repeated terms" do
+    it "ignores repeated terms" do
       fill_in "q", with: 'boo boo'
       click_button 'search'
 
@@ -108,7 +108,7 @@ describe "Did You Mean" do
     end
   end
 
-  it "should show suggestions if there aren't many hits" do
+  it "shows suggestions if there aren't many hits" do
     fill_in "q", with: 'ayaz'
     click_button 'search'
 
@@ -119,14 +119,14 @@ describe "Did You Mean" do
     end
   end
 
-  it "should should not show suggestions if there are many results" do
+  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 "should should show suggestions if at the threshold number" 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'

data/spec/features/facets_spec.rb

@@ -2,13 +2,13 @@
 require 'spec_helper'
 
 describe "Facets" do
-  it "should show a single facet's values" 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"
   end
   
-  it "should paginate through a facet's values" do
+  it "paginates through a facet's values" do
     visit facet_catalog_path("subject_topic_facet")
     expect(page).to have_selector '.facet-values li:first', text: "Japanese drama"
     expect(page).to have_link "A-Z Sort"
@@ -20,7 +20,7 @@ describe "Facets" do
     expect(page).to have_link "« Previous"
   end
   
-  it "should be able to change the facet sort" do
+  it "is able to change the facet sort" do
     visit facet_catalog_path("subject_topic_facet")
     expect(page).to have_selector '.facet-values li:first', text: "Japanese drama"
     within ".modal-footer" do
@@ -31,7 +31,7 @@ describe "Facets" do
     expect(page).to have_selector '.sort_options .active', text: "A-Z Sort"
   end
   
-  it "should be able to sort more facet window by letter" do
+  it "is able to sort more facet window by letter" do
     visit facet_catalog_path("subject_topic_facet")
     within ".modal-footer" do
       click_on "A-Z Sort"

data/spec/features/record_view_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe "Record View" do
-  it "should display a normal record" 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" 
@@ -21,18 +21,18 @@ describe "Record View" do
     
   end
 
-  it "should not display blank titles" do
+  it "does not display blank titles" do
     visit solr_document_path('2008305903')
     expect(page).not_to have_content "More Information:" 
   end
 
-  it "should not display vernacular records" do
+  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 "should not display 404" do
+  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." 

data/spec/features/saved_searches_spec.rb

@@ -7,7 +7,7 @@ describe "Saved Searches" do
     visit root_path
   end
 
-  it "should be empty" do
+  it "is empty" do
     click_link 'Saved Searches'
     expect(page).to have_content 'You have no saved searches'
   end
@@ -20,11 +20,11 @@ describe "Saved Searches" do
       click_button "save"
       click_link 'Saved Searches'
     end
-    it "should show saved searches" do
+    it "shows saved searches" do
       expect(page).to have_content 'Your saved searches'
       expect(page).to have_content 'book'
     end
-    it "should delete saved searches" do
+    it "deletes saved searches" do
       click_button 'delete'
       expect(page).to have_content 'Successfully removed that saved search.'
     end
@@ -38,7 +38,7 @@ describe "Saved Searches" do
         click_button "save"
         click_link 'Saved Searches'
       end
-      it "should clear the searhes" do
+      it "clears the searhes" do
         click_link "Clear Saved Searches"
         expect(page).to have_content 'Cleared your saved searches.'
         expect(page).to have_content 'You have no saved searches'

data/spec/features/search_context_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe "Search Results context", js: true do
-  it "should pass the current search id through" do
+  it "passes the current search id through" do
     search_for ''
     search_id =  Search.last.id.to_s
     click_on 'Pluvial nectar of blessings'
@@ -16,14 +16,14 @@ describe "Search Results context", js: true do
     expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&search_id=#{search_id}"
   end
   
-  it "should redirect context urls to the original url" do
+  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"
   end
 
-  it 'should show "Back to Search" and "Start Over links"' 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
@@ -33,7 +33,7 @@ describe "Search Results context", js: true do
   end
   
   context "navigating between search results using context pagination" do
-    it "should update the back to search link with the current search pagination context" do
+    it "updates the back to search link with the current search pagination context" do
       search_for ''
       first('.index_title a').click
       10.times do

data/spec/features/search_filters_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe "Facets" do
-  it "should work without a search term" do
+  it "works without a search term" do
     visit root_path
     within "#facet-language_facet" do
       click_link "Tibetan"
@@ -33,7 +33,7 @@ describe "Facets" do
     end
   end
 
-  it "should work in conjunction with a search term" do
+  it "works in conjunction with a search term" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
@@ -71,7 +71,7 @@ describe "Facets" do
     end
   end
 
-  it "should allow removing filters" do
+  it "allows removing filters" do
     visit root_path
     within "#facet-language_facet" do
       click_link "Tibetan"
@@ -87,7 +87,7 @@ describe "Facets" do
     expect(page).to have_content('Welcome!')
   end
 
-  it "should retain filters when you change the search term" do
+  it "retains filters when you change the search term" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
@@ -122,7 +122,7 @@ describe "Facets" do
     end
   end
 
-  it "should retain the filters when we change sort" do
+  it "retains the filters when we change sort" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
@@ -144,7 +144,7 @@ describe "Facets" do
     end
   end
 
-  it "should retain the filters when we change per page number" do
+  it "retains the filters when we change per page number" do
     visit root_path
     fill_in "q", with: 'history'
     click_button 'search'
@@ -167,14 +167,14 @@ describe "Facets" do
       expect(page).to have_content "history"
     end
   end
-  it "should be 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)
     end
   end
-  it "should expand 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
@@ -183,7 +183,7 @@ describe "Facets" do
       expect(page).to     have_selector(".panel-collapse", :visible => true)
     end
   end
-  it "should expand 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
@@ -192,7 +192,7 @@ describe "Facets" do
       expect(page).to     have_selector(".panel-collapse", :visible => true)
     end
   end
-  it "should keep 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