blacklight-spotlight 0.12.1 → 0.13.0

data/spec/controllers/spotlight/home_pages_controller_spec.rb

@@ -47,7 +47,7 @@ describe Spotlight::HomePagesController, type: :controller do
     end
   end
 
-  describe 'Rendering home page' do
+  describe 'GET show' do
     it 'gets search results for display facets' do
       allow(controller).to receive_messages(search_results: [double, double])
       get :show, exhibit_id: exhibit
@@ -69,33 +69,32 @@ describe Spotlight::HomePagesController, type: :controller do
       expect(assigns).not_to have_key :response
       expect(assigns).not_to have_key :document_list
     end
-  end
 
-  describe 'when the exhibit is not published' do
-    before do
-      exhibit.published = false
-      exhibit.save!
-    end
-
-    it 'redirects an anonymous user to the signin path' do
-      get :show, exhibit_id: exhibit
-      expect(response).to redirect_to(main_app.new_user_session_path)
-    end
+    context 'when the exhibit is not published' do
+      before do
+        exhibit.update(published: false)
+      end
 
-    it 'redirects an unauthorized user to the signin path' do
-      user = FactoryGirl.create(:exhibit_curator)
-      sign_in user
-      expect do
+      it 'redirects an anonymous user to the signin path' do
         get :show, exhibit_id: exhibit
-      end.to raise_error ActionController::RoutingError
-    end
+        expect(response).to redirect_to(main_app.new_user_session_path)
+      end
 
-    it 'redirects an authorized user to the signin path' do
-      user = FactoryGirl.create(:exhibit_curator)
-      FactoryGirl.create(:role, exhibit: exhibit, user: user)
-      sign_in user
-      get :show, exhibit_id: exhibit
-      expect(response).to be_successful
+      it 'redirects an unauthorized user to the signin path' do
+        user = FactoryGirl.create(:exhibit_curator)
+        sign_in user
+        expect do
+          get :show, exhibit_id: exhibit
+        end.to raise_error ActionController::RoutingError
+      end
+
+      it 'redirects an authorized user to the signin path' do
+        user = FactoryGirl.create(:exhibit_curator)
+        FactoryGirl.create(:role, exhibit: exhibit, user: user)
+        sign_in user
+        get :show, exhibit_id: exhibit
+        expect(response).to be_successful
+      end
     end
   end
 end

data/spec/controllers/spotlight/metadata_configurations_controller_spec.rb

@@ -8,28 +8,32 @@ describe Spotlight::MetadataConfigurationsController, type: :controller do
       sign_in FactoryGirl.create(:exhibit_visitor)
     end
 
-    it 'denies access' do
-      get :show, exhibit_id: exhibit
-      expect(response).to redirect_to main_app.root_path
-      expect(flash[:alert]).to be_present
+    describe 'GET show' do
+      it 'denies access' do
+        get :show, exhibit_id: exhibit
+        expect(response).to redirect_to main_app.root_path
+        expect(flash[:alert]).to be_present
+      end
     end
 
-    it 'denies access' do
-      get :edit, exhibit_id: exhibit
-      expect(response).to redirect_to main_app.root_path
-      expect(flash[:alert]).to be_present
+    describe 'GET edit' do
+      it 'denies access' do
+        get :edit, exhibit_id: exhibit
+        expect(response).to redirect_to main_app.root_path
+        expect(flash[:alert]).to be_present
+      end
     end
   end
 
   describe 'when not logged in' do
-    describe '#update' do
+    describe 'PATCH update' do
       it 'denies access' do
         patch :update, exhibit_id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
 
-    describe '#edit' do
+    describe 'GET edit' do
       it 'denies access' do
         get :edit, exhibit_id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
@@ -41,7 +45,7 @@ describe Spotlight::MetadataConfigurationsController, type: :controller do
     let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
     before { sign_in user }
 
-    describe '#edit' do
+    describe 'GET edit' do
       it 'is successful' do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
         expect(controller).to receive(:add_breadcrumb).with('Configuration', exhibit_dashboard_path(exhibit))
