blacklight-spotlight 3.0.0.rc1 → 3.0.0.rc6

data/spec/features/report_a_problem_spec.rb

@@ -27,7 +27,7 @@ describe 'Report a Problem', type: :feature do
 
       click_on 'Feedback'
 
-      expect(page).to have_css('h2', text: 'Contact Us', visible: true)
+      expect(page).to have_css('h2', text: 'Contact us', visible: true)
     end
 
     it 'accepts a problem report', js: true do

data/spec/features/site_users_management_spec.rb

@@ -42,15 +42,15 @@ describe 'Site users management', js: true do
 
     click_button 'Add role'
 
-    expect(page).to have_css(:td, text: 'not-an-admin@example.com')
+    expect(page).to have_css('td', text: 'not-an-admin@example.com')
 
-    expect(page).to have_css(:a, text: 'Remove from admin role', count: 4)
+    expect(page).to have_css('a', text: 'Remove from admin role', count: 2)
     within(all('table tbody tr:not([data-edit-for])').last) do
       click_link 'Remove from admin role'
     end
 
     expect(page).to have_content 'User removed from site adminstrator role'
-    expect(page).to have_css(:a, text: 'Remove from admin role', count: 2)
+    expect(page).to have_css('a', text: 'Remove from admin role', count: 0)
   end
 
   it 'sends an invitation email to users who do not exist' do
@@ -68,7 +68,7 @@ describe 'Site users management', js: true do
     click_link 'Add new administrator'
 
     expect(page).to have_css('td', text: user.email)
-    # There are two users, the original site admin and our admin user so only one button
-    expect(page).to have_css(:a, text: 'Remove from admin role', count: 2)
+    # There is just our admin user so no button
+    expect(page).to have_css('a', text: 'Remove from admin role', count: 0)
   end
 end

data/spec/fixtures/bulk-update-template.csv

