blacklight-spotlight 1.0.0 → 1.1.0

data/spec/controllers/spotlight/confirmations_controller_spec.rb

@@ -14,7 +14,7 @@ describe Spotlight::ConfirmationsController, type: :controller do
   end
 
   describe 'GET show' do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     let(:contact_email) { Spotlight::ContactEmail.create!(email: 'justin@example.com', exhibit: exhibit) }
     let(:raw_token) { contact_email.instance_variable_get(:@raw_confirmation_token) }
     describe 'when the token is invalid' do

data/spec/controllers/spotlight/contact_email_controller_spec.rb

@@ -0,0 +1,63 @@
+describe Spotlight::ContactEmailController, type: :controller do
+  routes { Spotlight::Engine.routes }
+  let(:contact_email) { FactoryBot.create(:contact_email) }
+
+  context 'when not logged in' do
+    describe 'DELETE destroy' do
+      it 'redirects to the login page' do
+        # note about odd behavior: it was discovered in testing that if format: :json is explicitly specified here, the user is redirected
+        # to login on rails 4, but gets a 401 on rails 5.  we suspect differing CanCan behavior, but didn't investigate in depth.
+        delete :destroy, params: { id: contact_email, exhibit_id: contact_email.exhibit }
+        # custom logic in ApplicationController redirects user to app login page on CanCan::AccessDenied if user can't read current exhibit
+        expect(response).to redirect_to main_app.new_user_session_path
+      end
+    end
+  end
+
+  context 'when logged in' do
+    before { sign_in user }
+
+    context 'as a visitor' do
+      let(:user) { FactoryBot.create(:exhibit_visitor) }
+
+      describe 'DELETE destroy' do
+        it 'redirects to the home page' do
+          delete :destroy, params: { id: contact_email, exhibit_id: contact_email.exhibit }
+          # custom logic in ApplicationController redirects user to app root on CanCan::AccessDenied if user's allowed to view current exhibit
+          expect(response).to redirect_to main_app.root_path
+        end
+      end
+    end
+
+    context 'as an exhibit curator' do
+      let(:user) { FactoryBot.create(:exhibit_curator, exhibit: contact_email.exhibit) }
+
+      describe 'DELETE destroy' do
+        it 'redirects to the home page' do
+          delete :destroy, params: { id: contact_email, exhibit_id: contact_email.exhibit }
+          # custom logic in ApplicationController redirects user to app root on CanCan::AccessDenied if user's allowed to view current exhibit
+          expect(response).to redirect_to main_app.root_path
+        end
+      end
+    end
+
+    context 'as an exhibit admin' do
+      let(:user) { FactoryBot.create(:exhibit_admin, exhibit: contact_email.exhibit) }
+
+      describe 'DELETE destroy' do
+        it 'is successful when the record exists' do
+          delete :destroy, params: { id: contact_email, exhibit_id: contact_email.exhibit }
+          expect(response).to be_successful
+          expect(JSON.parse(response.body)).to eq('success' => true, 'error' => nil)
+        end
+
+        it 'gives a 404 with appropriate message when the record no longer exists' do
+          contact_email.destroy
+          delete :destroy, params: { id: contact_email, exhibit_id: contact_email.exhibit }
+          expect(response.status).to eq 404
+          expect(JSON.parse(response.body)).to eq('success' => false, 'error' => 'Not Found')
+        end
+      end
+    end
+  end
+end

data/spec/controllers/spotlight/contact_forms_controller_spec.rb

@@ -1,6 +1,6 @@
 describe Spotlight::ContactFormsController, type: :controller do
   routes { Spotlight::Engine.routes }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:honeypot_field_name) { Spotlight::Engine.config.spambot_honeypot_email_field }
 
   before do

data/spec/controllers/spotlight/contacts_controller_spec.rb

@@ -2,7 +2,7 @@ describe Spotlight::ContactsController, type: :controller do
   routes { Spotlight::Engine.routes }
   describe 'when not logged in' do
     describe 'GET edit' do
