blacklight-spotlight 0.4.1 → 0.5.0

data/spec/controllers/spotlight/confirmations_controller_spec.rb

@@ -1,27 +1,29 @@
 require 'spec_helper'
 
-describe Spotlight::ConfirmationsController, :type => :controller do
+describe Spotlight::ConfirmationsController, type: :controller do
   routes { Spotlight::Engine.routes }
-  before {
-     @request.env["devise.mapping"] = Devise.mappings[:contact_email]
-  }
-  it "should have new" do
+  before do
+    # rubocop:disable RSpec/InstanceVariable
+    @request.env['devise.mapping'] = Devise.mappings[:contact_email]
+    # rubocop:enable RSpec/InstanceVariable
+  end
+  it 'has new' do
     get :new
     expect(response).to be_successful
   end
 
-  describe "#show" do
+  describe '#show' do
     let(:exhibit) { FactoryGirl.create(:exhibit) }
-    let(:contact_email) { Spotlight::ContactEmail.create!(:email=> 'justin@example.com', exhibit: 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
-      it "should give reset instructions" do
+    describe 'when the token is invalid' do
+      it 'gives reset instructions' do
         get :show
         expect(response).to be_successful
       end
     end
-    describe "when the token is valid" do
-      it "should update the user" do
+    describe 'when the token is valid' do
+      it 'updates the user' do
         get :show, confirmation_token: raw_token
         expect(contact_email.reload).to be_confirmed
         expect(response).to redirect_to main_app.new_user_session_path

data/spec/controllers/spotlight/contact_forms_controller_spec.rb

@@ -1,23 +1,28 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe Spotlight::ContactFormsController, :type => :controller do
+describe Spotlight::ContactFormsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   before do
-    request.env["HTTP_REFERER"] = "http://example.com"
-    exhibit.contact_emails_attributes= [ { "email"=>"test@example.com"}, {"email"=>"test2@example.com"}]
+    request.env['HTTP_REFERER'] = 'http://example.com'
+    exhibit.contact_emails_attributes = [{ 'email' => 'test@example.com' }, { 'email' => 'test2@example.com' }]
     exhibit.save!
-    exhibit.contact_emails.first.confirm!
+    exhibit.contact_emails.first.tap do |e|
+      if e.respond_to? :confirm
+        e.confirm
+      else
+        e.confirm!
+      end
+    end
   end
-  describe "#create" do
-    it "should redirect back" do
-      post :create, exhibit_id: exhibit.id, contact_form: { name: "Joe Doe", email: "jdoe@example.com" }
+  describe '#create' do
+    it 'redirects back' do
+      post :create, exhibit_id: exhibit.id, contact_form: { name: 'Joe Doe', email: 'jdoe@example.com' }
       expect(response).to redirect_to :back
     end
-    it "should set a flash message" do
-      post :create, exhibit_id: exhibit.id, contact_form: { name: "Joe Doe", email: "jdoe@example.com" }
-      expect(flash[:notice]).to eq "Thanks. Your feedback has been sent."
+    it 'sets a flash message' do
+      post :create, exhibit_id: exhibit.id, contact_form: { name: 'Joe Doe', email: 'jdoe@example.com' }
+      expect(flash[:notice]).to eq 'Thanks. Your feedback has been sent.'
     end
   end
 end
-

data/spec/controllers/spotlight/contacts_controller_spec.rb

@@ -1,75 +1,75 @@
 require 'spec_helper'
 
-describe Spotlight::ContactsController, :type => :controller do
+describe Spotlight::ContactsController, type: :controller do
   routes { Spotlight::Engine.routes }
-  describe "when not logged in" do
-    describe "GET edit" do
+  describe 'when not logged in' do
+    describe 'GET edit' do
       let(:contact) { FactoryGirl.create(:contact) }
-      it "should be successful" do
+      it 'is successful' do
         get :edit, id: contact, exhibit_id: contact.exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
   end
 
-  describe "when signed in as a curator" do
+  describe 'when signed in as a curator' do
     let(:user) { FactoryGirl.create(:exhibit_curator) }
     let(:exhibit) { user.roles.first.exhibit }
     let(:contact) { FactoryGirl.create(:contact, exhibit: exhibit, name: 'Andrew Carnegie') }
-    before {sign_in user }
+    before { sign_in user }
 
-    describe "GET edit" do
-      it "should be successful" do
-        expect(controller).to receive(:add_breadcrumb).with("Home", 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))
+    describe 'GET edit' do
+      it 'is successful' do
+        expect(controller).to receive(:add_breadcrumb).with('Home', 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))
         expect(controller).to receive(:add_breadcrumb).with(contact.name, edit_exhibit_contact_path(exhibit, contact))
         get :edit, id: contact, exhibit_id: contact.exhibit
         expect(response).to be_successful
       end
     end