@@ -0,0 +1,57 @@
+Item ID,Item Title,Visibility
+bm387cy2596,L'AMERIQVE,true
+cz507zk0531,NEW MEXICO,true
+dq287tq6352,L'AMERIQUE,false
+ds525vw8509,"Mappa mondo and Figura prima del capitolo IV., ossia della divisione della terra",true
+dx157dh4345,KAART der REYZE van drie Schepen naar het ZUYDLAND in de Jaaren 1721 en 1722,true
+dy396mt9665,a Map of the Middle Part of AMERICA,true
+fh912bx9878,[Americas],true
+gk446cj2442,[World map],true
+gt736xf9712,HEMISPHERE OCCIDENTAL DU GLOBE TERRESTRE contenant L'AMERIQUE SEPTENT.LE et L'AMERIQUE M.LE et P.tie des TERRES ARCTIQUES et ANTARCTIQUES Subdivisées en leurs Regions.,true
+gv664gb7394,SITVS TERRÆ CIRCVLIS COELESTIBVS CIRCVNDATÆ.,true
+gw298sq0504,"PLANISPHÆRIVM BRAHEVM, Sive Structura MVNDI TOTIVS, EX HYPOTHESI TYCHONIS BRAHEI IN PLANO DELINEATA. [Amstelodami : Apud Joannem Janssonium, 1660].",true
+jp266yb7109,AMERICA,false
+jr961xz9944,AMERICA SEPTENTRIONALIS,true
+jy409qg0248,Novissima et Accuratissima TOTIUS AMERICÆ DESCRIPTIO.,true
+kw406zk5778,[America],true
+kw703rh2327,"Mappe-monde pour connoitre les progŕes & les conquestes les plus remarquables des Provinces-Vnies, ainsy que celles des Compagnies d'Orient et d'Occident et les païs quelles possédent dans l'un et dans l'autre hemisphere and Atlas historique, ou, nouvelle introduction à l’histoire, à la chronologie & à la géographie ancienne & moderne",true
+mw236cd6430,"AMERIQUE SEPTENTRIONALE divisée en ses principales parties, ou sont distingués les vns des autres LES ESTATS suivant qu'ils appartiennent presentemet aux FRANÇOIS, CASTILLANS, ANGLOIS, SUEDOIS, DANOIS, HOLLANDOIS. Tirée des Relations de toutes ces Nations Par le Sr. Sanson, Geographe Ordinaire du Roy",true
+np731wc7689,L'AMERIQUE | Suivant les dernieres | Observations de l'Acade= | mie Royale des Sciences Seventh of 18 States,true
+nq874ts4848,"Introduction a la Geographie Avec une Description Historique Sur Touttes les parties de la Terre
+Title page",true
+nr766vt0518,GEOGRAPHISCHE UNIVERSAL - ZEIG UND SCHLAG-UHR : WEERELD-BEELDIGH WYS EN SLAG WERK,true
+nz081wv9348,AMERIQUE SEPTENTRIONALE Par N. Sanson Geographe Ord.re du Roy. Reveue et changée en plusieurs endroits suivant les Memoires les plus recents augmentée et corrigée en cette seconde edition,true
+pm812zf5263,AMERICÆ,true
+ps921pn8250,PLANISPHERE URANO-GEOGRAPHIQUE c'estadire LES SPHERES CELESTE et TERRESTRE mises en plan.,false
+pt603pv6417,"A Map of the WORLD with the Ships DUKE & DUTCHESS Tract Round it, from 1708 to 1711. Second of 2 States",true
+qb677kc3995,L'AMERIQVE autrement Le NOVVEAV MONDE et INDES OCCIDENTALES,true
+qt469cf8909,"Pascaart vertoonende de Zeecusten van Chili, Peru, Hispania, Nova, Nova Granada, en California.",true
+rc221bv1386,[Armenian map of the world],true
+rj993fh5469,"A New Map of the World Shewing the Course of Sr. Francis Drake, William Shouten and Capt. William Dampiers Voyages Round it.",true
+rx614sw9194,AMERICÆ nova discriptio.,true
+rz043dh7915,MAR DEL ZUR HISPANIS MARE PACIFICUM.,true
+rz818vx8201,'t Noorder deel van WEST-INDIEN,true
+sb904gg2771,Planisphaerium terrestre cum utroque coelesti hemisphaerio ... = Vlakke ared-kloot met het beide hemelsch half-rond,true
+sd345mz1879,A MAP of AMERICA from the latest and best Observations,true
+sn161bw2027,"Pas-caart van Zuyd-Zee, tusschen California en ilhas de Ladrones and La Atlas del mundo o el mundo aguado",true
+sn343fc0807,AMERICQVE SEPTENTRIONALE,true
+sp821gh4463,[World],true
+sw106rc9347,AMERIQUE SEPTENTRIONALE,true
+sx619yv5558,"Recentissima NOVI ORBIS, Sive AMERICÆ SEPTENTRIONALIS et MERIDIONALIS TABULA",true
+tg729zw9405,NOVA TOTIVS AMERICÆ DESCRIPTIO.,true
+vb000vb1451,AMERICA,true
+vw323gf4937,AMERICA with those known parts in that unknowne worlde both people and manner of buildings Discribed and inlarged by I.S.Ano.1626,false
+vy180gj7659,L'AMERIQUE Suivant les dernieres observations de l'Acad. Royale des Sciences.,true
+wb806ct0449,A Generall Chart of the | SOUTH SEA | from the River of Plate to | Dampiers Streights on ye Coast | of NEW GUINEA,true
+wt855xd4818,CONTINENT ARCTIQVE,true
+xd327cm9378,"Mapa mundi, con los meridianos, y paralelos, iguales como los del globo tere- y arreglado a las mejores, y ultimas relaciones",true
+yh941cp6284,Orbis terrarum tabula recens emendata et in lucem edita,true
+ym733yc1437,"[Maps of the world] and A new and universal dictionary of arts and sciences: ... With an introductory preface, ... And illustrated with a great number of copper-plates, engraven by the best hands",true
+yn959jw9550,A New Map of North AMERICA According to the Newest Observations.,true
+ys360dp2191,TYPUS SELENOGRAPHICUS LUNÆ PHASES ET ASPECTUS VARIOS ADUMBRANS.,true
+zn001wm6450,L'AMERIQVE autrement Le NOVVEAV MONDE et INDES OCCIDENTALES,true
+zn845sh3664,PLANISPHERE REPRESENTANT TOUTE L'ETENDUE DU MONDE. DANS L'ORDRE QU'ON A SUIVI DANS CE LIVRE. NB. LES CHIFFRES SE RAPORTENT AUX CARTES ET AUX PAGES DES DESCRIPTIONS.,true
+zq083qg2931,[Pacific Ocean],true
+zr014mj0786,A New and Exact Map of ASIA According to the Best Observations,true
+zs247rr8237,"AMERIQUE SEPTENTRIONALE divisée en ses principales parties, ou sont distingués les vns des autres LES ESTATS suivant qu'ils appartiennent presentemet aux FRANÇOIS, CASTILLANS, ANGLOIS, SUEDOIS, DANOIS, HOLLANDOIS. Tirée des Relations de toutes ces Nations Par le Sr. Sanson, Geographe Ordinaire du Roy",true
+zv316zr9542,AMERIQUE SEPTENTRIONALE,false

