blacklight-spotlight 3.0.0.alpha.2 → 3.0.0.alpha.3

data/spec/controllers/spotlight/admin_users_controller_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe Spotlight::AdminUsersController, type: :controller do
 
   context 'by a non-admin' do
     let(:user) { FactoryBot.create(:exhibit_visitor) }
+
     it 'redirects with an error message' do
       get :index
       expect(response).to redirect_to '/'
@@ -18,6 +19,7 @@ RSpec.describe Spotlight::AdminUsersController, type: :controller do
     before { request.env['HTTP_REFERER'] = 'http://example.com' }
 
     let(:user) { FactoryBot.create(:site_admin) }
+
     describe 'GET index' do
       it 'is successful' do
         get :index
@@ -28,6 +30,7 @@ RSpec.describe Spotlight::AdminUsersController, type: :controller do
     describe 'DELETE destroy' do
       let(:user) { FactoryBot.create(:user) }
       let!(:admin_role) { FactoryBot.create(:role, role: 'admin', user: user, resource: Spotlight::Site.instance) }
+
       it 'removes the site admin role from the given user' do
         delete :destroy, params: { id: user.id }
         expect(response).to redirect_to(admin_users_path)
@@ -38,6 +41,7 @@ RSpec.describe Spotlight::AdminUsersController, type: :controller do
 
     describe 'PATCH update' do
       let(:non_admin) { FactoryBot.create(:exhibit_visitor) }
+
       it 'adds the site admin role to the given user' do
         patch :update, params: { id: non_admin.id }
         expect(response).to redirect_to(admin_users_path)

data/spec/controllers/spotlight/appearances_controller_spec.rb

@@ -29,6 +29,7 @@ describe Spotlight::AppearancesController, type: :controller do
 
   describe 'when signed in' do
     let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
     before { sign_in user }
 
     describe 'GET edit' do
@@ -67,6 +68,7 @@ describe Spotlight::AppearancesController, type: :controller do
           1 => { id: last_nav.id, display: false }
         }
       end
+
       it 'updates the navigation' do
         patch :update, params: submitted
         expect(flash[:notice]).to eq 'The exhibit was successfully updated.'

data/spec/controllers/spotlight/application_controller_spec.rb

@@ -3,6 +3,7 @@
 describe Spotlight::ApplicationController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryBot.create(:exhibit) }
+
   it 'provides a search_action_url override' do
     allow(controller).to receive_messages(current_exhibit: exhibit)
     expect(controller.search_action_url(q: 'query')).to eq search_exhibit_catalog_url(exhibit, q: 'query')

data/spec/controllers/spotlight/attachments_controller_spec.rb

@@ -3,6 +3,7 @@
 describe Spotlight::AttachmentsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryBot.create(:exhibit) }
+
   describe 'when not logged in' do
     describe 'GET edit' do
       it 'is successful' do
@@ -14,6 +15,7 @@ describe Spotlight::AttachmentsController, type: :controller do
 
   describe 'when signed in as a curator' do
     let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+
     before { sign_in user }
 
     describe 'POST create' do

data/spec/controllers/spotlight/browse_controller_spec.rb

@@ -49,7 +49,7 @@ describe Spotlight::BrowseController, type: :controller do
         get :index, params: { exhibit_id: exhibit }
         expect(response).to be_successful
         expect(assigns[:searches]).to eq [search]
-        expect(assigns[:searches]).to_not include unpublished
+        expect(assigns[:searches]).not_to include unpublished
         expect(assigns[:exhibit]).to eq exhibit
         expect(response).to render_template 'spotlight/browse/index'
       end
@@ -64,7 +64,7 @@ describe Spotlight::BrowseController, type: :controller do
         get :index, params: { exhibit_id: exhibit }
         expect(response).to be_successful
         expect(assigns[:searches]).to eq [search]
-        expect(assigns[:searches]).to_not include unpublished
+        expect(assigns[:searches]).not_to include unpublished
         expect(assigns[:exhibit]).to eq exhibit
         expect(response).to render_template 'spotlight/browse/index'
       end
@@ -73,6 +73,7 @@ describe Spotlight::BrowseController, type: :controller do
     describe 'GET show' do
       let(:mock_response) { double aggregations: {} }
       let(:document_list) { double }
