blacklight-spotlight 3.0.0.alpha.10 → 3.0.0.rc5

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -449,11 +449,16 @@ describe Spotlight::BlacklightConfiguration, type: :model do
 
       expect(subject.blacklight_config.per_page).to eq [10, 50]
     end
+  end
 
-    it 'prepends the default per page' do
-      blacklight_config.per_page = [1, 10, 50, 100]
+  describe '#default_per_page' do
+    it 'is the first per page option by default' do
+      expect(subject.blacklight_config.default_per_page).to eq 10
+    end
+
+    it "is set from the model's default_per_page" do
       subject.default_per_page = 50
-      expect(subject.blacklight_config.per_page.first).to eq 50
+      expect(subject.blacklight_config.default_per_page).to eq 50
     end
   end
 

data/spec/models/spotlight/exhibit_spec.rb

@@ -19,6 +19,14 @@ describe Spotlight::Exhibit, type: :model do
     expect(subject.description).to eq 'Test description'
   end
 
+  it 'has reserved slugs' do
+    subject.slug = 'site'
+
+    expect do
+      subject.save!
+    end.to raise_error(ActiveRecord::RecordInvalid, 'Validation failed: Slug is reserved')
+  end
+
   describe 'validations' do
     it 'validates the presence of the title' do
       exhibit.title = ''
@@ -147,7 +155,7 @@ describe Spotlight::Exhibit, type: :model do
     it 'removes the default browse category' do
       subject.save
       expect { subject.import({}) }.to change { subject.searches.count }.by(0)
-      expect { subject.import('searches' => [{ 'title' => 'All Exhibit Items', 'slug' => 'all-exhibit-items' }]) }.to change { subject.searches.count }.by(0)
+      expect { subject.import('searches' => [{ 'title' => 'All exhibit items', 'slug' => 'all-exhibit-items' }]) }.to change { subject.searches.count }.by(0)
     end
 
     it 'imports nested attributes from the hash' do
@@ -245,48 +253,9 @@ describe Spotlight::Exhibit, type: :model do
   describe '#reindex_later' do
     subject { FactoryBot.create(:exhibit) }
 
-    let(:log_entry) { Spotlight::ReindexingLogEntry.new(exhibit: subject, user: user, items_reindexed_count: 0) }
-
-    context 'user is omitted' do
-      let(:user) { nil }
-
-      it 'queues a reindex job for the exhibit, with nil user for the log entry' do
-        expect(subject).to receive(:new_reindexing_log_entry).with(nil).and_return(log_entry)
-        expect(Spotlight::ReindexJob).to receive(:perform_later).with(subject, log_entry)
-        subject.reindex_later
-        expect(log_entry.user).to be nil
-      end
-    end
-
-    context 'non-nil user is provided' do
-      let(:user) { FactoryBot.build(:user) }
-
-      it 'queues a reindex job for the exhibit, with actual user for the log entry' do
-        expect(subject).to receive(:new_reindexing_log_entry).with(user).and_return(log_entry)
-        expect(Spotlight::ReindexJob).to receive(:perform_later).with(subject, log_entry)
-        subject.reindex_later user
-        expect(log_entry.user).to eq user
-      end
-    end
-  end
-
-  describe '#new_reindexing_log_entry' do
-    let(:user) { FactoryBot.build(:user) }
-
-    it 'returns a properly configured Spotlight::ReindexingLogEntry instance' do
-      reindexing_log_entry = subject.send(:new_reindexing_log_entry, user)
-      expect(reindexing_log_entry.exhibit).to eq subject
-      expect(reindexing_log_entry.user).to eq user
-      expect(reindexing_log_entry.items_reindexed_count).to eq 0
-      expect(reindexing_log_entry.unstarted?).to be true
-    end
-
-    it 'does not require user the user parameter' do
-      reindexing_log_entry = subject.send(:new_reindexing_log_entry)
-      expect(reindexing_log_entry.exhibit).to eq subject
-      expect(reindexing_log_entry.user).to be nil
-      expect(reindexing_log_entry.items_reindexed_count).to eq 0
-      expect(reindexing_log_entry.unstarted?).to be true
+    it 'queues a reindex job for the exhibit' do
+      expect(Spotlight::ReindexExhibitJob).to receive(:perform_later).with(subject, user: nil)
+      subject.reindex_later
     end
   end
 
@@ -358,24 +327,9 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#reindex_progress' do
-    let!(:reindexing_log_entries) do
-      [
-        FactoryBot.create(:unstarted_reindexing_log_entry, exhibit: exhibit),
-        FactoryBot.create(:reindexing_log_entry, exhibit: exhibit),
-        in_progress_entry,
-        FactoryBot.create(:failed_reindexing_log_entry, exhibit: exhibit),
-        FactoryBot.create(:unstarted_reindexing_log_entry, exhibit: exhibit)
-      ]
-    end
-
-    let(:in_progress_entry) do
-      FactoryBot.create(:in_progress_reindexing_log_entry, exhibit: exhibit)
-    end
-
     it 'returns the latest log entry that is not unstarted' do
       reindex_progress = subject.reindex_progress
