blacklight-spotlight 0.23.0 → 0.24.0

data/config/locales/spotlight.en.yml

@@ -528,6 +528,11 @@ en:
           help_html: "%{link}"
           template: "Download template"
           file_label: "CSV File"
+      json_upload:
+        form:
+          title: "Upload raw documents"
+          add_item: "Add item"
+          file_label: "JSON File"
       bookmarklet:
         instructions:  "Drag this button to the bookmarks toolbar in your web browser"
         bookmarklet: "%{application_name} widget"

data/lib/generators/spotlight/install_generator.rb

@@ -18,6 +18,8 @@ module Spotlight
 
     def friendly_id
       gem 'friendly_id', github: 'norman/friendly_id'
+      # we need to immediately run `bundle install` while pointing at github.
+      Bundler.with_clean_env { run 'bundle install' }
       generate 'friendly_id'
     end
 

data/lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb

@@ -0,0 +1,58 @@
+# ==> User model
+# Note that your chosen model must include Spotlight::User mixin
+# Spotlight::Engine.config.user_class = '::User'
+
+# ==> Blacklight configuration
+# Spotlight uses this upstream configuration to populate settings for the curator
+# Spotlight::Engine.config.catalog_controller_class = '::CatalogController'
+# Spotlight::Engine.config.default_blacklight_config = nil
+
+# ==> Appearance configuration
+# Spotlight::Engine.config.exhibit_main_navigation = [:curated_features, :browse, :about]
+# Spotlight::Engine.config.resource_partials = [
+#   'spotlight/resources/external_resources_form',
+#   'spotlight/resources/upload/form',
+#   'spotlight/resources/csv_upload/form',
+#   'spotlight/resources/json_upload/form'
+# ]
+# Spotlight::Engine.config.external_resources_partials = []
+# Spotlight::Engine.config.default_browse_index_view_type = :gallery
+# Spotlight::Engine.config.default_contact_email = nil
+
+# ==> Solr configuration
+# Spotlight::Engine.config.writable_index = true
+# Spotlight::Engine.config.solr_batch_size = 20
+# Spotlight::Engine.config.filter_resources_by_exhibit = true
+# Spotlight::Engine.config.autocomplete_search_field = 'autocomplete'
+# Spotlight::Engine.config.default_autocomplete_params = { qf: 'id^1000 full_title_tesim^100 id_ng full_title_ng' }
+
+# Solr field configurations
+# Spotlight::Engine.config.solr_fields.prefix = ''.freeze
+# Spotlight::Engine.config.solr_fields.boolean_suffix = '_bsi'.freeze
+# Spotlight::Engine.config.solr_fields.string_suffix = '_ssim'.freeze
+# Spotlight::Engine.config.solr_fields.text_suffix = '_tesim'.freeze
+# Spotlight::Engine.config.resource_global_id_field = :"#{config.solr_fields.prefix}spotlight_resource_id#{config.solr_fields.string_suffix}"
+# Spotlight::Engine.config.full_image_field = :full_image_url_ssm
+# Spotlight::Engine.config.thumbnail_field = :thumbnail_url_ssm
+# Spotlight::Engine.config.square_image_field = :thumbnail_square_url_ssm
+
+# ==> Uploaded item configuration
+# Spotlight::Engine.config.upload_fields = [
+#   OpenStruct.new(field_name: :spotlight_upload_description_tesim, label: 'Description', form_field_type: :text_area),
+#   OpenStruct.new(field_name: :spotlight_upload_attribution_tesim, label: 'Attribution'),
+#   OpenStruct.new(field_name: :spotlight_upload_date_tesim, label: 'Date')
+# ]
+# Spotlight::Engine.config.upload_title_field = nil # OpenStruct.new(...)
+# Spotlight::Engine.config.uploader_storage = :file
+# Spotlight::Engine.config.allowed_upload_extensions = %w(jpg jpeg png)
+
+# Spotlight::Engine.config.featured_image_thumb_size = [400, 300]
+# Spotlight::Engine.config.featured_image_square_size = [400, 400]
+
+# ==> Google Analytics integration
+# Spotlight::Engine.config.analytics_provider = nil
+# Spotlight::Engine.config.ga_pkcs12_key_path = nil
+# Spotlight::Engine.config.ga_web_property_id = nil
+# Spotlight::Engine.config.ga_email = nil
+# Spotlight::Engine.config.ga_analytics_options = {}
+# Spotlight::Engine.config.ga_page_analytics_options = config.ga_analytics_options.merge(limit: 5)