data/spec/fixtures/updated-bulk-update-template-w-tags.csv

@@ -0,0 +1,4 @@
+Item ID,Item Title,Visibility,Tag: CSV Tag1,Tag: CSV Tag2,Tag: CSV DoesntExist
+bm387cy2596,L'AMERIQVE,true,true,true,false
+cz507zk0531,NEW MEXICO,true,false,true,false
+dq287tq6352,L'AMERIQUE,true,true,true,false

data/spec/fixtures/updated-bulk-update-template.csv

@@ -0,0 +1,4 @@
+Item ID,Item Title,Visibility
+bm387cy2596,L'AMERIQVE,true
+cz507zk0531,NEW MEXICO,true
+dq287tq6352,L'AMERIQUE,false

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -66,7 +66,6 @@ describe Spotlight::ApplicationHelper, type: :helper do
     end
 
     it 'is a url for a search with the given tag facet' do
-      allow(SolrDocument).to receive_messages(solr_field_for_tagger: :exhibit_tags)
       expected = spotlight.search_exhibit_catalog_path(exhibit_id: helper.current_exhibit, f: { exhibit_tags: ['tag_value'] })
       expect(helper.url_to_tag_facet('tag_value')).to eq expected
     end
@@ -156,8 +155,8 @@ describe Spotlight::ApplicationHelper, type: :helper do
     end
 
     it 'excludes view fields that are never visible (e.g. atom, rss)' do
-      blacklight_config.view.a.if = true
-      blacklight_config.view.b.if = false
+      blacklight_config.view.a(if: true)
+      blacklight_config.view.b(if: false)
 
       expect(helper.available_view_fields).to include :a
       expect(helper.available_view_fields).not_to include :b
@@ -173,9 +172,9 @@ describe Spotlight::ApplicationHelper, type: :helper do
       # clean out the default views
       blacklight_config.view.reject! { |_| true }
 
-      blacklight_config.view.a
-      blacklight_config.view.b
-      blacklight_config.view.c
+      blacklight_config.view.a!
+      blacklight_config.view.b!
+      blacklight_config.view.c!
       allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
     end
 

data/spec/helpers/spotlight/crud_link_helpers_spec.rb

@@ -104,7 +104,7 @@ describe Spotlight::CrudLinkHelpers, type: :helper do
   describe '#action_default_value' do
     it 'attempts i18n lookups for models' do
       expect(I18n).to receive(:t).with(:'helpers.action.spotlight/feature_page.edit',
-                                       model: some_model.class.model_name.human,
+                                       model: some_model.class.model_name.human.downcase,
                                        default: [:'helpers.action.edit', 'Edit Feature page'])
       expect(helper.send(:action_default_value, some_model))
     end