-      expect(reindex_progress).to be_a Spotlight::ReindexProgress
-      expect(reindex_progress.current_log_entry).to eq in_progress_entry
+      expect(reindex_progress).to be_a Spotlight::BackgroundJobProgress
     end
   end
 

data/spec/models/spotlight/featured_image_spec.rb

@@ -36,13 +36,12 @@ describe Spotlight::FeaturedImage do
 
       context 'with an uploaded image' do
         before do
-          featured_image.source = 'remote'
           featured_image.image = temp_image.image
           featured_image.save!
         end
 
         it 'points at the RIIIF endpoint' do
-          expect(subject.iiif_url).to match(%r{^/images/\d+/})
+          expect(subject.iiif_url).to match(%r{^/images/\d+-.+/})
         end
       end
     end

data/spec/models/spotlight/group_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+describe Spotlight::Group, type: :model do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+
+  describe '#searches' do
+    let(:group) { FactoryBot.create(:group_with_searches, exhibit: exhibit, searches_count: 4) }
+
+    it do
+      expect(group.searches.count).to eq 4
+    end
+
+    it do
+      group.searches.all do |search|
+        expect(search).to be_an Spotlight::Search
+      end
+    end
+  end
+end

data/spec/models/spotlight/main_navigation_spec.rb

@@ -7,7 +7,7 @@ describe Spotlight::MainNavigation, type: :model do
 
   it 'has a default_label' do
     subject.nav_type = :curated_features
-    expect(subject.default_label).to eq 'Curated Features'
+    expect(subject.default_label).to eq 'Curated features'
   end
 
   it 'returns the use the default label in the absence of a label' do

data/spec/models/spotlight/resource_spec.rb

@@ -1,126 +1,128 @@
 # frozen_string_literal: true
 
 describe Spotlight::Resource, type: :model do
-  before do
-    allow_any_instance_of(described_class).to receive(:update_index)
-  end
+  subject(:resource) { described_class.create(id: 123, exhibit: exhibit) }
 
   let(:exhibit) { FactoryBot.create(:exhibit) }
 
-  describe '#reindex' do
-    context 'with a provider that generates ids' do
-      subject do
-        Class.new(described_class).new(exhibit: exhibit)
-      end
-
-      let(:solr_response) { { id: 123 } }
-
-      before do
-        SolrDocument.new(id: 123).sidecars.create!(exhibit: exhibit, data: { document_data: true })
-        allow(subject).to receive_messages(to_global_id: '')
+  describe '#save_and_index' do
+    before do
+      allow(subject).to receive(:save)
+      allow(subject).to receive(:reindex_later)
+    end
 
-        allow(subject.document_builder).to receive(:to_solr).and_return(solr_response)
-      end
+    it 'saves the object' do
+      expect(subject).to receive(:save).and_return(true)
+      subject.save_and_index
+    end
 
-      it 'includes exhibit document-specific data' do
-        allow(subject.send(:blacklight_solr)).to receive(:update) do |options|
-          data = JSON.parse(options[:data], symbolize_names: true)
+    it 'reindexes after save' do
+      expect(subject).to receive(:save).and_return(true)
+      expect(subject).to receive(:reindex_later)
+      subject.save_and_index
+    end
 
-          expect(data.length).to eq 1
-          doc = data.first
+    it 'passes through reindexing options' do
+      expect(subject).to receive(:save).and_return(true)
+      expect(subject).to receive(:reindex_later).with(a: 1)
+      subject.save_and_index(reindex_options: { a: 1 })
+    end
 
-          break if doc.first == :commit
+    context 'if the save fails' do
+      it 'does not reindex' do
+        expect(subject).to receive(:save).and_return(false)
+        expect(subject).not_to receive(:reindex_later)
+        subject.save_and_index
+      end
+    end
+  end
 
-          expect(doc).to include document_data: true
-        end
+  describe '#reindex_later' do
+    around do |block|
+      old = ActiveJob::Base.queue_adapter
+      begin
+        ActiveJob::Base.queue_adapter = :test
 
-        subject.reindex
+        block.call
+      ensure
+        ActiveJob::Base.queue_adapter = old
       end
+    end
 
-      context 'when a document does not have an identifier' do
-        let(:solr_response) { { other_field: 'Content' } }
+    it 'passes through reindexing options' do
+      expect { subject.reindex_later(whatever: true) }.to have_enqueued_job(Spotlight::ReindexJob).with(subject, whatever: true, 'validity_token' => nil)
+    end
+  end
 