data/lib/spotlight/engine.rb

@@ -80,7 +80,12 @@ module Spotlight
 
     config.exhibit_main_navigation = [:curated_features, :browse, :about]
 
-    config.resource_partials = ['spotlight/resources/external_resources_form', 'spotlight/resources/upload/form', 'spotlight/resources/csv_upload/form']
+    config.resource_partials = [
+      'spotlight/resources/external_resources_form',
+      'spotlight/resources/upload/form',
+      'spotlight/resources/csv_upload/form',
+      'spotlight/resources/json_upload/form'
+    ]
     config.external_resources_partials = []
     config.solr_batch_size = 20
 

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.23.0'.freeze
+  VERSION = '0.24.0'.freeze
 end

data/spec/controllers/spotlight/about_pages_controller_spec.rb

@@ -6,7 +6,7 @@ describe Spotlight::AboutPagesController, type: :controller do
     describe 'POST update_all' do
       let(:exhibit) { FactoryGirl.create(:exhibit) }
       it 'is not allowed' do
-        post :update_all, exhibit_id: exhibit
+        post :update_all, params: { exhibit_id: exhibit }
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
@@ -24,7 +24,7 @@ describe Spotlight::AboutPagesController, type: :controller do
         it 'is successful' do
           expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
           expect(controller).to receive(:add_breadcrumb).with('About', [exhibit, page])
-          get :show, id: page, exhibit_id: exhibit
+          get :show, params: { id: page, exhibit_id: exhibit }
           expect(assigns(:page)).to eq page
           expect(assigns(:exhibit)).to eq exhibit
         end
@@ -34,7 +34,7 @@ describe Spotlight::AboutPagesController, type: :controller do
           expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
           expect(controller).to receive(:add_breadcrumb).with('About', [exhibit, page])
           expect(controller).to receive(:add_breadcrumb).with(page2.title, [exhibit, page2])
-          get :show, id: page2, exhibit_id: exhibit
+          get :show, params: { id: page2, exhibit_id: exhibit }
           expect(assigns(:page)).to eq page2
           expect(assigns(:exhibit)).to eq exhibit
         end
@@ -48,7 +48,7 @@ describe Spotlight::AboutPagesController, type: :controller do
         it 'is successful' do
           expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
           expect(controller).to receive(:add_breadcrumb).with('About Pages', exhibit_about_pages_path(exhibit))
-          get :edit, id: page, exhibit_id: exhibit
+          get :edit, params: { id: page, exhibit_id: exhibit }
           expect(assigns(:page)).to eq page
           expect(assigns(:exhibit)).to eq exhibit
         end
@@ -58,7 +58,7 @@ describe Spotlight::AboutPagesController, type: :controller do
           expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
           expect(controller).to receive(:add_breadcrumb).with('About Pages', exhibit_about_pages_path(exhibit))
           expect(controller).to receive(:add_breadcrumb).with(page2.title, [:edit, exhibit, page2])
-          get :edit, id: page2, exhibit_id: exhibit
+          get :edit, params: { id: page2, exhibit_id: exhibit }
           expect(assigns(:page)).to eq page2
           expect(assigns(:exhibit)).to eq exhibit
         end
@@ -71,7 +71,7 @@ describe Spotlight::AboutPagesController, type: :controller do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
         expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
         expect(controller).to receive(:add_breadcrumb).with('About Pages', exhibit_about_pages_path(exhibit))
-        get :index, exhibit_id: exhibit
+        get :index, params: { exhibit_id: exhibit }
         expect(assigns(:page)).to be_kind_of Spotlight::Page
         expect(assigns(:page)).to be_new_record
         expect(assigns(:pages)).to include page