+
       before do
         allow(controller).to receive_messages(search_service: double(search_results: [mock_response, document_list]))
       end
@@ -96,13 +97,13 @@ describe Spotlight::BrowseController, type: :controller do
 
       it 'uses the blacklight.browse configuration for the document actions' do
         config = Blacklight::Configuration.new do |c|
-          c.browse.document_actions = [:a, :b, :c]
+          c.browse.document_actions = %i[a b c]
         end
 
         allow(controller). to receive(:blacklight_config).and_return(config)
 
         get :show, params: { id: search, exhibit_id: exhibit }
-        expect(controller.blacklight_config.index.document_actions).to match_array [:a, :b, :c]
+        expect(controller.blacklight_config.index.document_actions).to match_array %i[a b c]
       end
 
       it 'has a json response' do

data/spec/controllers/spotlight/catalog_controller_spec.rb

@@ -7,7 +7,7 @@ describe Spotlight::CatalogController, type: :controller do
 
   it { is_expected.to be_a_kind_of ::CatalogController }
   it { is_expected.to be_a_kind_of Spotlight::Concerns::ApplicationController }
-  its(:view_context) { should be_a_kind_of Spotlight::ApplicationHelper }
+  its(:view_context) { is_expected.to be_a_kind_of Spotlight::ApplicationHelper }
 
   describe 'when the user is not authenticated' do
     describe 'GET admin' do
@@ -27,6 +27,7 @@ describe Spotlight::CatalogController, type: :controller do
     describe 'GET show' do
       let(:document) { SolrDocument.new(id: 'dq287tq6352') }
       let(:search) { FactoryBot.create(:search, exhibit: exhibit) }
+
       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))
@@ -84,6 +85,7 @@ describe Spotlight::CatalogController, type: :controller do
         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, params: { exhibit_id: exhibit }
         expect(response).to redirect_to(exhibit_root_path(exhibit))
@@ -105,6 +107,7 @@ describe Spotlight::CatalogController, type: :controller do
         expect(doc['thumbnail']).to eq assigns[:document_list].first.first(:thumbnail_url_ssm)
         expect(doc['url']).to eq exhibit_solr_document_path(exhibit, id: 'ps921pn8250')
       end
+
       it 'has partial matches for id' do
         get :autocomplete, params: { exhibit_id: exhibit, q: 'dx157', format: 'json' }
         expect(assigns[:document_list].first.id).to eq 'dx157dh4345'
@@ -244,11 +247,13 @@ describe Spotlight::CatalogController, type: :controller do
           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 = FactoryBot.create(:custom_field, exhibit: exhibit)
         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 = FactoryBot.create(:custom_field, exhibit: exhibit, readonly_field: true)
         patch :update, params: { exhibit_id: exhibit, id: 'dq287tq6352', solr_document: { sidecar: { data: { field.field => 'no' } } } }
@@ -422,6 +427,7 @@ describe Spotlight::CatalogController, type: :controller do
 
   describe '#field_enabled?' do
     let(:field) { FactoryBot.create(:custom_field) }
+
     before do
       controller.extend(Blacklight::Catalog)
       allow(controller).to receive(:document_index_view_type).and_return(nil)
@@ -430,6 +436,7 @@ describe Spotlight::CatalogController, type: :controller do
 
     context 'for sort fields' do
       let(:field) { Blacklight::Configuration::SortField.new enabled: true }
+
       it 'uses the enabled property for sort fields' do
         expect(controller.field_enabled?(field)).to eq true
       end
@@ -437,6 +444,7 @@ describe Spotlight::CatalogController, type: :controller do
 
     context 'for search fields' do
       let(:field) { Blacklight::Configuration::SearchField.new enabled: true }
+
       it 'uses the enabled property for search fields' do
         expect(controller.field_enabled?(field)).to eq true
       end
@@ -447,11 +455,13 @@ describe Spotlight::CatalogController, type: :controller do
       allow(controller).to receive(:action_name).and_return('show')
       expect(controller.field_enabled?(field)).to eq :value
     end
+
     it 'returns the value of field#show if the action_name is "edit"' do
       allow(field).to receive(:show).and_return(:value)
       allow(controller).to receive(:action_name).and_return('edit')
       expect(controller.field_enabled?(field)).to eq :value
     end