-    describe "PATCH update" do
-      it "should be successful" do
-        patch :update, id: contact, contact: {name: 'Chester'}, exhibit_id: contact.exhibit
-        expect(response).to redirect_to exhibit_about_pages_path(exhibit) 
+    describe 'PATCH update' do
+      it 'is successful' do
+        patch :update, id: contact, contact: { name: 'Chester' }, exhibit_id: contact.exhibit
+        expect(response).to redirect_to exhibit_about_pages_path(exhibit)
         expect(contact.reload.name).to eq 'Chester'
       end
-      it "should fail by rendering edit" do
+      it 'fails by rendering edit' do
         expect_any_instance_of(Spotlight::Contact).to receive(:update).and_return(false)
-        patch :update, id: contact, contact: {name: 'Chester'}, exhibit_id: contact.exhibit
+        patch :update, id: contact, contact: { name: 'Chester' }, exhibit_id: contact.exhibit
         expect(response).to render_template 'edit'
       end
     end
-    describe "DELETE destroy" do
-      it "should be successful" do
+    describe 'DELETE destroy' do
+      it 'is successful' do
         contact # force contact to be created
-        expect {
+        expect do
           delete :destroy, id: contact, exhibit_id: contact.exhibit
-        }.to change{ Spotlight::Contact.count}.by(-1)
-        expect(response).to redirect_to exhibit_about_pages_path(exhibit) 
+        end.to change { Spotlight::Contact.count }.by(-1)
+        expect(response).to redirect_to exhibit_about_pages_path(exhibit)
       end
     end
-    describe "GET new" do
-      it "should be successful" do
-        expect(controller).to receive(:add_breadcrumb).with("Home", 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))
-        expect(controller).to receive(:add_breadcrumb).with("Add contact", new_exhibit_contact_path(exhibit))
+    describe 'GET new' do
+      it 'is successful' do
+        expect(controller).to receive(:add_breadcrumb).with('Home', 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))
+        expect(controller).to receive(:add_breadcrumb).with('Add contact', new_exhibit_contact_path(exhibit))
         get :new, exhibit_id: exhibit
         expect(response).to be_successful
       end
     end
-    describe "POST create" do
-      it "should fail by rendering new" do
+    describe 'POST create' do
+      it 'fails by rendering new' do
         expect_any_instance_of(Spotlight::Contact).to receive(:update).and_return(false)
-        post :create, exhibit_id: exhibit, contact: {name: 'Chester'}
+        post :create, exhibit_id: exhibit, contact: { name: 'Chester' }
         expect(response).to render_template 'new'
       end
-      it "should be successful" do
-        expect {
-          post :create, exhibit_id: exhibit, contact: {name: 'Chester'}
-        }.to change{ Spotlight::Contact.count}.by(1)
-        expect(response).to redirect_to exhibit_about_pages_path(exhibit) 
+      it 'is successful' do
+        expect do
+          post :create, exhibit_id: exhibit, contact: { name: 'Chester' }
+        end.to change { Spotlight::Contact.count }.by(1)
+        expect(response).to redirect_to exhibit_about_pages_path(exhibit)
         expect(Spotlight::Contact.last.show_in_sidebar).to be_truthy
       end
     end

data/spec/controllers/spotlight/custom_fields_controller_spec.rb

@@ -1,29 +1,29 @@
 require 'spec_helper'
-describe Spotlight::CustomFieldsController, :type => :controller do
+describe Spotlight::CustomFieldsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }
 
-  describe "when signed in as a curator" do
+  describe 'when signed in as a curator' do
     let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
-    before {sign_in user }
+    before { sign_in user }
 