@@ -80,14 +80,14 @@ describe Spotlight::AboutPagesController, type: :controller do
     end
     describe 'POST create' do
       it 'redirects to the about page index' do
-        post :create, about_page: { title: 'MyString' }, exhibit_id: exhibit
+        post :create, params: { about_page: { title: 'MyString' }, exhibit_id: exhibit }
         expect(response).to redirect_to(exhibit_about_pages_path(exhibit))
       end
     end
     describe 'PUT update' do
       let!(:page) { FactoryGirl.create(:about_page, exhibit: exhibit) }
       it 'redirects to the about page' do
-        put :update, id: page, exhibit_id: page.exhibit.id, about_page: valid_attributes
+        put :update, params: { id: page, exhibit_id: page.exhibit.id, about_page: valid_attributes }
         page.reload
         expect(response).to redirect_to(exhibit_about_page_path(page.exhibit, page))
         expect(flash[:notice]).to have_link 'Undo changes'
@@ -99,11 +99,14 @@ describe Spotlight::AboutPagesController, type: :controller do
       let!(:page3) { FactoryGirl.create(:about_page, exhibit: exhibit, published: true) }
       before { request.env['HTTP_REFERER'] = 'http://example.com' }
       it 'updates whether they are on the landing page' do
-        post :update_all, exhibit_id: page1.exhibit, exhibit: {
-          about_pages_attributes: [
-            { id: page1.id, published: true, title: 'This is a new title!' },
-            { id: page2.id, published: false }
-          ]
+        post :update_all, params: {
+          exhibit_id: page1.exhibit,
+          exhibit: {
+            about_pages_attributes: [
+              { id: page1.id, published: true, title: 'This is a new title!' },
+              { id: page2.id, published: false }
+            ]
+          }
         }
         expect(response).to redirect_to 'http://example.com'
         expect(flash[:notice]).to eq 'About pages were successfully updated.'
@@ -118,10 +121,15 @@ describe Spotlight::AboutPagesController, type: :controller do
       let!(:contact1) { FactoryGirl.create(:contact, name: 'Aphra Behn', exhibit: exhibit) }
       let!(:contact2) { FactoryGirl.create(:contact, exhibit: exhibit) }
       it 'updates contacts' do
-        patch :update_contacts, exhibit_id: exhibit, exhibit: { contacts_attributes: [
-          { 'show_in_sidebar' => '1', 'id' => contact1.id, weight: 1 },
-          { 'show_in_sidebar' => '0', 'id' => contact2.id, weight: 2 }
-        ] }
+        patch :update_contacts, params: {
+          exhibit_id: exhibit,
+          exhibit: {
+            contacts_attributes: [
+              { 'show_in_sidebar' => '1', 'id' => contact1.id, weight: 1 },
+              { 'show_in_sidebar' => '0', 'id' => contact2.id, weight: 2 }
+            ]
+          }
+        }
         expect(response).to redirect_to exhibit_about_pages_path(exhibit)
         expect(flash[:notice]).to eq 'Contacts were successfully updated.'
         expect(exhibit.contacts.size).to eq 2
@@ -131,11 +139,14 @@ describe Spotlight::AboutPagesController, type: :controller do
       end
       it 'shows index on failure' do
         expect_any_instance_of(Spotlight::Exhibit).to receive(:update).and_return(false)
-        patch :update_contacts, exhibit_id: exhibit, exhibit: { contacts_attributes: [
-          { 'show_in_sidebar' => '1', 'name' => 'Justin Coyne', 'email' => 'jcoyne@justincoyne.com', 'title' => '', 'location' => 'US' },
-          { 'show_in_sidebar' => '0', 'name' => '', 'email' => '', 'title' => '', 'location' => '' },
-          { 'show_in_sidebar' => '0', 'name' => '', 'email' => '', 'title' => 'Librarian', 'location' => '' }
-        ] }
+        patch :update_contacts, params: {
+          exhibit_id: exhibit,
+          exhibit: { contacts_attributes: [
+            { 'show_in_sidebar' => '1', 'name' => 'Justin Coyne', 'email' => 'jcoyne@justincoyne.com', 'title' => '', 'location' => 'US' },
+            { 'show_in_sidebar' => '0', 'name' => '', 'email' => '', 'title' => '', 'location' => '' },
+            { 'show_in_sidebar' => '0', 'name' => '', 'email' => '', 'title' => 'Librarian', 'location' => '' }
+          ] }
+        }
         expect(response).to render_template('index')
       end
     end

data/spec/controllers/spotlight/admin_users_controller_spec.rb

@@ -23,13 +23,13 @@ describe Spotlight::AdminUsersController, type: :controller do
 
     describe 'DELETE destroy' do
       before do
-        post :invite, user: 'user@example.com', role: 'admin'
+        post :invite, params: { user: 'user@example.com', role: 'admin' }
       end
       it 'removes the site admin role from the given user' do
         last_user = Spotlight::Site.instance.roles.last.user
         expect(last_user.email).to eq 'user@example.com'
 
-        delete :destroy, id: last_user.id
+        delete :destroy, params: { id: last_user.id }
         expect(response).to redirect_to(admin_users_path)
         expect(flash[:notice]).to eq 'User removed from site adminstrator role'
         expect(Spotlight::Site.instance.roles.last.user.id).not_to eq last_user.id
@@ -45,12 +45,12 @@ describe Spotlight::AdminUsersController, type: :controller do
 
       it 'returns a successful status when the requested user exists' do
         user = FactoryGirl.create(:exhibit_curator)
-        get :exists, user: user.email
+        get :exists, params: { user: user.email }
         expect(response).to be_success
       end
 
       it 'returns an unsuccessful status when the user does not exist' do
-        get :exists, user: 'user@example.com'
+        get :exists, params: { user: 'user@example.com' }
         expect(response).not_to be_success
         expect(response.status).to eq 404
       end
@@ -59,22 +59,22 @@ describe Spotlight::AdminUsersController, type: :controller do
     describe 'GET invite' do
       it 'invites the selected user to be an admin' do
         expect do
-          post :invite, user: 'user@example.com', role: 'admin'
+          post :invite, params: { user: 'user@example.com', role: 'admin' }
         end.to change { Spotlight::Engine.user_class.count }.by(1)
         expect(Spotlight::Engine.user_class.last.roles.length).to eq 1
         expect(Spotlight::Engine.user_class.last.roles.first.resource).to eq Spotlight::Site.instance
       end
 
       it 'redirects back with a flash notice upon success' do
-        post :invite, user: 'user@example.com', role: 'admin'
+        post :invite, params: { user: 'user@example.com', role: 'admin' }
         expect(flash[:notice]).to eq 'User has been invited.'
-        expect(response).to redirect_to(:back)
+        expect(response).to redirect_to('http://example.com')
       end
 
       it 'redirects back with flash error upon failure' do
-        post :invite, user: 'user@example.com', role: 'not-a-real-role'
+        post :invite, params: { user: 'user@example.com', role: 'not-a-real-role' }
         expect(flash[:alert]).to eq 'There was a problem saving the user.'
-        expect(response).to redirect_to(:back)
+        expect(response).to redirect_to('http://example.com')
       end
     end
   end

data/spec/controllers/spotlight/appearances_controller_spec.rb

@@ -9,7 +9,7 @@ describe Spotlight::AppearancesController, type: :controller do
 
     describe 'GET edit' do
       it 'denies access' do
-        get :edit, exhibit_id: exhibit
+        get :edit, params: { exhibit_id: exhibit }
         expect(response).to redirect_to main_app.root_path
         expect(flash[:alert]).to be_present
       end
@@ -19,7 +19,7 @@ describe Spotlight::AppearancesController, type: :controller do
   describe 'when not logged in' do
     describe 'PATCH update' do
       it 'is not allowed' do
-        patch :update, exhibit_id: exhibit
+        patch :update, params: { exhibit_id: exhibit }
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
@@ -34,7 +34,7 @@ describe Spotlight::AppearancesController, type: :controller do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
         expect(controller).to receive(:add_breadcrumb).with('Configuration', exhibit_dashboard_path(exhibit))
         expect(controller).to receive(:add_breadcrumb).with('Appearance', edit_exhibit_appearance_path(exhibit))
-        get :edit, exhibit_id: exhibit
+        get :edit, params: { exhibit_id: exhibit }
         expect(response).to be_successful
         expect(assigns[:exhibit]).to be_kind_of Spotlight::Exhibit
       end
@@ -55,11 +55,14 @@ describe Spotlight::AppearancesController, type: :controller do
             }
           }
         else