@@ -51,7 +55,7 @@ describe Spotlight::MetadataConfigurationsController, type: :controller do
       end
     end
 
-    describe '#show' do
+    describe 'GET show' do
       it 'is successful' do
         get :show, exhibit_id: exhibit, format: 'json'
         expect(response).to be_successful
@@ -59,7 +63,7 @@ describe Spotlight::MetadataConfigurationsController, type: :controller do
       end
     end
 
-    describe '#update' do
+    describe 'PATCH update' do
       it 'updates metadata fields' do
         blacklight_config = Blacklight::Configuration.new
         blacklight_config.add_index_field %w(a b c d e f)

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

@@ -6,7 +6,7 @@ describe Spotlight::Resources::UploadController, type: :controller do
 
   describe 'when not logged in' do
     describe 'POST create' do
-      it 'does not be allowed' do
+      it 'is not allowed' do
         post :create, exhibit_id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end

data/spec/controllers/spotlight/resources_controller_spec.rb

@@ -6,21 +6,21 @@ describe Spotlight::ResourcesController, type: :controller do
 
   describe 'when not logged in' do
     describe 'GET new' do
-      it 'does not be allowed' do
+      it 'is not allowed' do
         get :new, exhibit_id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
 
     describe 'POST create' do
-      it 'does not be allowed' do
+      it 'is not allowed' do
         post :create, exhibit_id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
 
     describe 'POST reindex_all' do
-      it 'does not be allowed' do
+      it 'is not allowed' do
         post :reindex_all, exhibit_id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end

data/spec/controllers/spotlight/roles_controller_spec.rb

@@ -6,9 +6,11 @@ describe Spotlight::RolesController, type: :controller do
 
   describe 'when user does not have access' do
     before { sign_in FactoryGirl.create(:exhibit_visitor) }
-    it 'does not allow index' do
-      get :index, exhibit_id: exhibit
-      expect(response).to redirect_to main_app.root_path
+    describe 'GET index' do
+      it 'denies access' do
+        get :index, exhibit_id: exhibit
+        expect(response).to redirect_to main_app.root_path
+      end
     end
   end
 

data/spec/controllers/spotlight/search_configurations_controller_spec.rb

@@ -8,22 +8,24 @@ describe Spotlight::SearchConfigurationsController, type: :controller do
       sign_in FactoryGirl.create(:exhibit_visitor)
     end
 
-    it 'denies access' do
-      get :edit, exhibit_id: exhibit
-      expect(response).to redirect_to main_app.root_path
-      expect(flash[:alert]).to be_present
+    describe 'GET edit' do
+      it 'denies access' do
+        get :edit, exhibit_id: exhibit
+        expect(response).to redirect_to main_app.root_path
+        expect(flash[:alert]).to be_present
+      end
     end
   end
 
   describe 'when not logged in' do
-    describe '#update' do
+    describe 'PATCH update' do
       it 'denies access' do
         patch :update, exhibit_id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
       end
     end
 
-    describe '#edit' do
+    describe 'GET edit' do
       it 'denies access' do
         get :edit, exhibit_id: exhibit
         expect(response).to redirect_to main_app.new_user_session_path
@@ -35,7 +37,7 @@ describe Spotlight::SearchConfigurationsController, type: :controller do
     let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
     before { sign_in user }
 
-    describe '#edit' do
+    describe 'GET edit' do
       it 'is successful' do
         expect(controller).to receive(:add_breadcrumb).with('Home', exhibit)
         expect(controller).to receive(:add_breadcrumb).with('Configuration', exhibit_dashboard_path(exhibit))
@@ -52,7 +54,7 @@ describe Spotlight::SearchConfigurationsController, type: :controller do
       end
     end
 