-      let(:contact) { FactoryGirl.create(:contact) }
+      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
@@ -11,9 +11,9 @@ describe Spotlight::ContactsController, type: :controller do
   end
 
   describe 'when signed in as a curator' do
-    let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
-    let(:contact) { FactoryGirl.create(:contact, exhibit: exhibit, name: 'Andrew Carnegie') }
+    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
@@ -34,7 +34,7 @@ describe Spotlight::ContactsController, type: :controller do
       end
 
       it 'allows thumbnails to be updated' do
-        contact = FactoryGirl.create(:contact, exhibit: exhibit, name: 'Andrew Carnegie')
+        contact = FactoryBot.create(:contact, exhibit: exhibit, name: 'Andrew Carnegie')
         patch :update, params: {
           id: contact,
           contact: {

data/spec/controllers/spotlight/custom_fields_controller_spec.rb

@@ -1,9 +1,9 @@
 describe Spotlight::CustomFieldsController, type: :controller do
   routes { Spotlight::Engine.routes }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   describe 'when signed in as an exhibit admin' do
-    let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
     before { sign_in user }
 
     describe 'GET new' do
@@ -18,7 +18,7 @@ describe Spotlight::CustomFieldsController, type: :controller do
     end
 
     describe 'GET edit' do
-      let(:field) { FactoryGirl.create(:custom_field, exhibit: exhibit) }
+      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/dashboards_controller_spec.rb

@@ -1,7 +1,7 @@
 
 describe Spotlight::DashboardsController, type: :controller do
   routes { Spotlight::Engine.routes }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:repository) { double }
 
   before do
@@ -9,7 +9,7 @@ describe Spotlight::DashboardsController, type: :controller do
   end
 
   describe 'when logged in' do
-    let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+    let(:curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
     before { sign_in curator }
     describe 'GET show' do
       it 'loads the exhibit' do
@@ -38,7 +38,7 @@ describe Spotlight::DashboardsController, type: :controller do
   end
 
   describe 'when user does not have access' do
-    before { sign_in FactoryGirl.create(:exhibit_visitor) }
+    before { sign_in FactoryBot.create(:exhibit_visitor) }
     it 'does not allow show' do
       get :show, params: { exhibit_id: exhibit.id }
       expect(response).to redirect_to main_app.root_path

data/spec/controllers/spotlight/exhibits_controller_spec.rb

@@ -2,7 +2,7 @@ require 'rack/test'
 
 describe Spotlight::ExhibitsController, type: :controller do
   routes { Spotlight::Engine.routes }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   before do
     allow(Spotlight::DefaultThumbnailJob).to receive(:perform_later)
@@ -10,7 +10,7 @@ describe Spotlight::ExhibitsController, type: :controller do
 
   describe 'when the user is not authorized' do
     before do
-      sign_in FactoryGirl.create(:exhibit_visitor)
+      sign_in FactoryBot.create(:exhibit_visitor)
     end
 
     describe 'GET edit' do
@@ -67,7 +67,7 @@ describe Spotlight::ExhibitsController, type: :controller do
   end
 
   describe 'when signed in as a site admin' do
-    let(:user) { FactoryGirl.create(:site_admin) }
+    let(:user) { FactoryBot.create(:site_admin) }
     before { sign_in user }
 
     describe 'GET new' do
@@ -101,7 +101,7 @@ describe Spotlight::ExhibitsController, type: :controller do
   end
 
   describe 'when signed in as an exhibit admin' do
-    let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
     before { sign_in user }
 
     describe 'GET new' do

data/spec/controllers/spotlight/feature_pages_controller_spec.rb

@@ -1,4 +1,4 @@
-describe Spotlight::FeaturePagesController, type: :controller do
+describe Spotlight::FeaturePagesController, type: :controller, versioning: true do
   routes { Spotlight::Engine.routes }
 
   # This should return the minimal set of attributes required to create a valid
@@ -6,12 +6,12 @@ describe Spotlight::FeaturePagesController, type: :controller do
   # 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) { FactoryGirl.create(:exhibit) }
-    let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
     before { sign_in user }
 
     describe 'GET index' do
-      let!(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
+      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))
@@ -24,7 +24,7 @@ describe Spotlight::FeaturePagesController, type: :controller do
 
     describe 'GET show' do
       describe 'on a top level page' do
-        let(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
+        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, [exhibit, page])
@@ -33,7 +33,7 @@ describe Spotlight::FeaturePagesController, type: :controller do
         end
       end
       describe 'on a sub-page' do
-        let(:page) { FactoryGirl.create(:feature_subpage, exhibit: exhibit) }
+        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(page.parent_page.title, [exhibit, page.parent_page])
@@ -53,7 +53,7 @@ describe Spotlight::FeaturePagesController, type: :controller do
     end
 
     describe 'GET edit' do
-      let(:page) { FactoryGirl.create(:feature_subpage, exhibit: exhibit) }
+      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))
@@ -101,7 +101,7 @@ describe Spotlight::FeaturePagesController, type: :controller do
     end
 
     describe 'PUT update' do