-          patch :update, exhibit_id: exhibit, exhibit: {
-            main_navigations_attributes: [
-              { id: first_nav.id, label: 'Some Label', weight: 500 },
-              { id: last_nav.id, display: false }
-            ]
+          patch :update, params: {
+            exhibit_id: exhibit,
+            exhibit: {
+              main_navigations_attributes: [
+                { id: first_nav.id, label: 'Some Label', weight: 500 },
+                { id: last_nav.id, display: false }
+              ]
+            }
           }
         end
         expect(flash[:notice]).to eq 'The exhibit was successfully updated.'

data/spec/controllers/spotlight/attachments_controller_spec.rb

@@ -4,7 +4,7 @@ describe Spotlight::AttachmentsController, type: :controller do
   describe 'when not logged in' do
     describe 'GET edit' do
       it 'is successful' do
-        post :create, exhibit_id: exhibit
+        post :create, params: { exhibit_id: exhibit }
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
@@ -16,7 +16,7 @@ describe Spotlight::AttachmentsController, type: :controller do
 
     describe 'POST create' do
       it 'is successful' do
-        post :create, exhibit_id: exhibit, attachment: { name: 'xyz' }
+        post :create, params: { exhibit_id: exhibit, attachment: { name: 'xyz' } }
         expect(response).to be_successful
       end
     end

data/spec/controllers/spotlight/browse_controller_spec.rb

@@ -11,7 +11,7 @@ describe Spotlight::BrowseController, type: :controller do
       it 'does not show unpublished categories' do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
         expect(controller).to receive(:add_breadcrumb).with('Browse', exhibit_browse_index_path(exhibit))
-        get :index, exhibit_id: exhibit
+        get :index, params: { exhibit_id: exhibit }
         expect(response).to be_successful
         expect(assigns[:searches]).to eq [search]
         expect(assigns[:searches]).to_not include unpublished
@@ -26,7 +26,7 @@ describe Spotlight::BrowseController, type: :controller do
       it 'shows the list of browse categories' do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
         expect(controller).to receive(:add_breadcrumb).with('Browse', exhibit_browse_index_path(exhibit))
-        get :index, exhibit_id: exhibit
+        get :index, params: { exhibit_id: exhibit }
         expect(response).to be_successful
         expect(assigns[:searches]).to eq [search]
         expect(assigns[:searches]).to_not include unpublished
@@ -45,7 +45,7 @@ describe Spotlight::BrowseController, type: :controller do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
         expect(controller).to receive(:add_breadcrumb).with('Browse', exhibit_browse_index_path(exhibit))
         expect(controller).to receive(:add_breadcrumb).with(search.title, exhibit_browse_path(exhibit, search))
-        get :show, id: search, exhibit_id: exhibit
+        get :show, params: { id: search, exhibit_id: exhibit }
         expect(response).to be_successful
         expect(assigns[:search]).to be_a Spotlight::Search
         expect(assigns[:response]).to eq mock_response
@@ -54,7 +54,7 @@ describe Spotlight::BrowseController, type: :controller do
       end
 
       it 'removes all the document actions' do
-        get :show, id: search, exhibit_id: exhibit
+        get :show, params: { id: search, exhibit_id: exhibit }
         expect(controller.blacklight_config.index.document_actions).to be_blank
       end
 
@@ -65,7 +65,7 @@ describe Spotlight::BrowseController, type: :controller do
 
         allow(controller). to receive(:blacklight_config).and_return(config)
 
-        get :show, id: search, exhibit_id: exhibit
+        get :show, params: { id: search, exhibit_id: exhibit }
         expect(controller.blacklight_config.index.document_actions).to match_array [:a, :b, :c]
       end
     end

data/spec/controllers/spotlight/catalog_controller_spec.rb

@@ -9,14 +9,14 @@ describe Spotlight::CatalogController, type: :controller do
   describe 'when the user is not authenticated' do
     describe 'GET admin' do
       it 'redirects to the login page' do
-        get :admin, exhibit_id: exhibit
+        get :admin, params: { exhibit_id: exhibit }
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
 
     describe 'GET edit' do
       it 'is not allowed' do
-        get :edit, exhibit_id: exhibit, id: 'dq287tq6352'
+        get :edit, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
@@ -27,7 +27,7 @@ describe Spotlight::CatalogController, type: :controller do
       it 'shows the item' do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_path(exhibit, q: ''))
         expect(controller).to receive(:add_breadcrumb).with("L'AMERIQUE", exhibit_solr_document_path(exhibit, document))