-    describe "GET new" do
-      it "assigns a new custom field" do
-        expect(controller).to receive(:add_breadcrumb).with("Home", exhibit)
-        expect(controller).to receive(:add_breadcrumb).with("Curation", exhibit_dashboard_path(exhibit))
-        expect(controller).to receive(:add_breadcrumb).with("Metadata", exhibit_edit_metadata_path(exhibit))
-        expect(controller).to receive(:add_breadcrumb).with("Add new field", new_exhibit_custom_field_path(exhibit))
+    describe 'GET new' do
+      it 'assigns a new custom field' do
+        expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
+        expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
+        expect(controller).to receive(:add_breadcrumb).with('Metadata', edit_exhibit_metadata_configuration_path(exhibit))
+        expect(controller).to receive(:add_breadcrumb).with('Add new field', new_exhibit_custom_field_path(exhibit))
         get :new, exhibit_id: exhibit
         expect(assigns(:custom_field)).to be_a_new(Spotlight::CustomField)
       end
     end
 
-    describe "GET edit" do
+    describe 'GET edit' do
       let(:field) { FactoryGirl.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("Curation", exhibit_dashboard_path(exhibit))
-        expect(controller).to receive(:add_breadcrumb).with("Metadata", exhibit_edit_metadata_path(exhibit))
+      it 'assigns the requested custom_field' do
+        expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
+        expect(controller).to receive(:add_breadcrumb).with('Curation', exhibit_dashboard_path(exhibit))
+        expect(controller).to receive(:add_breadcrumb).with('Metadata', edit_exhibit_metadata_configuration_path(exhibit))
         expect(controller).to receive(:add_breadcrumb).with(field.label, edit_exhibit_custom_field_path(exhibit, field))
         get :edit, exhibit_id: exhibit, id: field
         expect(assigns(:custom_field)).to eq field
@@ -31,27 +31,27 @@ describe Spotlight::CustomFieldsController, :type => :controller do
       end
     end
 
-    describe "POST create" do
-      describe "with valid params" do
-        it "creates a new Page" do
-          expect {
-            post :create, custom_field: {label: "MyString"} , exhibit_id: exhibit 
-          }.to change(Spotlight::CustomField, :count).by(1)
+    describe 'POST create' do
+      describe 'with valid params' do
+        it 'creates a new Page' do
+          expect do
+            post :create, custom_field: { label: 'MyString' }, exhibit_id: exhibit
+          end.to change(Spotlight::CustomField, :count).by(1)
         end
 
-        it "redirects to the exhibit metadata page" do
-          post :create, custom_field: {label: "MyString"} , exhibit_id: exhibit 
-          expect(response).to redirect_to(exhibit_edit_metadata_path(exhibit))
+        it 'redirects to the exhibit metadata page' do
+          post :create, custom_field: { label: 'MyString' }, exhibit_id: exhibit
+          expect(response).to redirect_to(edit_exhibit_metadata_configuration_path(exhibit))
         end
       end
 
-      describe "with invalid params" do
+      describe 'with invalid params' do
         it "re-renders the 'new' template" do
           # Trigger the behavior that occurs when invalid params are submitted
           allow_any_instance_of(Spotlight::CustomField).to receive(:save).and_return(false)
-          post :create, custom_field: {label: "MyString"} , exhibit_id: exhibit
+          post :create, custom_field: { label: 'MyString' }, exhibit_id: exhibit
           expect(assigns(:custom_field)).to be_a_new(Spotlight::CustomField)
-          expect(response).to render_template("new")
+          expect(response).to render_template('new')
         end
       end
     end

data/spec/controllers/spotlight/dashboards_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spotlight::DashboardsController, :type => :controller do
+describe Spotlight::DashboardsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:repository) { double }
@@ -9,18 +9,18 @@ describe Spotlight::DashboardsController, :type => :controller do
     allow(controller).to receive(:repository).and_return(repository)
   end
 
-  describe "when logged in" do
+  describe 'when logged in' do
     let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
     before { sign_in curator }
-    describe "GET show" do
-      it "should load the exhibit" do
-        exhibit.blacklight_configuration.index = {timestamp_field:  "timestamp_field"}
+    describe 'GET show' do
+      it 'loads the exhibit' do
+        exhibit.blacklight_configuration.index = { timestamp_field: 'timestamp_field' }
         exhibit.save!