-        it 'is not indexed (but a commit can be sent)' do
-          allow(subject.send(:blacklight_solr)).to receive(:commit)
-          expect(subject.send(:blacklight_solr)).not_to receive(:update)
+  describe '#reindex' do
+    before do
+      # sneak some data into the pipeline
+      subject.indexing_pipeline.transforms = [->(*) { { id: '123' } }] + subject.indexing_pipeline.transforms
+    end
 
-          subject.reindex
-        end
-      end
+    let(:indexed_document) do
+      result = nil
 
-      context 'reindexing_log_entry is provided' do
-        before do
-          allow(subject.send(:blacklight_solr)).to receive(:update)
-        end
+      subject.reindex(**index_args) do |data, *|
+        result = data
 
-        it 'updates the count of reindexed items in the log entry' do
-          reindexing_log_entry = double(Spotlight::ReindexingLogEntry)
-          expect(reindexing_log_entry).to receive(:update).with(items_reindexed_count: 1)
-          subject.reindex reindexing_log_entry
-        end
+        # skip actually indexing the document into the solr index
+        throw :skip
       end
 
-      context 'when the index is not writable' do
-        before do
-          allow(Spotlight::Engine.config).to receive_messages(writable_index: false)
-        end
+      result
+    end
 
-        it "doesn't write" do
-          expect(subject.send(:blacklight_solr)).not_to receive(:update)
-          subject.reindex
-        end
-      end
+    let(:index_args) { {} }
+
+    it 'returns the number of items indexed' do
+      expect(subject.reindex { |*| throw :skip }).to eq 1
+    end
 
-      context 'with a resource that creates multiple solr documents' do
-        let(:solr_response) { [{ id: 1 }, { id: 2 }] }
+    it 'applies exhibit-specific metadata from the sidecar' do
+      expect(indexed_document).to include Spotlight::SolrDocumentSidecar.new(document: SolrDocument.new(id: '123'), exhibit: exhibit).to_solr
+    end
 
-        before do
-          allow(subject.send(:blacklight_solr)).to receive(:update)
-        end
+    it 'includes metata from each sidecar' do
+      a = Spotlight::SolrDocumentSidecar.create(document: SolrDocument.new(id: '123'), exhibit: exhibit)
+      b = Spotlight::SolrDocumentSidecar.create(document: SolrDocument.new(id: '123'), exhibit: FactoryBot.build(:exhibit))
 
-        it 'returns the number of indexed objects' do
-          expect(subject.reindex).to eq 2
-        end
+      expect(indexed_document).to include(a.to_solr).and(include(b.to_solr))
+    end
 
-        it 'triggers a solr commit' do
-          expect(subject.send(:blacklight_solr)).to receive(:commit).once
+    it 'persists a sidecar document' do
+      expect { indexed_document }.to change(Spotlight::SolrDocumentSidecar, :count).by(1)
 
-          subject.reindex
-        end
+      expect(Spotlight::SolrDocumentSidecar.last).to have_attributes(document_id: '123', exhibit: exhibit)
+    end
 
-        it 'touches the exhibit to clear any caches' do
-          allow(subject.exhibit).to receive(:touch)
+    it 'applies application metadata' do
+      expect(indexed_document).to include(spotlight_resource_id_ssim: resource.to_global_id.to_s, spotlight_resource_type_ssim: 'spotlight/resources')
+    end
 
-          subject.reindex
+    context 'with some provided metadata' do
+      let(:index_args) { { additional_metadata: { a: 1 } } }
 
-          expect(subject.exhibit).to have_received(:touch)
-        end
+      it 'applies externally provided metadata' do
+        expect(indexed_document).to include a: 1
       end
     end
-  end
 
-  describe '#save_and_index' do
-    before do
-      allow(subject.send(:blacklight_solr)).to receive(:update)
-      allow(subject).to receive(:reindex_later)
-    end
+    it 'touches the exhibit to bust any caches' do
+      allow(exhibit).to receive(:touch)
 
-    it 'saves the object' do
-      expect(subject).to receive(:save).and_return(true)
-      subject.save_and_index
-    end
+      indexed_document
 
-    it 'reindexes after save' do
-      expect(subject).to receive(:save).and_return(true)
-      expect(subject).to receive(:reindex_later)
-      subject.save_and_index
+      expect(exhibit).to have_received(:touch)
     end
 
-    context 'if the save fails' do
-      it 'does not reindex' do
-        expect(subject).to receive(:save).and_return(false)
-        expect(subject).not_to receive(:reindex_later)
-        subject.save_and_index
+    context 'with touch: false' do
+      it 'does not touch the exhibit' do
+        allow(exhibit).to receive(:touch)
+
+        expect(subject.reindex(touch: false) { |*| throw :skip }).to eq 1
+
+        expect(exhibit).not_to have_received(:touch)
       end
     end
   end