-        get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+        get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to be_successful
       end
 
@@ -38,7 +38,7 @@ describe Spotlight::CatalogController, type: :controller do
         expect(controller).to receive(:add_breadcrumb).with('Browse', exhibit_browse_index_path(exhibit))
         expect(controller).to receive(:add_breadcrumb).with(search.title, exhibit_browse_path(exhibit, search))
         expect(controller).to receive(:add_breadcrumb).with("L'AMERIQUE", exhibit_solr_document_path(exhibit, document))
-        get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+        get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to be_successful
       end
 
@@ -49,7 +49,7 @@ describe Spotlight::CatalogController, type: :controller do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_path(exhibit, q: ''))
         expect(controller).to receive(:add_breadcrumb).with(feature_page.title, [exhibit, feature_page])
         expect(controller).to receive(:add_breadcrumb).with("L'AMERIQUE", exhibit_solr_document_path(exhibit, document))
-        get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+        get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to be_successful
       end
 
@@ -59,17 +59,17 @@ describe Spotlight::CatalogController, type: :controller do
 
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_path(exhibit, q: ''))
         expect(controller).to receive(:add_breadcrumb).with("L'AMERIQUE", exhibit_solr_document_path(exhibit, document))
-        get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+        get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to be_successful
       end
 
       it 'adds the curation widget' do