-        expect(controller).to receive(:get_search_results).with(sort: "timestamp_field desc").and_return([double(:response), [{id: 1}]])
-        expect(controller).to receive(:add_breadcrumb).with("Home", exhibit)
-        expect(controller).to receive(:add_breadcrumb).with("Dashboard", exhibit_dashboard_path(exhibit))
+        expect(controller).to receive(:search_results).with({ sort: 'timestamp_field desc' }, kind_of(Array)).and_return([double(:response), [{ id: 1 }]])
+        expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
+        expect(controller).to receive(:add_breadcrumb).with('Dashboard', exhibit_dashboard_path(exhibit))
         get :show, exhibit_id: exhibit.id
-        expect(response).to render_template "spotlight/dashboards/show"
+        expect(response).to render_template 'spotlight/dashboards/show'
         expect(assigns[:exhibit]).to eq exhibit
         expect(assigns[:pages].length).to eq exhibit.pages.length
         expect(assigns[:solr_documents]).to have(1).item
@@ -28,17 +28,17 @@ describe Spotlight::DashboardsController, :type => :controller do
     end
   end
 
-  describe "when user does not have access" do
+  describe 'when user does not have access' do
     before { sign_in FactoryGirl.create(:exhibit_visitor) }
-    it "should not allow show" do
+    it 'does not allow show' do
       get :show, exhibit_id: exhibit.id
       expect(response).to redirect_to main_app.root_path
     end
   end
 
-  describe "when not logged in" do
-    describe "GET show" do
-      it "should redirect to the sign in form" do
+  describe 'when not logged in' do
+    describe 'GET show' do
+      it 'redirects to the sign in form' do
         get :show, exhibit_id: exhibit.id
         expect(response).to redirect_to(main_app.new_user_session_path)
         expect(flash[:alert]).to be_present

data/spec/controllers/spotlight/exhibits_controller_spec.rb

@@ -1,91 +1,88 @@
 require 'spec_helper'
 require 'rack/test'
-describe Spotlight::ExhibitsController, :type => :controller do
+describe Spotlight::ExhibitsController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryGirl.create(:exhibit) }
 
-
-  describe "when the user is not authorized" do
+  describe 'when the user is not authorized' do
     before do
       sign_in FactoryGirl.create(:exhibit_visitor)
     end
 
-    it "should deny access" do
-      get :edit, id: exhibit 
+    it 'denies access' do
+      get :edit, id: exhibit
       expect(response).to redirect_to main_app.root_path
       expect(flash[:alert]).to be_present
     end
   end
 
-  describe "when not logged in" do
-
-    describe "#new" do
-      it "should not be allowed" do
-        get :new, id: exhibit 
+  describe 'when not logged in' do
+    describe '#new' do
+      it 'does not be allowed' do
+        get :new, id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
 
-    describe "#edit" do
-      it "should not be allowed" do
-        get :edit, id: exhibit 
+    describe '#edit' do
+      it 'does not be allowed' do
+        get :edit, id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
 
-    describe "#update" do
-      it "should not be allowed" do
-        patch :update, id: exhibit 
+    describe '#update' do
+      it 'does not be allowed' do
+        patch :update, id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
 
-    describe "#process_import" do
-      it "should not be allowed" do
-        patch :process_import, id: exhibit 
+    describe '#process_import' do
+      it 'does not be allowed' do
+        patch :process_import, id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
 
-    describe "#destroy" do
-      it "should not be allowed" do
-        delete :destroy, id: exhibit 
+    describe '#destroy' do
+      it 'does not be allowed' do
+        delete :destroy, id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
   end
 
-  describe "when signed in as a site admin" do
-
+  describe 'when signed in as a site admin' do
     let(:user) { FactoryGirl.create(:site_admin) }
-    before {sign_in user }
+    before { sign_in user }
 
-    describe "#new" do
-      it "should be successful" do
+    describe '#new' do
+      it 'is successful' do
         get :new
         expect(response).to be_successful
       end
     end
   end
 
-  describe "when signed in as an exhibit admin" do
+  describe 'when signed in as an exhibit admin' do
     let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
-    before {sign_in user }
+    before { sign_in user }
 