data/spec/models/spotlight/resources/iiif_harvester_spec.rb

@@ -3,12 +3,11 @@
 require 'spec_helper'
 
 describe Spotlight::Resources::IiifHarvester do
+  subject(:harvester) { described_class.create(exhibit_id: exhibit.id, url: url) }
+
   let(:exhibit) { FactoryBot.create(:exhibit) }
-  let(:harvester) { described_class.create(exhibit_id: exhibit.id, url: url) }
 
   describe 'Validation' do
-    subject { harvester }
-
     context 'when given an invalid URL' do
       before do
         stub_request(:head, 'http://example.com').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
@@ -38,16 +37,16 @@ describe Spotlight::Resources::IiifHarvester do
     end
   end
 
-  describe '#documents_to_index' do
-    subject { harvester.document_builder }
-
+  describe '#reindex' do
     let(:url) { 'uri://for-top-level-collection' }
 
-    before { stub_default_collection }
+    before do
+      stub_default_collection
+      allow(Spotlight::Engine.config).to receive(:writable_index).and_return(false)
+    end
 
-    it 'returns an Enumerator of all the solr documents' do
-      expect(subject.documents_to_index).to be_a(Enumerator)
-      expect(subject.documents_to_index.count).to eq 8
+    it 'indexes all the solr documents' do
+      expect(subject.reindex).to eq 8
     end
   end
 end

data/spec/models/spotlight/role_spec.rb

@@ -9,7 +9,7 @@ describe Spotlight::Role, type: :model do
 
       it 'does not be valid' do
         expect(subject).not_to be_valid
-        expect(subject.errors.messages).to include(role: ['is not included in the list'], 'user.email': ["can't be blank"])
+        expect(subject.errors.messages.transform_values(&:to_a)).to include(role: ['is not included in the list'], 'user.email': ["can't be blank"])
       end
     end
 
@@ -37,10 +37,10 @@ describe Spotlight::Role, type: :model do
 
       describe 'that points at a user with an existing role' do
         let(:user) { FactoryBot.create(:user) }
-        before { described_class.create!(role: 'curator', user: user) }
-
         let(:args) { { role: 'curator', user_key: user.email } }
 
+        before { described_class.create!(role: 'curator', user: user) }
+
         it 'is valid' do
           expect(subject).not_to be_valid
           expect(subject.errors.messages).to eq(user_key: ['already a member of this exhibit'])

data/spec/models/spotlight/search_spec.rb

@@ -5,7 +5,7 @@ describe Spotlight::Search, type: :model do
 
   let(:exhibit) { FactoryBot.create(:exhibit) }
 
-  let(:query_params) { { 'f' => { 'genre_sim' => ['map'] } } }
+  let(:query_params) { { 'f' => { 'genre_ssim' => ['map'] } } }
 
   let(:blacklight_config) { ::CatalogController.blacklight_config }
   let(:document) do
@@ -17,7 +17,10 @@ describe Spotlight::Search, type: :model do
     let(:query_params) { {} }
 
     it 'has items' do
-      expect(subject.documents.size).to eq 55
+      # Add some fuzziness to this. Running locally it should be 55 but in some
+      # CI environments, spec/features/add_items_spec.rb will end up adding new
+      # records and cannot ensure deletion of them.
+      expect(subject.documents.size).to be_within(1).of(55)
     end
   end
 
@@ -31,6 +34,16 @@ describe Spotlight::Search, type: :model do
     end
   end
 
+  describe '.unpublished' do
+    let!(:search1) { FactoryBot.create(:search, published: true) }
+    let!(:search2) { FactoryBot.create(:search, published: false) }
+    let!(:search3) { FactoryBot.create(:search, published: nil) }
+
+    it 'accounts for nil and false values' do
+      expect(described_class.unpublished.count).to eq 5
+    end
+  end
+
   describe '#slug' do
     let(:search) { FactoryBot.create(:search) }
 
@@ -54,7 +67,7 @@ describe Spotlight::Search, type: :model do
 
   describe '#search_params' do
     it 'maps the search to the appropriate facet values' do
-      expect(subject.search_params.to_hash).to include 'fq' => array_including('{!term f=genre_sim}map')
+      expect(subject.search_params.to_hash).to include 'fq' => array_including('{!term f=genre_ssim}map')
     end
 
     context 'with filter_resources_by_exhibit configured' do
@@ -95,4 +108,18 @@ describe Spotlight::Search, type: :model do
       expect(search_params).to include user_params
     end
   end
+
+  describe '#groups' do
+    let(:search) { FactoryBot.create(:search_with_groups, groups_count: 3) }
+
+    it do
+      expect(search.groups.count).to eq 3
+    end
+
+    it do
+      search.groups.all do |group|
+        expect(group).to be_an Spotlight::Group
+      end
+    end
+  end
 end