-        get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+        get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(controller.blacklight_config.show.partials.first).to eq 'curation_mode_toggle'
       end
 
       it 'does not have a solr_json serialization' do
-        get :show, exhibit_id: exhibit, id: 'dq287tq6352', format: :solr_json
+        get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352', format: :solr_json }
         expect(response).not_to be_successful
       end
     end
@@ -78,11 +78,11 @@ describe Spotlight::CatalogController, type: :controller do
       it 'shows the index when there are parameters' do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_path(exhibit, q: ''))
         expect(controller).to receive(:add_breadcrumb).with('Search Results', search_exhibit_catalog_path(exhibit, q: 'map'))
-        get :index, exhibit_id: exhibit, q: 'map'
+        get :index, params: { exhibit_id: exhibit, q: 'map' }
         expect(response).to be_successful
       end
       it 'redirects to the exhibit home page when there are no parameters' do
-        get :index, exhibit_id: exhibit
+        get :index, params: { exhibit_id: exhibit }
         expect(response).to redirect_to(exhibit_root_path(exhibit))
       end
     end
@@ -90,7 +90,7 @@ describe Spotlight::CatalogController, type: :controller do
     describe 'GET autocomplete' do
       it 'has partial matches for title' do
         # Testing with ps921pn8250 because it has html escapable characters in the title (c'estadire)
-        get :autocomplete, exhibit_id: exhibit, q: 'PLANIS', format: 'json'
+        get :autocomplete, params: { exhibit_id: exhibit, q: 'PLANIS', format: 'json' }
         expect(assigns[:document_list].first.id).to eq 'ps921pn8250'
         expect(response).to be_successful
         json = JSON.parse(response.body)
@@ -103,7 +103,7 @@ describe Spotlight::CatalogController, type: :controller do
         expect(doc['url']).to eq exhibit_solr_document_path(exhibit, id: 'ps921pn8250')
       end
       it 'has partial matches for id' do