-      let(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
+      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)
@@ -139,9 +139,9 @@ describe Spotlight::FeaturePagesController, type: :controller do
     end
 
     describe 'POST update_all' do
-      let!(:page1) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
-      let!(:page2) { FactoryGirl.create(:feature_page, exhibit: page1.exhibit) }
-      let!(:page3) { FactoryGirl.create(:feature_page, exhibit: page1.exhibit, parent_page_id: page1.id) }
+      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
         post :update_all, params: { exhibit_id: page1.exhibit, exhibit: { feature_pages_attributes: [{ id: page2.id, parent_page_id: page1.id }] } }
@@ -154,7 +154,7 @@ describe Spotlight::FeaturePagesController, type: :controller do
     end
 
     describe 'DELETE destroy' do
-      let!(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
+      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

@@ -3,7 +3,7 @@ describe Spotlight::FeaturedImagesController, type: :controller do
 
   describe 'when the user is not authorized' do
     before do
-      sign_in FactoryGirl.create(:exhibit_visitor)
+      sign_in FactoryBot.create(:exhibit_visitor)
     end
 
     describe 'POST create' do
@@ -23,7 +23,7 @@ describe Spotlight::FeaturedImagesController, type: :controller do
   end
 
   describe 'when signed in as a site admin' do
-    let(:user) { FactoryGirl.create(:site_admin) }
+    let(:user) { FactoryBot.create(:site_admin) }
     before { sign_in user }
 
     describe 'POST create a thumbnail' do

data/spec/controllers/spotlight/filters_controller_spec.rb

@@ -2,7 +2,7 @@ describe Spotlight::FiltersController do
   routes { Spotlight::Engine.routes }
 
   describe '#create' do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     let(:exhibit_filter) { exhibit.filters.first }
 
     before do
@@ -18,7 +18,7 @@ describe Spotlight::FiltersController do
 
     context 'when signed in as a site admin' do
       before { sign_in user }
-      let(:user) { FactoryGirl.create(:site_admin) }
+      let(:user) { FactoryBot.create(:site_admin) }
 
       it 'is successful' do
         post :create, params: { exhibit_id: exhibit, filter: { field: 'foo_ssi', value: 'bar' } }
@@ -35,7 +35,7 @@ describe Spotlight::FiltersController do
   end
 
   describe '#update' do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     let(:exhibit_filter) { exhibit.filters.first }
 
     before do
@@ -51,7 +51,7 @@ describe Spotlight::FiltersController do
 
     context 'when signed in as a site admin' do
       before { sign_in user }
-      let(:user) { FactoryGirl.create(:site_admin) }
+      let(:user) { FactoryBot.create(:site_admin) }
 
       it 'is successful' do
         patch :update, params: { exhibit_id: exhibit, id: exhibit_filter, filter: { field: 'foo_ssi', value: 'bar' } }

data/spec/controllers/spotlight/home_pages_controller_spec.rb

@@ -1,11 +1,11 @@
-describe Spotlight::HomePagesController, type: :controller do
+describe Spotlight::HomePagesController, type: :controller, versioning: true do
   routes { Spotlight::Engine.routes }
   let(:valid_attributes) { { 'title' => 'MyString', thumbnail: { iiif_url: '' } } }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:page) { exhibit.home_page }
 
   describe 'when signed in as a curator' do