@@ -112,14 +112,14 @@ describe Spotlight::CrudLinkHelpers, type: :helper do
     it 'attempts i18n lookups for unpersisted models' do
       some_model = Spotlight::FeaturePage.new
       expect(I18n).to receive(:t).with(:'helpers.action.spotlight/feature_page.create',
-                                       model: some_model.class.model_name.human,
+                                       model: some_model.class.model_name.human.downcase,
                                        default: [:'helpers.action.create', 'Create Feature page'])
       expect(helper.send(:action_default_value, some_model))
     end
 
     it 'attempts i18n lookups for models with an explicit action' do
       expect(I18n).to receive(:t).with(:'helpers.action.spotlight/feature_page.custom_action',
-                                       model: some_model.class.model_name.human,
+                                       model: some_model.class.model_name.human.downcase,
                                        default: [:'helpers.action.custom_action', 'Custom action Feature page'])
       expect(helper.send(:action_default_value, some_model, :custom_action))
     end

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -12,21 +12,6 @@ describe Spotlight::PagesHelper, type: :helper do
     allow(helper).to receive_messages(blacklight_config: blacklight_config)
   end
 
-  describe 'available_index_fields' do
-    before do
-      blacklight_config.index.title_field = :title_field
-      blacklight_config.add_index_field 'x', label: 'X'
-    end
-
-    it 'lists the configured index fields' do
-      expect(helper.available_index_fields).to include key: 'x', label: 'X'
-    end
-
-    it 'adds the title field if necessary' do
-      expect(helper.available_index_fields).to include key: :title_field, label: 'Title'
-    end
-  end
-
   describe 'disable_save_pages_button?' do
     it 'returns true if there are no pages and we are on the about pages page' do
       expect(helper).to receive(:page_collection_name).and_return('about_pages')
@@ -106,6 +91,14 @@ describe Spotlight::PagesHelper, type: :helper do
     it 'handles nil input' do
       expect(helper.sir_trevor_markdown(nil)).to be_blank
     end
+
+    it 'retains paragraphs' do
+      expect(helper.sir_trevor_markdown('<p>First Line</p><p>Second Line</p>').chomp).to match(%r{<p>First Line</p>\s*<p>Second Line</p>})
+    end
+
+    it 'replaces line breaks with paragraphs' do
+      expect(helper.sir_trevor_markdown('First Line<br>Second Line').chomp).to match(%r{<p>First Line</p>\s*<p>Second Line</p>})
+    end
   end
 
   describe '#content_editor_class' do

data/spec/helpers/spotlight/roles_helper_spec.rb

@@ -2,6 +2,6 @@
 
 describe Spotlight::RolesHelper, type: :helper do
   it 'is a list of options' do
-    expect(helper.roles_for_select).to eq('Admin' => 'admin', 'Curator' => 'curator')
+    expect(helper.roles_for_select).to eq('Admin' => 'admin', 'Curator' => 'curator', 'Viewer' => 'viewer')
   end
 end

data/spec/i18n_spec.rb

@@ -13,6 +13,7 @@ RSpec.describe 'I18n' do
   end
 
   it 'does not have unused keys' do
+    puts unused_keys.inspect
     expect(unused_keys).to be_empty,
                            "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"
   end

data/spec/jobs/spotlight/add_tags_job_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+describe Spotlight::AddTagsJob do
+  subject { described_class.new(solr_params: solr_params, exhibit: exhibit, tags: tags) }
+
+  let(:solr_params) { { q: 'map' } }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:tags) { 'hello,world' }
+
+  before do
+    allow(Spotlight::Engine.config).to receive_messages(bulk_actions_batch_size: 5)
+  end
+
+  it 'adds tags to SolrDocumentSidecar objects' do
+    subject.perform_now
+    response = exhibit.blacklight_config.repository.search(solr_params.merge('rows' => 999_999_999))
+    expect(response.total).to eq 55
+    expect(Spotlight::JobTracker.last).to have_attributes(
+      status: 'completed',
+      total: 55,
+      progress: 55,
+      job_class: 'Spotlight::AddTagsJob'
+    )
+    response.documents.each do |document|
+      expect(document.sidecar(exhibit).all_tags_list).to include('hello', 'world')
+      exhibit.tag(document.sidecar(exhibit), with: [], on: :tags)
+    end
+    exhibit.owned_tags.destroy_all
+    response.documents.each do |document|
+      document.sidecar(exhibit).destroy
+      document.reindex
+    end
+  end
+end