+
     it 'returns the value of the original if condition' do
       allow(field).to receive(:original).and_return false
       expect(controller.field_enabled?(field)).to eq false
@@ -460,6 +470,7 @@ describe Spotlight::CatalogController, type: :controller do
 
   describe '#enabled_in_spotlight_view_type_configuration?' do
     let(:view) { OpenStruct.new }
+
     before do
       controller.extend(Blacklight::Catalog)
     end
@@ -483,22 +494,25 @@ describe Spotlight::CatalogController, type: :controller do
 
   describe 'save_search rendering' do
     let(:current_exhibit) { FactoryBot.create(:exhibit) }
+
     before { allow(controller).to receive_messages(current_exhibit: current_exhibit) }
 
     describe 'render_save_this_search?' do
       it 'returns false if we are on the items admin screen' do
         allow(controller).to receive(:can?).with(:curate, current_exhibit).and_return(true)
         allow(controller).to receive(:params).and_return(controller: 'spotlight/catalog', action: 'admin')
-        expect(controller.render_save_this_search?).to be_falsey
+        expect(controller).not_to be_render_save_this_search
       end
+
       it 'returns true if we are not on the items admin screen' do
         allow(controller).to receive(:can?).with(:curate, current_exhibit).and_return(true)
         allow(controller).to receive(:params).and_return(controller: 'spotlight/catalog', action: 'index')
-        expect(controller.render_save_this_search?).to be_truthy
+        expect(controller).to be_render_save_this_search
       end
+
       it 'returns false if a user cannot curate the object' do
         allow(controller).to receive(:can?).with(:curate, current_exhibit).and_return(false)
-        expect(controller.render_save_this_search?).to be_falsey
+        expect(controller).not_to be_render_save_this_search
       end
     end
   end

data/spec/controllers/spotlight/confirmations_controller_spec.rb

@@ -19,6 +19,7 @@ describe Spotlight::ConfirmationsController, type: :controller do
     let(:exhibit) { FactoryBot.create(:exhibit) }
     let(:contact_email) { FactoryBot.create(:contact_email, email: 'justin@example.com', exhibit: exhibit) }
     let(:raw_token) { contact_email.instance_variable_get(:@raw_confirmation_token) }
+
     describe 'when the token is invalid' do
       it 'gives reset instructions' do
         get :show

data/spec/controllers/spotlight/contact_forms_controller_spec.rb

@@ -24,10 +24,12 @@ describe Spotlight::ContactFormsController, type: :controller do
         post :create, params: { exhibit_id: exhibit.id, contact_form: { name: 'Joe Doe', email: 'jdoe@example.com', honeypot_field_name => '' } }
       end.to change { ActionMailer::Base.deliveries.count }.by(1)
     end
+
     it 'redirects back' do
       post :create, params: { exhibit_id: exhibit.id, contact_form: { name: 'Joe Doe', email: 'jdoe@example.com', honeypot_field_name => '' } }
       expect(response).to redirect_to 'http://example.com'
     end
+
     it 'sets a flash message' do
       post :create, params: { exhibit_id: exhibit.id, contact_form: { name: 'Joe Doe', email: 'jdoe@example.com', honeypot_field_name => '' } }
       expect(flash[:notice]).to eq 'Thanks. Your feedback has been sent.'

data/spec/controllers/spotlight/contacts_controller_spec.rb

@@ -5,6 +5,7 @@ describe Spotlight::ContactsController, type: :controller do
   describe 'when not logged in' do
     describe 'GET edit' do
       let(:contact) { FactoryBot.create(:contact) }
+
       it 'is successful' do
         get :edit, params: { id: contact, exhibit_id: contact.exhibit }
         expect(response).to redirect_to main_app.new_user_session_path
@@ -16,6 +17,7 @@ describe Spotlight::ContactsController, type: :controller do
     let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
     let(:exhibit) { FactoryBot.create(:exhibit) }
     let(:contact) { FactoryBot.create(:contact, exhibit: exhibit, name: 'Andrew Carnegie') }
+
     before { sign_in user }
 
     describe 'GET edit' do
@@ -87,6 +89,7 @@ describe Spotlight::ContactsController, type: :controller do
         post :create, params: { exhibit_id: exhibit, contact: { name: 'Chester' } }
         expect(response).to render_template 'new'
       end