-    describe '#update' do
+    describe 'PATCH update' do
       it 'updates facet fields' do
         patch :update, exhibit_id: exhibit, blacklight_configuration: {
           facet_fields: { 'genre_ssim' => { enabled: '1', label: 'Label' } }

data/spec/controllers/spotlight/searches_controller_spec.rb

@@ -13,16 +13,20 @@ describe Spotlight::SearchesController, type: :controller do
       sign_in FactoryGirl.create(:exhibit_visitor)
     end
 
-    it 'raises an error' do
-      post :create, exhibit_id: exhibit
-      expect(response).to redirect_to main_app.root_path
-      expect(flash[:alert]).to be_present
+    describe 'POST create' do
+      it 'denies access' do
+        post :create, exhibit_id: exhibit
+        expect(response).to redirect_to main_app.root_path
+        expect(flash[:alert]).to be_present
+      end
     end
 
-    it 'raises an error' do
-      get :index, exhibit_id: exhibit
-      expect(response).to redirect_to main_app.root_path
-      expect(flash[:alert]).to be_present
+    describe 'GET index' do
+      it 'denies access' do
+        get :index, exhibit_id: exhibit
+        expect(response).to redirect_to main_app.root_path
+        expect(flash[:alert]).to be_present
+      end
     end
   end
 

data/spec/controllers/spotlight/solr_controller_spec.rb

@@ -6,9 +6,12 @@ describe Spotlight::SolrController, type: :controller do
 
   describe 'when user does not have access' do
     before { sign_in FactoryGirl.create(:exhibit_visitor) }
-    it 'does not allow update' do
-      post :update, exhibit_id: exhibit
-      expect(response).to redirect_to main_app.root_path
+
+    describe 'POST update' do
+      it 'does not allow update' do
+        post :update, exhibit_id: exhibit
+        expect(response).to redirect_to main_app.root_path
+      end
     end
   end
 
@@ -21,42 +24,44 @@ describe Spotlight::SolrController, type: :controller do
       expect(controller).to receive(:blacklight_solr).and_return(solr)
     end
 
-    it 'passes through the request data' do
-      doc = {}
-      expect(solr).to receive(:update) do |arr|
-        doc = arr.first
-      end
-
-      post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
+    describe 'POST update' do
+      it 'passes through the request data' do
+        doc = {}
+        expect(solr).to receive(:update) do |arr|
+          doc = arr.first
+        end
 
-      expect(response).to be_successful
-      expect(doc).to include 'a' => 1
-    end
+        post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
 
-    it 'enriches the request with exhibit solr data' do
-      doc = {}
-      expect(solr).to receive(:update) do |arr|
-        doc = arr.first
+        expect(response).to be_successful
+        expect(doc).to include 'a' => 1
       end
 
-      post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
+      it 'enriches the request with exhibit solr data' do
+        doc = {}
+        expect(solr).to receive(:update) do |arr|
+          doc = arr.first
+        end
 
-      expect(response).to be_successful
-      expect(doc).to include exhibit.solr_data
-    end
+        post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
 
-    it 'enriches the request with sidecar data' do
-      doc = {}
-      expect(solr).to receive(:update) do |arr|
-        doc = arr.first
+        expect(response).to be_successful
+        expect(doc).to include exhibit.solr_data
       end
 
-      allow_any_instance_of(SolrDocument).to receive(:to_solr).and_return(b: 1)
+      it 'enriches the request with sidecar data' do
+        doc = {}
+        expect(solr).to receive(:update) do |arr|
+          doc = arr.first
+        end
 
-      post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
+        allow_any_instance_of(SolrDocument).to receive(:to_solr).and_return(b: 1)
 
-      expect(response).to be_successful
-      expect(doc).to include b: 1
+        post :update, { a: 1 }.to_json, content_type: :json, exhibit_id: exhibit
+
+        expect(response).to be_successful
+        expect(doc).to include b: 1
+      end
     end
   end
 end

data/spec/controllers/spotlight/versions_controller_spec.rb

@@ -5,7 +5,7 @@ describe Spotlight::VersionsController, type: :controller do
 
   describe 'when not logged in' do
     describe 'POST revert' do
-      it 'does not be allowed' do
+      it 'is not allowed' do
         post :revert, id: 1
         expect(response).to redirect_to main_app.new_user_session_path
       end
@@ -21,7 +21,7 @@ describe Spotlight::VersionsController, type: :controller do
     end
 
     describe 'POST revert' do
-      it 'does not be allowed' do
+      it 'is not allowed' do
         post :revert, id: page.versions.last
         expect(response).to redirect_to main_app.root_path
         expect(flash[:alert]).to be_present

data/spec/controllers/spotlight/view_configurations_controller_spec.rb

@@ -8,10 +8,12 @@ describe Spotlight::ViewConfigurationsController, type: :controller do
       sign_in FactoryGirl.create(:exhibit_visitor)
     end
 
-    it 'denies access' do
-      get :show, exhibit_id: exhibit
-      expect(response).to redirect_to main_app.root_path
-      expect(flash[:alert]).to be_present
+    describe 'GET show' do
+      it 'denies access' do
+        get :show, exhibit_id: exhibit
+        expect(response).to redirect_to main_app.root_path
+        expect(flash[:alert]).to be_present
+      end
     end
   end
 
@@ -19,7 +21,7 @@ describe Spotlight::ViewConfigurationsController, type: :controller do
     let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
     before { sign_in user }
 
-    describe '#show' do
+    describe 'GET show' do
       it 'is successful' do
         get :show, exhibit_id: exhibit, format: 'json'
         expect(response).to be_successful

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -25,7 +25,7 @@ describe Spotlight::ApplicationHelper, type: :helper do
     end
 
     it 'is a url for a search with the given tag facet' do
-      allow(Spotlight::SolrDocument).to receive_messages(solr_field_for_tagger: :exhibit_tags)
+      allow(SolrDocument).to receive_messages(solr_field_for_tagger: :exhibit_tags)
       expected = spotlight.exhibit_catalog_index_path(exhibit_id: helper.current_exhibit, f: { exhibit_tags: ['tag_value'] })
       expect(helper.url_to_tag_facet 'tag_value').to eq expected
     end

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 module Spotlight
   describe PagesHelper, type: :helper do
     let(:blacklight_config) { Blacklight::Configuration.new { |config| config.show.title_field = :abc } }
-    let(:titled_document) { ::SolrDocument.new(abc: 'value') }
-    let(:untitled_document) { ::SolrDocument.new(id: '1234') }
+    let(:titled_document) { blacklight_config.document_model.new(abc: 'value') }
+    let(:untitled_document) { blacklight_config.document_model.new(id: '1234') }
     let!(:current_exhibit) { FactoryGirl.create(:exhibit) }
     let!(:home_page) { current_exhibit.home_page }
     let!(:search) { FactoryGirl.create(:search, exhibit: current_exhibit, query_params: { 'q' => 'query' }, published: true) }

data/spec/models/solr_document_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SolrDocument, type: :model do
-  subject { ::SolrDocument.new(id: 'abcd123') }
+  subject { described_class.new(id: 'abcd123') }
   its(:to_key) { should == ['abcd123'] }
   its(:persisted?) { should be_truthy }
   before do
@@ -23,21 +23,21 @@ describe SolrDocument, type: :model do
   end
 
   it 'has find' do
-    expect(::SolrDocument.find('dq287tq6352')).to be_kind_of described_class
+    expect(described_class.find('dq287tq6352')).to be_kind_of described_class
   end
 
   it 'has ==' do
-    expect(::SolrDocument.find('dq287tq6352')).to eq ::SolrDocument.find('dq287tq6352')
+    expect(described_class.find('dq287tq6352')).to eq described_class.find('dq287tq6352')
   end
 
   describe 'GlobalID' do
     let(:doc_id) { 'dq287tq6352' }
     it 'responds to #to_global_id' do
-      expect(::SolrDocument.find(doc_id).to_global_id.to_s).to eq "gid://internal/SolrDocument/#{doc_id}"
+      expect(described_class.find(doc_id).to_global_id.to_s).to eq "gid://internal/SolrDocument/#{doc_id}"
     end
     it 'is able to locate SolrDocuments by their GlobalID' do
       expect(GlobalID::Locator.locate(
-        ::SolrDocument.find(doc_id).to_global_id
+        described_class.find(doc_id).to_global_id
       )['id']).to eq doc_id
     end
   end