data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb

@@ -48,7 +48,10 @@ describe Spotlight::AddUploadsFromCsv do
       expect(Spotlight::IndexingCompleteMailer).to have_received(:documents_indexed).with(
         data, exhibit, user,
         indexed_count: 1,
-        errors: { 1 => array_including(match(/relative URI: x/)), 2 => array_including(match(/Upload is invalid/)) }
+        errors: {
+          1 => array_including(match(Regexp.union(/relative URI: x/, /URI scheme '' not in whitelist:/))),
+          2 => array_including(match(/Upload is invalid/))
+        }
       )
     end
   end

data/spec/jobs/spotlight/change_visibility_job_spec.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+describe Spotlight::ChangeVisibilityJob do
+  subject { described_class.new(solr_params: solr_params, exhibit: exhibit, visibility: visibility) }
+
+  let(:solr_params) { { q: 'map' } }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:visibility) { 'private' }
+
+  before do
+    allow(Spotlight::Engine.config).to receive_messages(bulk_actions_batch_size: 5)
+  end
+
+  it 'sets the items based off of the visibility' do
+    subject.perform_now
+    response = exhibit.blacklight_config.repository.search(solr_params.merge('rows' => 999_999_999))
+    expect(response.total).to eq 55
+    expect(Spotlight::JobTracker.last).to have_attributes(
+      status: 'completed',
+      total: 55,
+      progress: 55,
+      job_class: 'Spotlight::ChangeVisibilityJob'
+    )
+    response.documents.each do |document|
+      expect(document.private?(exhibit)).to be true
+      document.make_public!(exhibit)
+      document.reindex
+    end
+  end
+end

data/spec/jobs/spotlight/process_bulk_updates_csv_job_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+def tag_names(exhibit, id)
+  exhibit.blacklight_config.repository.find(id).documents.first.sidecar(exhibit).taggings.includes(:tag).map { |tagging| tagging&.tag&.name }
+end
+
+describe Spotlight::ProcessBulkUpdatesCsvJob do
+  subject { described_class.new(exhibit, bulk_update) }
+
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+
+  describe 'visibility' do
+    let(:bulk_update) { FactoryBot.create(:bulk_update, exhibit: exhibit) }
+
+    it 'is updated' do
+      allow(SolrDocument.index.connection).to receive(:update).and_call_original
+      expect(exhibit.blacklight_config.repository.find('dq287tq6352').documents.first).not_to be_private(exhibit)
+
+      subject.perform_now
+
+      expect(exhibit.blacklight_config.repository.find('dq287tq6352').documents.first).to be_private(exhibit)
+      expect(SolrDocument.index.connection).to have_received(:update)
+    end
+
+    context 'with a row that does not change visibility' do
+      before do
+        sidecar = exhibit.solr_document_sidecars.find_or_create_by(document_type: 'SolrDocument', document_id: 'dq287tq6352')
+        sidecar.private!
+      end
+
+      it 'does not update solr' do
+        allow(SolrDocument.index.connection).to receive(:update)
+
+        subject.perform_now
+
+        expect(SolrDocument.index.connection).not_to have_received(:update)
+      end
+    end
+  end
+
+  describe 'tags' do
+    let(:bulk_update) { FactoryBot.create(:tagged_bulk_update, exhibit: exhibit) }
+
+    before do
+      document = exhibit.blacklight_config.repository.find('cz507zk0531').documents.first
+      exhibit.tag(document.sidecar(exhibit), with: 'CSV Tag1', on: :tags)
+    end
+
+    it 'are added/removed' do
+      allow(SolrDocument.index.connection).to receive(:update).and_call_original
+      expect(tag_names(exhibit, 'bm387cy2596')).to be_empty
+      expect(tag_names(exhibit, 'cz507zk0531')).to eq(['CSV Tag1'])
+      expect(tag_names(exhibit, 'dq287tq6352')).to be_empty
+      subject.perform_now
+      expect(tag_names(exhibit, 'bm387cy2596')).to eq(['CSV Tag1', 'CSV Tag2'])
+      expect(tag_names(exhibit, 'cz507zk0531')).to eq(['CSV Tag2'])
+      expect(tag_names(exhibit, 'dq287tq6352')).to eq(['CSV Tag1', 'CSV Tag2'])
+
+      # 3 updates plus the final commit
+      expect(SolrDocument.index.connection).to have_received(:update).exactly(4).times
+    end
+
+    context 'with a row that does not change visibility' do
+      before do
+        # set up the documents to match what's the in the spreadsheet already
+        subject.perform_now
+      end
+
+      it 'does not update solr' do
+        allow(SolrDocument.index.connection).to receive(:update)
+
+        subject.perform_now
+
+        expect(SolrDocument.index.connection).not_to have_received(:update)
+      end
+    end
+  end
+end