-    let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
     before do
       sign_in user
     end
@@ -76,7 +76,7 @@ describe Spotlight::HomePagesController, type: :controller do
       end
 
       it 'redirects an unauthorized user to the signin path' do
-        user = FactoryGirl.create(:exhibit_curator)
+        user = FactoryBot.create(:exhibit_curator)
         sign_in user
         expect do
           get :show, params: { exhibit_id: exhibit }
@@ -84,7 +84,7 @@ describe Spotlight::HomePagesController, type: :controller do
       end
 
       it 'redirects an authorized user to the signin path' do
-        user = FactoryGirl.create(:exhibit_curator, exhibit: exhibit)
+        user = FactoryBot.create(:exhibit_curator, exhibit: exhibit)
         sign_in user
         get :show, params: { exhibit_id: exhibit }
         expect(response).to be_successful

data/spec/controllers/spotlight/metadata_configurations_controller_spec.rb

@@ -1,10 +1,10 @@
 describe Spotlight::MetadataConfigurationsController, type: :controller do
   routes { Spotlight::Engine.routes }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   describe 'when the user is not authorized' do
     before do
-      sign_in FactoryGirl.create(:exhibit_visitor)
+      sign_in FactoryBot.create(:exhibit_visitor)
     end
 
     describe 'GET show' do
@@ -41,7 +41,7 @@ describe Spotlight::MetadataConfigurationsController, type: :controller do
   end
 
   describe 'when signed in' do
-    let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
     before { sign_in user }
 
     describe 'GET edit' do

data/spec/controllers/spotlight/resources/csv_upload_controller_spec.rb

@@ -1,7 +1,7 @@
 
 describe Spotlight::Resources::CsvUploadController, type: :controller do
   routes { Spotlight::Engine.routes }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   describe 'when not logged in' do
     describe 'POST create' do
@@ -13,7 +13,7 @@ describe Spotlight::Resources::CsvUploadController, type: :controller do
   end
 
   describe 'when signed in as a curator' do
-    let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
     before { sign_in user }
 
     describe 'POST create' do

data/spec/controllers/spotlight/resources/upload_controller_spec.rb

@@ -1,7 +1,7 @@
 
 describe Spotlight::Resources::UploadController, type: :controller do
   routes { Spotlight::Engine.routes }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   describe 'when not logged in' do
     describe 'POST create' do
@@ -13,7 +13,7 @@ describe Spotlight::Resources::UploadController, type: :controller do
   end
 
   describe 'when signed in as a curator' do
-    let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
     before { sign_in user }
 
     describe 'POST create' do

data/spec/controllers/spotlight/resources_controller_spec.rb

@@ -1,6 +1,6 @@
 describe Spotlight::ResourcesController, type: :controller do
   routes { Spotlight::Engine.routes }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   describe 'when not logged in' do
     describe 'GET new' do
@@ -33,7 +33,7 @@ describe Spotlight::ResourcesController, type: :controller do
   end
 
   describe 'when signed in as a curator' do
-    let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
     before { sign_in user }
 
     describe 'GET new' do

data/spec/controllers/spotlight/roles_controller_spec.rb

@@ -1,9 +1,9 @@
 describe Spotlight::RolesController, type: :controller do
   routes { Spotlight::Engine.routes }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   describe 'when user does not have access' do
-    before { sign_in FactoryGirl.create(:exhibit_visitor) }
+    before { sign_in FactoryBot.create(:exhibit_visitor) }
     describe 'GET index' do
       it 'denies access' do
         get :index, params: { exhibit_id: exhibit }
@@ -13,8 +13,8 @@ describe Spotlight::RolesController, type: :controller do
   end
 
   describe 'when user is an admin' do
-    let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
-    let(:user) { FactoryGirl.create(:user) }
+    let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+    let(:user) { FactoryBot.create(:user) }
     let(:role) { admin.roles.first }
     before { sign_in admin }
     it 'allows index' do