+
       it 'is successful' do
         expect do
           post :create, params: { exhibit_id: exhibit, contact: { name: 'Chester', avatar_attributes: { iiif_tilesource: 'someurl' } } }

data/spec/controllers/spotlight/custom_fields_controller_spec.rb

@@ -6,6 +6,7 @@ describe Spotlight::CustomFieldsController, type: :controller do
 
   describe 'when signed in as an exhibit admin' do
     let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
     before { sign_in user }
 
     describe 'GET new' do
@@ -21,6 +22,7 @@ describe Spotlight::CustomFieldsController, type: :controller do
 
     describe 'GET edit' do
       let(:field) { FactoryBot.create(:custom_field, exhibit: exhibit) }
+
       it 'assigns the requested custom_field' do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
         expect(controller).to receive(:add_breadcrumb).with('Configuration', exhibit_dashboard_path(exhibit))

data/spec/controllers/spotlight/custom_search_fields_controller_spec.rb

@@ -6,6 +6,7 @@ describe Spotlight::CustomSearchFieldsController, type: :controller do
 
   describe 'when signed in as an exhibit admin' do
     let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
     before { sign_in user }
 
     describe 'GET new' do
@@ -21,6 +22,7 @@ describe Spotlight::CustomSearchFieldsController, type: :controller do
 
     describe 'GET edit' do
       let(:field) { FactoryBot.create(:custom_search_field, exhibit: exhibit) }
+
       it 'assigns the requested custom_field' do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
         expect(controller).to receive(:add_breadcrumb).with('Configuration', exhibit_dashboard_path(exhibit))

data/spec/controllers/spotlight/dashboards_controller_spec.rb