data/spec/jobs/spotlight/reindex_exhibit_job_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+describe Spotlight::ReindexExhibitJob do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+
+  before do
+    FactoryBot.create_list(:resource, 10, exhibit: exhibit)
+    allow(Spotlight::ReindexJob).to receive(:perform_now)
+    allow(Spotlight::ReindexJob).to receive(:perform_later)
+  end
+
+  context 'with a single batch' do
+    it 'runs the index job inline' do
+      described_class.perform_now(exhibit, batch_count: 1)
+
+      expect(Spotlight::ReindexJob).to have_received(:perform_now).once.with(exhibit, anything)
+    end
+  end
+
+  context 'with a fixed batch count' do
+    it 'enqueues that number of batches' do
+      described_class.perform_now(exhibit, batch_count: 2)
+
+      expect(Spotlight::ReindexJob).to have_received(:perform_later).twice.with(exhibit, hash_including(:start, :finish))
+    end
+  end
+
+  context 'with a dynamically generated batch count' do
+    it 'enqueues the right number of batches' do
+      described_class.perform_now(exhibit, batch_count: nil, batch_size: 2)
+
+      expect(Spotlight::ReindexJob).to have_received(:perform_later).exactly(5).times.with(exhibit, hash_including(:start, :finish))
+    end
+  end
+
+  context 'with a dynamically generated batch size' do
+    it 'figues out that number of batches' do
+      described_class.perform_now(exhibit, batch_count: nil, batch_size: nil)
+
+      expect(Spotlight::ReindexJob).to have_received(:perform_later).exactly(3).times.with(exhibit, hash_including(:start, :finish))
+    end
+  end
+end

data/spec/jobs/spotlight/reindex_job_spec.rb

@@ -4,67 +4,13 @@ describe Spotlight::ReindexJob do
   include ActiveJob::TestHelper
 
   let(:exhibit) { FactoryBot.create(:exhibit) }
-  let(:resource) { FactoryBot.create(:resource) }
+  let(:resource) { FactoryBot.create(:resource, exhibit: exhibit) }
   let(:user) { FactoryBot.create(:user) }
-  let(:log_entry) { Spotlight::ReindexingLogEntry.create(exhibit: exhibit, user: user) }
 
   before do
-    ActiveJob::Base.queue_adapter = :test
     allow_any_instance_of(Spotlight::Resource).to receive(:reindex)
   end
 