-        get :autocomplete, exhibit_id: exhibit, q: 'dx157', format: 'json'
+        get :autocomplete, params: { exhibit_id: exhibit, q: 'dx157', format: 'json' }
         expect(assigns[:document_list].first.id).to eq 'dx157dh4345'
         expect(response).to be_successful
         json = JSON.parse(response.body)
@@ -120,7 +120,7 @@ describe Spotlight::CatalogController, type: :controller do
 
     describe 'GET admin' do
       it 'denies access' do
-        get :admin, exhibit_id: exhibit
+        get :admin, params: { exhibit_id: exhibit }
         expect(response).to redirect_to main_app.root_path
         expect(flash[:alert]).to be_present
       end
@@ -128,7 +128,7 @@ describe Spotlight::CatalogController, type: :controller do
 
     describe 'GET edit' do
       it 'is not allowed' do
-        get :edit, exhibit_id: exhibit, id: 'dq287tq6352'
+        get :edit, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to redirect_to main_app.root_path
         expect(flash[:alert]).to eq 'You are not authorized to access this page.'
       end
@@ -137,7 +137,7 @@ describe Spotlight::CatalogController, type: :controller do
     describe 'GET show with private item' do
       it 'is not allowed' do
         allow_any_instance_of(::SolrDocument).to receive(:private?).and_return(true)
-        get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+        get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to redirect_to main_app.root_path
         expect(flash[:alert]).to eq 'You are not authorized to access this page.'
       end
@@ -145,7 +145,7 @@ describe Spotlight::CatalogController, type: :controller do
 
     describe 'PUT make_public' do
       it 'is not allowed' do
-        put :make_public, exhibit_id: exhibit, id: 'dq287tq6352'
+        put :make_public, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
 
         expect(response).to redirect_to main_app.root_path
         expect(flash[:alert]).to eq 'You are not authorized to access this page.'
@@ -154,7 +154,7 @@ describe Spotlight::CatalogController, type: :controller do
 
     describe 'DELETE make_private' do
       it 'is not allowed' do
-        delete :make_private, exhibit_id: exhibit, id: 'dq287tq6352'
+        delete :make_private, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to redirect_to main_app.root_path
         expect(flash[:alert]).to eq 'You are not authorized to access this page.'
       end
@@ -168,7 +168,7 @@ describe Spotlight::CatalogController, type: :controller do
       expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_path(exhibit, q: ''))
       expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
       expect(controller).to receive(:add_breadcrumb).with('Items', admin_exhibit_catalog_path(exhibit))
-      get :admin, exhibit_id: exhibit
+      get :admin, params: { exhibit_id: exhibit }
       expect(response).to be_successful
       expect(assigns[:document_list]).to be_a Array
       expect(assigns[:exhibit]).to eq exhibit
@@ -177,7 +177,7 @@ describe Spotlight::CatalogController, type: :controller do
     end
 
     it 'uses the admin table view and hide the document actions' do
-      get :admin, exhibit_id: exhibit
+      get :admin, params: { exhibit_id: exhibit }
 
       expect(controller.blacklight_config.view.to_h.keys).to match_array [:admin_table]
       expect(controller.blacklight_config.view.admin_table.document_actions).to be_empty
@@ -185,7 +185,7 @@ describe Spotlight::CatalogController, type: :controller do
 
     describe 'GET edit' do
       it 'is successful' do
-        get :edit, exhibit_id: exhibit, id: 'dq287tq6352'
+        get :edit, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to be_successful
         expect(assigns[:exhibit]).to eq exhibit
         expect(assigns[:document]).to be_kind_of SolrDocument
@@ -194,17 +194,17 @@ describe Spotlight::CatalogController, type: :controller do
     describe 'PATCH update' do
       it 'is successful' do
         expect do
-          patch :update, exhibit_id: exhibit, id: 'dq287tq6352', solr_document: { exhibit_tag_list: 'one, two' }
+          patch :update, params: { exhibit_id: exhibit, id: 'dq287tq6352', solr_document: { exhibit_tag_list: 'one, two' } }
         end.to change { exhibit.owned_taggings.count }.by(2)
       end
       it 'can update non-readonly fields' do
         field = FactoryGirl.create(:custom_field, exhibit: exhibit)