-    describe "#new" do
-      it "should not be allowed" do
+    describe '#new' do
+      it 'does not be allowed' do
         get :new
         expect(response).to_not be_successful
       end
     end
 
-    describe "#process_import" do
-      it "should be successful" do
-        f = Tempfile.new("foo")
+    describe '#process_import' do
+      it 'is successful' do
+        f = Tempfile.new('foo')
         begin
           f.write '{ "title": "Foo", "subtitle": "Bar"}'
           f.rewind
-          file = Rack::Test::UploadedFile.new(f.path, "application/json")
+          file = Rack::Test::UploadedFile.new(f.path, 'application/json')
           patch :process_import, id: exhibit, file: file
         ensure
           f.close
@@ -99,23 +96,27 @@ describe Spotlight::ExhibitsController, :type => :controller do
       end
     end
 
-    describe "#edit" do
-      it "should be successful" do
-        expect(controller).to receive(:add_breadcrumb).with("Home", exhibit)
-        expect(controller).to receive(:add_breadcrumb).with("Administration", exhibit_dashboard_path(exhibit))
-        expect(controller).to receive(:add_breadcrumb).with("Settings", edit_exhibit_path(exhibit))
+    describe '#edit' do
+      it 'is successful' do
+        expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
+        expect(controller).to receive(:add_breadcrumb).with('Administration', exhibit_dashboard_path(exhibit))
+        expect(controller).to receive(:add_breadcrumb).with('Settings', edit_exhibit_path(exhibit))
         get :edit, id: exhibit
         expect(response).to be_successful
       end
     end
 
-
-    describe "#update" do
-      it "should be successful" do
-        patch :update, id: exhibit, exhibit: { title: "Foo", subtitle: "Bar",
-                 description: "Baz", contact_emails_attributes: {'0'=>{email: 'bess@stanford.edu'}, '1'=>{email: 'naomi@stanford.edu'}}}
-        expect(flash[:notice]).to eq "The exhibit was successfully updated."
-        expect(response).to redirect_to edit_exhibit_path(exhibit) 
+    describe '#update' do
+      it 'is successful' do
+        patch :update, id: exhibit, exhibit: {
+          title: 'Foo',
+          subtitle: 'Bar',
+          description: 'Baz',
+          contact_emails_attributes: { '0' => { email: 'bess@stanford.edu' }, '1' => { email: 'naomi@stanford.edu' } }
+        }
+
+        expect(flash[:notice]).to eq 'The exhibit was successfully updated.'
+        expect(response).to redirect_to edit_exhibit_path(exhibit)
         assigns[:exhibit].tap do |saved|
           expect(saved.title).to eq 'Foo'
           expect(saved.subtitle).to eq 'Bar'
@@ -124,10 +125,14 @@ describe Spotlight::ExhibitsController, :type => :controller do
         end
       end
 
-      it "should show errors and ignore blank emails" do
-        
-        patch :update, id: exhibit, exhibit: { title: "Foo", subtitle: "Bar",
-                 description: "Baz", contact_emails_attributes: {'0'=>{email: 'bess@stanford.edu'}, '1'=>{email: 'naomi@'}, '2'=>{email: ''}}}
+      it 'shows errors and ignore blank emails' do
+        patch :update, id: exhibit, exhibit: {
+          title: 'Foo',
+          subtitle: 'Bar',
+          description: 'Baz',
+          contact_emails_attributes: { '0' => { email: 'bess@stanford.edu' }, '1' => { email: 'naomi@' }, '2' => { email: '' } }
+        }
+
         expect(response).to be_successful
         assigns[:exhibit].tap do |obj|
           expect(obj.contact_emails.last.errors[:email]).to eq ['is not valid']
@@ -136,11 +141,11 @@ describe Spotlight::ExhibitsController, :type => :controller do
       end
     end
 
-    describe "#destroy" do
-      it "should be successful" do
+    describe '#destroy' do
+      it 'is successful' do
         delete :destroy, id: exhibit
         expect(Spotlight::Exhibit.exists?(exhibit.id)).to be_falsey
-        expect(flash[:notice]).to eq "The exhibit was deleted."
+        expect(flash[:notice]).to eq 'The exhibit was deleted.'
         expect(response).to redirect_to main_app.root_path
       end
     end