-  context 'with an exhibit' do
-    subject { described_class.new(exhibit) }
-
-    before do
-      exhibit.resources << resource
-      exhibit.save
-    end
-
-    it 'attempts to reindex every resource in the exhibit' do
-      # ActiveJob will reload the collection, so we go through a little trouble:
-      expect_any_instance_of(Spotlight::Resource).to receive(:reindex) do |thingy|
-        expect(exhibit.resources).to include thingy
-      end
-
-      subject.perform_now
-    end
-
-    context 'with a log_entry' do
-      subject { described_class.new(exhibit, log_entry) }
-
-      it 'marks the log entry as started' do
-        expect(log_entry).to receive(:in_progress!)
-        subject.perform_now
-      end
-
-      it 'marks the log entry as successful if there is no error' do
-        expect(log_entry).to receive(:succeeded!)
-        subject.perform_now
-      end
-
-      it 'marks the log entry as failed if there is an error' do
-        unexpected_error = StandardError.new
-        # it'd be more realistic to raise on resource#reindex, but that's already stubbed above, so this'll have to do
-        expect(subject).to receive(:perform).with(exhibit, log_entry).and_raise unexpected_error
-        expect(log_entry).to receive(:failed!)
-        expect { subject.perform_now }.to raise_error unexpected_error
-      end
-
-      it 'updates the items_reindexed_estimate field on the log entry' do
-        expect(log_entry).to receive(:update).with(items_reindexed_estimate: 1)
-        subject.perform_now
-      end
-
-      it 'passes log_entry to the resource.reindex call' do
-        # ActiveJob will reload the collection, so we go through a little trouble:
-        expect_any_instance_of(Spotlight::Resource).to receive(:reindex).with(log_entry).exactly(:once)
-        # expect(resource).to receive(:reindex).with(log_entry)
-        subject.perform_now
-      end
-    end
-  end
-
   context 'with a resource' do
     subject { described_class.new(resource) }
 
@@ -72,34 +18,62 @@ describe Spotlight::ReindexJob do
       expect(resource).to receive(:reindex)
       subject.perform_now
     end
+
+    it 'adds some job tracking events' do
+      expect { subject.perform_now }.to change(Spotlight::Event, :count).by(1)
+    end
   end
 
   describe 'validity' do
-    subject { described_class.new(resource, nil, 'xyz') }
+    subject { described_class.new(resource, 'validity_token' => 'xyz') }
 
     let(:mock_checker) { instance_double(Spotlight::ValidityChecker) }
 
     before do
       allow(described_class).to receive(:validity_checker).and_return(mock_checker)
-      allow(mock_checker).to receive(:mint).with(resource).and_return('xyz')
+      allow(mock_checker).to receive(:mint).with(anything).and_return('xyz')
     end
 
     it 'mints a new validity token' do
-      expect { described_class.perform_later(resource) }.to have_enqueued_job(described_class).with(resource, nil, 'xyz')
+      expect { described_class.perform_later(resource) }.to have_enqueued_job(described_class).with(resource, 'validity_token' => 'xyz')
     end
 
     it 'does nothing if the token is no longer valid' do
-      allow(mock_checker).to receive(:check).with(resource, 'xyz').and_return(false)
+      allow(mock_checker).to receive(:check).with(subject, validity_token: 'xyz').and_return(false)
       expect(resource).not_to receive(:reindex)
 
       subject.perform_now
     end
 
     it 'indexes the resource if the token is valid' do
-      allow(mock_checker).to receive(:check).with(resource, 'xyz').and_return(true)
+      allow(mock_checker).to receive(:check).with(subject, validity_token: 'xyz').and_return(true)
       expect(resource).to receive(:reindex)
 
       subject.perform_now
     end
   end
+
+  context 'with start and finish' do
+    it 'indexes the resources within that page' do
+      count = 0
+      allow_any_instance_of(Spotlight::Resource).to receive(:reindex) do
+        count += 1
+      end
+
+      described_class.perform_now(exhibit, start: 0, finish: resource.id)
+
+      expect(count).to eq 1
+    end
+
+    it 'does not index resources off that page' do
+      count = 0
+      allow_any_instance_of(Spotlight::Resource).to receive(:reindex) do
+        count += 1
+      end
+
+      described_class.perform_now(exhibit, start: resource.id + 1, finish: resource.id + 500)
+
+      expect(count).to eq 0
+    end
+  end
 end