-        patch :update, exhibit_id: exhibit, id: 'dq287tq6352', solr_document: { sidecar: { data: { field.field => 'no' } } }
+        patch :update, params: { exhibit_id: exhibit, id: 'dq287tq6352', solr_document: { sidecar: { data: { field.field => 'no' } } } }
         expect(assigns[:document].sidecar(exhibit).data).to eq(field.field => 'no')
       end
       it "can't update readonly fields" do
         field = FactoryGirl.create(:custom_field, exhibit: exhibit, readonly_field: true)
-        patch :update, exhibit_id: exhibit, id: 'dq287tq6352', solr_document: { sidecar: { data: { field.field => 'no' } } }
+        patch :update, params: { exhibit_id: exhibit, id: 'dq287tq6352', solr_document: { sidecar: { data: { field.field => 'no' } } } }
         expect(assigns[:document].sidecar(exhibit).data).to eq({})
       end
     end
@@ -218,7 +218,7 @@ describe Spotlight::CatalogController, type: :controller do
       it 'is successful' do
         expect_any_instance_of(::SolrDocument).to receive(:reindex)
         expect_any_instance_of(::SolrDocument).to receive(:make_public!).with(exhibit)
-        put :make_public, exhibit_id: exhibit, id: 'dq287tq6352'
+        put :make_public, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to redirect_to 'where_i_came_from'
       end
     end
@@ -232,7 +232,7 @@ describe Spotlight::CatalogController, type: :controller do
       it 'is successful' do
         expect_any_instance_of(::SolrDocument).to receive(:reindex)
         expect_any_instance_of(::SolrDocument).to receive(:make_private!).with(exhibit)
-        delete :make_private, exhibit_id: exhibit, id: 'dq287tq6352'
+        delete :make_private, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
         expect(response).to redirect_to 'where_i_came_from'
       end
     end
@@ -243,7 +243,7 @@ describe Spotlight::CatalogController, type: :controller do
 
     describe 'GET show' do
       it 'has a solr_json serialization' do
-        get :show, exhibit_id: exhibit, id: 'dq287tq6352', format: :solr_json
+        get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352', format: :solr_json }
         expect(response).to be_successful
         data = JSON.parse(response.body).with_indifferent_access
         expect(data).to include id: 'dq287tq6352'
@@ -278,7 +278,7 @@ describe Spotlight::CatalogController, type: :controller do
       end
 
       it 'preserves query parameters' do
-        get :index, q: 'xyz', exhibit_id: exhibit
+        get :index, params: { q: 'xyz', exhibit_id: exhibit }
         url = subject.exhibit_search_facet_url(id: 'x')
         expect(url).to include '?q=xyz'
       end
@@ -310,7 +310,7 @@ describe Spotlight::CatalogController, type: :controller do
         end
 
         it 'uses the saved search context' do
-          get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+          get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
 
           expect(assigns(:previous_document)).to eq first_doc
           expect(assigns(:next_document)).to eq last_doc
@@ -323,7 +323,7 @@ describe Spotlight::CatalogController, type: :controller do
         end
 
         it 'ignores the search context' do
-          get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+          get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
 
           expect(assigns(:previous_document)).to be_nil
           expect(assigns(:next_document)).to be_nil
@@ -344,7 +344,7 @@ describe Spotlight::CatalogController, type: :controller do
 
         it 'uses the page context' do
           pending 'Waiting to figure out how to construct previous/next documents'
-          get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+          get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
 
           expect(assigns(:previous_document)).to be_a_kind_of SolrDocument
           expect(assigns(:next_document)).to be_a_kind_of SolrDocument
@@ -357,7 +357,7 @@ describe Spotlight::CatalogController, type: :controller do
         end
 
         it 'ignores the search context' do
-          get :show, exhibit_id: exhibit, id: 'dq287tq6352'
+          get :show, params: { exhibit_id: exhibit, id: 'dq287tq6352' }
 
           expect(assigns(:previous_document)).to be_nil
           expect(assigns(:next_document)).to be_nil