@@ -11,6 +11,7 @@ describe Spotlight::DashboardsController, type: :controller do
 
   describe 'when logged in' do
     let(:curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+
     before { sign_in curator }
 
     describe 'GET show' do

data/spec/controllers/spotlight/exhibits_controller_spec.rb

@@ -87,6 +87,7 @@ describe Spotlight::ExhibitsController, type: :controller do
 
   describe 'when signed in as a site admin' do
     let(:user) { FactoryBot.create(:site_admin) }
+
     before { sign_in user }
 
     describe 'GET new' do
@@ -121,12 +122,13 @@ describe Spotlight::ExhibitsController, type: :controller do
 
   describe 'when signed in as an exhibit admin' do
     let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
     before { sign_in user }
 
     describe 'GET new' do
       it 'is not allowed' do
         get :new
-        expect(response).to_not be_successful
+        expect(response).not_to be_successful
       end
     end
 
@@ -205,7 +207,7 @@ describe Spotlight::ExhibitsController, type: :controller do
     describe '#destroy' do
       it 'is successful' do
         delete :destroy, params: { id: exhibit }
-        expect(Spotlight::Exhibit.exists?(exhibit.id)).to be_falsey
+        expect(Spotlight::Exhibit).not_to exist(exhibit.id)
         expect(flash[:notice]).to eq 'The exhibit was deleted.'
         expect(response).to redirect_to main_app.root_path
       end

data/spec/controllers/spotlight/feature_pages_controller_spec.rb

@@ -3,8 +3,11 @@
 describe Spotlight::FeaturePagesController, type: :controller, versioning: true do
   routes { Spotlight::Engine.routes }
 
+  let(:valid_attributes) { { 'title' => 'MyString', thumbnail_attributes: { iiif_url: '' } } }
+
   describe 'when not logged in' do
     let(:exhibit) { FactoryBot.create(:exhibit) }
+
     describe 'GET clone' do
       let(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
 
@@ -19,14 +22,16 @@ describe Spotlight::FeaturePagesController, type: :controller, versioning: true
   # This should return the minimal set of attributes required to create a valid
   # Page. As you add validations to Page, be sure to
   # adjust the attributes here as well.
-  let(:valid_attributes) { { 'title' => 'MyString', thumbnail_attributes: { iiif_url: '' } } }
+
   describe 'when signed in as a curator' do
     let(:exhibit) { FactoryBot.create(:exhibit) }
     let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+
     before { sign_in user }
 
     describe 'GET index' do
       let!(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+
       it 'assigns all feature pages as @pages' 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))
@@ -40,6 +45,7 @@ describe Spotlight::FeaturePagesController, type: :controller, versioning: true
     describe 'GET show' do
       describe 'on a top level page' do
         let(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+
         it 'assigns the requested page as @page' do
           expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
           expect(controller).to receive(:add_breadcrumb).with(page.title, [a_kind_of(ActionDispatch::Routing::RoutesProxy), exhibit, page])
@@ -50,6 +56,7 @@ describe Spotlight::FeaturePagesController, type: :controller, versioning: true
 
       describe 'on a sub-page' do
         let(:page) { FactoryBot.create(:feature_subpage, exhibit: exhibit) }
+
         it 'assigns the requested page as @page' do
           expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
           expect(controller).to receive(:add_breadcrumb).with(
@@ -97,6 +104,7 @@ describe Spotlight::FeaturePagesController, type: :controller, versioning: true
 
     describe 'GET edit' do
       let(:page) { FactoryBot.create(:feature_subpage, exhibit: exhibit) }
+
       it 'assigns the requested page as @page' do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit_root_path(exhibit))
         expect(controller).to receive(:add_breadcrumb).with('Feature pages', exhibit_feature_pages_path(exhibit))
@@ -122,6 +130,7 @@ describe Spotlight::FeaturePagesController, type: :controller, versioning: true
           expect(assigns(:page)).to be_a(Spotlight::FeaturePage)
           expect(assigns(:page)).to be_persisted
         end
+
         it 'redirects to the feature page index' do
           post :create, params: { feature_page: { title: 'MyString' }, exhibit_id: exhibit }
           expect(response).to redirect_to(exhibit_feature_pages_path(Spotlight::FeaturePage.last.exhibit))
@@ -147,6 +156,7 @@ describe Spotlight::FeaturePagesController, type: :controller, versioning: true
 
     describe 'PUT update' do
       let(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+
       describe 'with valid params' do
         it 'updates the requested page' do
           expect_any_instance_of(Spotlight::FeaturePage).to receive(:update)
@@ -187,6 +197,7 @@ describe Spotlight::FeaturePagesController, type: :controller, versioning: true
       let!(:page1) { FactoryBot.create(:feature_page, exhibit: exhibit) }
       let!(:page2) { FactoryBot.create(:feature_page, exhibit: page1.exhibit) }
       let!(:page3) { FactoryBot.create(:feature_page, exhibit: page1.exhibit, parent_page_id: page1.id) }
+
       before { request.env['HTTP_REFERER'] = 'http://example.com' }
 
       it 'updates the parent/child relationship' do
@@ -201,6 +212,7 @@ describe Spotlight::FeaturePagesController, type: :controller, versioning: true
 
     describe 'DELETE destroy' do
       let!(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+
       it 'destroys the requested page' do
         expect do
           delete :destroy, params: { id: page, exhibit_id: page.exhibit.id }

data/spec/controllers/spotlight/featured_images_controller_spec.rb

@@ -26,6 +26,7 @@ describe Spotlight::FeaturedImagesController, type: :controller do
 
   describe 'when signed in as a site admin' do
     let(:user) { FactoryBot.create(:site_admin) }
+
     before { sign_in user }
 
     describe 'POST create a thumbnail' do

data/spec/controllers/spotlight/home_pages_controller_spec.rb

@@ -8,6 +8,7 @@ describe Spotlight::HomePagesController, type: :controller, versioning: true do
 
   describe 'when signed in as a curator' do
     let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+
     before do
       sign_in user
     end
@@ -50,16 +51,18 @@ describe Spotlight::HomePagesController, type: :controller, versioning: true do
     it 'gets search results for display facets' do
       allow(controller).to receive_messages(search_results: [double, double])
       get :show, params: { exhibit_id: exhibit }
-      expect(assigns[:response]).to_not be_blank
-      expect(assigns[:document_list]).to_not be_blank
+      expect(assigns[:response]).not_to be_blank
+      expect(assigns[:document_list]).not_to be_blank
       expect(assigns[:page]).to eq exhibit.home_page
     end
+
     it 'does not render breadcrumbs' do
       expect(controller).not_to receive(:add_breadcrumb)
       allow(controller).to receive_messages(search_results: [double, double])
       get :show, params: { exhibit_id: exhibit }
       expect(response).to be_successful
     end
+
     it 'does not do the search when the sidebar is hidden' do
       page.display_sidebar = false
       page.save