blacklight-spotlight 1.0.0 → 1.1.0

data/spec/models/spotlight/resource_spec.rb

@@ -2,7 +2,7 @@ describe Spotlight::Resource, type: :model do
   before do
     allow_any_instance_of(described_class).to receive(:update_index)
   end
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   describe '#reindex' do
     context 'with a provider that generates ids' do
@@ -34,6 +34,17 @@ describe Spotlight::Resource, type: :model do
         subject.reindex
       end
 
+      context 'when a document does not have an identifier' do
+        let(:solr_response) { { other_field: 'Content' } }
+
+        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)
+
+          subject.reindex
+        end
+      end
+
       context 'reindexing_log_entry is provided' do
         before do
           allow(subject.send(:blacklight_solr)).to receive(:update)

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spotlight::Resources::IiifHarvester do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:harvester) { described_class.create(exhibit_id: exhibit.id, url: url) }
 
   describe 'Validation' do

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

@@ -20,7 +20,7 @@ describe Spotlight::Resources::IiifManifest do
 
   describe '#to_solr' do
     let(:manifest) { Spotlight::Resources::IiifService.new(url).send(:object) }
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     describe 'id' do
       it 'is an MD5 hexdigest of the exhibit id and the and the url' do
         expected = Digest::MD5.hexdigest("#{exhibit.id}-#{url}")

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

@@ -1,7 +1,7 @@
 
 describe Spotlight::Resources::Upload, type: :model do
-  let!(:exhibit) { FactoryGirl.create :exhibit }
-  let!(:custom_field) { FactoryGirl.create :custom_field, exhibit: exhibit }
+  let!(:exhibit) { FactoryBot.create :exhibit }
+  let!(:custom_field) { FactoryBot.create :custom_field, exhibit: exhibit }
   let(:resource) { described_class.new(exhibit: exhibit) }
   let(:doc_builder) { resource.document_builder }
 
@@ -16,7 +16,7 @@ describe Spotlight::Resources::Upload, type: :model do
       custom_field.field => 'Custom Field Data'
     }
   end
-  let(:featured_image) { FactoryGirl.create(:featured_image, image: File.open(File.join(FIXTURES_PATH, '800x600.png'))) }
+  let(:featured_image) { FactoryBot.create(:featured_image, image: File.open(File.join(FIXTURES_PATH, '800x600.png'))) }
 
   before do
     Rails.cache.clear # wipes out any cached image info.

data/spec/models/spotlight/role_spec.rb

@@ -10,7 +10,7 @@ describe Spotlight::Role, type: :model do
     end
     describe 'with user_key' do
       describe "that doesn't point at a user" do
-        let(:user) { FactoryGirl.build(:user) }
+        let(:user) { FactoryBot.build(:user) }
         let(:args) { { role: 'curator', user_key: user.email } }
         it 'does not be valid' do
           expect(subject).to be_valid
@@ -19,7 +19,7 @@ describe Spotlight::Role, type: :model do
         end
       end
       describe 'that points at a user' do
-        let(:user) { FactoryGirl.create(:user) }
+        let(:user) { FactoryBot.create(:user) }
         let(:args) { { role: 'curator', user_key: user.email } }
         it 'is valid' do
           expect(subject).to be_valid
@@ -27,7 +27,7 @@ describe Spotlight::Role, type: :model do
         end
       end
       describe 'that points at a user with an existing role' do
-        let(:user) { FactoryGirl.create(:user) }
+        let(:user) { FactoryBot.create(:user) }
         before { described_class.create!(role: 'curator', user: user) }
         let(:args) { { role: 'curator', user_key: user.email } }
         it 'is valid' do

data/spec/models/spotlight/search_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::Search, type: :model do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   let(:query_params) { { 'f' => { 'genre_sim' => ['map'] } } }
   subject { exhibit.searches.build(title: 'Search', query_params: query_params) }
@@ -19,16 +19,16 @@ describe Spotlight::Search, type: :model do
   end
 
   describe 'default_scope' do
-    let!(:page1) { FactoryGirl.create(:search, weight: 5, published: true) }
-    let!(:page2) { FactoryGirl.create(:search, weight: 1, published: true) }
-    let!(:page3) { FactoryGirl.create(:search, weight: 10, published: true) }
+    let!(:page1) { FactoryBot.create(:search, weight: 5, published: true) }
+    let!(:page2) { FactoryBot.create(:search, weight: 1, published: true) }
+    let!(:page3) { FactoryBot.create(:search, weight: 10, published: true) }
     it 'orders by weight' do
       expect(described_class.published.map(&:weight)).to eq [1, 5, 10]
     end
   end
 
   describe '#slug' do
-    let(:search) { FactoryGirl.create(:search) }
+    let(:search) { FactoryBot.create(:search) }
 
     it 'gets a default slug' do
       expect(search.slug).not_to be_blank
@@ -40,7 +40,7 @@ describe Spotlight::Search, type: :model do
     end
 
     context 'with a custom slug' do
-      let(:search) { FactoryGirl.create(:search, slug: 'xyz') }
+      let(:search) { FactoryBot.create(:search, slug: 'xyz') }
 
       it 'gets a default slug' do
         expect(search.slug).to eq 'xyz'
@@ -65,7 +65,7 @@ describe Spotlight::Search, type: :model do
   end
 
   describe '#repository' do
-    let(:search) { FactoryGirl.create(:search) }
+    let(:search) { FactoryBot.create(:search) }
     before do
       allow(search).to receive(:blacklight_config).and_return blacklight_config
     end

data/spec/models/spotlight/sitemap_spec.rb

@@ -2,7 +2,7 @@ require 'sitemap_generator'
 
 describe Spotlight::Sitemap do
   let(:sitemap) { SitemapGenerator::Interpreter.new }
-  let(:exhibit) { FactoryGirl.create(:exhibit, published: true) }
+  let(:exhibit) { FactoryBot.create(:exhibit, published: true) }
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:sitemap_content) { sitemap.sitemap.sitemap.instance_variable_get(:@xml_content) }
   let(:url_helpers) { Spotlight::Engine.routes.url_helpers }
@@ -18,8 +18,8 @@ describe Spotlight::Sitemap do
   end
 
   describe '.add_all_exhibits' do
-    let!(:second_exhibit) { FactoryGirl.create(:exhibit, published: true) }
-    let!(:unpublished_exhibit) { FactoryGirl.create(:exhibit, published: false) }
+    let!(:second_exhibit) { FactoryBot.create(:exhibit, published: true) }
+    let!(:unpublished_exhibit) { FactoryBot.create(:exhibit, published: false) }
 
     it 'builds a sitemap for all published exhibits' do
       sitemaps = []
@@ -73,8 +73,8 @@ describe Spotlight::Sitemap do
   end
 
   describe '#add_pages' do
-    let!(:feature_page) { FactoryGirl.create(:feature_page, exhibit: exhibit, published: true) }
-    let!(:about_page) { FactoryGirl.create(:about_page, exhibit: exhibit, published: true) }
+    let!(:feature_page) { FactoryBot.create(:feature_page, exhibit: exhibit, published: true) }
+    let!(:about_page) { FactoryBot.create(:about_page, exhibit: exhibit, published: true) }
 
     it 'adds feature pages' do
       subject.add_pages
@@ -101,7 +101,7 @@ describe Spotlight::Sitemap do
   end
 
   describe '#add_browse_categories' do
-    let!(:search) { FactoryGirl.create(:published_search, exhibit: exhibit) }
+    let!(:search) { FactoryBot.create(:published_search, exhibit: exhibit) }
 
     it 'adds browse categories to the sitemap' do
       subject.add_browse_categories

data/spec/models/spotlight/solr_document_sidecar_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::SolrDocumentSidecar, type: :model do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   before do
     allow(subject).to receive_messages exhibit: exhibit
     allow(subject).to receive_messages document: SolrDocument.new(id: 'doc_id')

data/spec/presenters/spotlight/iiif_manifest_presenter_spec.rb

@@ -2,7 +2,7 @@ describe Spotlight::IiifManifestPresenter do
   require 'iiif_manifest'
 
   let(:resource) { SolrDocument.new(id: '1-1') }
-  let(:uploaded_resource) { FactoryGirl.build(:uploaded_resource) }
+  let(:uploaded_resource) { FactoryBot.build(:uploaded_resource) }
   let(:controller) { double(Spotlight::CatalogController) }
 
   let(:subject) { described_class.new(resource, controller) }

data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::ExhibitExportSerializer do
-  let!(:source_exhibit) { FactoryGirl.create(:exhibit) }
+  let!(:source_exhibit) { FactoryBot.create(:exhibit) }
 
   before do
     allow_any_instance_of(Spotlight::Search).to receive(:set_default_featured_image)
@@ -82,7 +82,7 @@ describe Spotlight::ExhibitExportSerializer do
     end
 
     subject do
-      e = FactoryGirl.create(:exhibit)
+      e = FactoryBot.create(:exhibit)
       e.import(export).tap(&:save)
     end
 
@@ -124,9 +124,9 @@ describe Spotlight::ExhibitExportSerializer do
     context 'for an exhibit with contacts' do
       context 'for a contact with an avatar' do
         let!(:curator) do
-          FactoryGirl.create(:contact, :with_avatar,
-                             exhibit: source_exhibit,
-                             contact_info: { title: 'xyz' })
+          FactoryBot.create(:contact, :with_avatar,
+                            exhibit: source_exhibit,
+                            contact_info: { title: 'xyz' })
         end
         it 'has contacts' do
           expect(subject.contacts.count).to eq 1
@@ -138,7 +138,7 @@ describe Spotlight::ExhibitExportSerializer do
 
       context 'for a contact without an avatar' do
         let!(:curator) do
-          FactoryGirl.create(:contact, exhibit: source_exhibit, avatar: nil)
+          FactoryBot.create(:contact, exhibit: source_exhibit, avatar: nil)
         end
 
         it 'has contacts' do
@@ -166,13 +166,13 @@ describe Spotlight::ExhibitExportSerializer do
     end
 
     it 'deals with nested feature pages' do
-      FactoryGirl.create :feature_subpage, exhibit: source_exhibit
+      FactoryBot.create :feature_subpage, exhibit: source_exhibit
       expect(subject.feature_pages.at_top_level.length).to eq 1
       expect(subject.feature_pages.first.child_pages.length).to eq 1
     end
 
     context 'page slugs' do
-      let!(:feature_page) { FactoryGirl.create(:feature_page, exhibit: source_exhibit, slug: 'xyz') }
+      let!(:feature_page) { FactoryBot.create(:feature_page, exhibit: source_exhibit, slug: 'xyz') }
 
       it 'uses the existing slug for the page' do
         expect(subject.feature_pages.find('xyz')).to be_persisted
@@ -180,8 +180,8 @@ describe Spotlight::ExhibitExportSerializer do
     end
 
     context 'with a feature page' do
-      let(:feature_page) { FactoryGirl.create(:feature_page, exhibit: source_exhibit) }
-      let(:thumbnail) { FactoryGirl.create(:featured_image) }
+      let(:feature_page) { FactoryBot.create(:feature_page, exhibit: source_exhibit) }
+      let(:thumbnail) { FactoryBot.create(:featured_image) }
 
       before do
         feature_page.content = { data: [{ type: 'text', data: { text: 'xyz' } }] }.to_json
@@ -207,23 +207,23 @@ describe Spotlight::ExhibitExportSerializer do
     end
 
     it 'assigns STI resources the correct class' do
-      resource = FactoryGirl.create :uploaded_resource, exhibit: source_exhibit
+      resource = FactoryBot.create :uploaded_resource, exhibit: source_exhibit
       expect(subject.resources.length).to eq 1
       expect(subject.resources.first.class).to eq Spotlight::Resources::Upload
       expect(subject.resources.first.upload.image.path).not_to eq resource.upload.image.path
     end
 
     it 'assigns normal resources the correct class' do
-      resource = FactoryGirl.create :resource, exhibit: source_exhibit
+      resource = FactoryBot.create :resource, exhibit: source_exhibit
       expect(subject.resources.length).to eq 1
       expect(subject.resources.first.class).to eq Spotlight::Resource
       expect(subject.resources.first.url).to eq resource.url
     end
 
     context 'with a browse category' do
-      let(:masthead) { FactoryGirl.create(:masthead) }
-      let(:thumbnail) { FactoryGirl.create(:featured_image) }
-      let!(:search) { FactoryGirl.create(:search, exhibit: source_exhibit, masthead: masthead, thumbnail: thumbnail) }
+      let(:masthead) { FactoryBot.create(:masthead) }
+      let(:thumbnail) { FactoryBot.create(:featured_image) }
+      let!(:search) { FactoryBot.create(:search, exhibit: source_exhibit, masthead: masthead, thumbnail: thumbnail) }
 
       before do
         source_exhibit.reload
@@ -267,7 +267,7 @@ describe Spotlight::ExhibitExportSerializer do
     end
 
     context 'with a masthead' do
-      let!(:masthead) { FactoryGirl.create(:masthead) }
+      let!(:masthead) { FactoryBot.create(:masthead) }
 
       before do
         source_exhibit.masthead = masthead
@@ -280,7 +280,7 @@ describe Spotlight::ExhibitExportSerializer do
     end
 
     context 'with a thumbnail' do
-      let!(:thumbnail) { FactoryGirl.create(:exhibit_thumbnail) }
+      let!(:thumbnail) { FactoryBot.create(:exhibit_thumbnail) }
 
       before do
         source_exhibit.thumbnail = thumbnail
@@ -294,9 +294,9 @@ describe Spotlight::ExhibitExportSerializer do
   end
 
   it 'is idempotent-ish' do
-    FactoryGirl.create :feature_subpage, exhibit: source_exhibit
+    FactoryBot.create :feature_subpage, exhibit: source_exhibit
     export = described_class.new(source_exhibit).as_json
-    e = FactoryGirl.create(:exhibit)
+    e = FactoryBot.create(:exhibit)
     e.import(export).tap(&:save)
     e.import(export).tap(&:save)
   end
@@ -315,7 +315,7 @@ describe Spotlight::ExhibitExportSerializer do
     end
 
     subject do
-      e = FactoryGirl.create(:exhibit)
+      e = FactoryBot.create(:exhibit)
       e.import(export).tap(&:save)
     end
 

data/spec/services/spotlight/carrierwave_file_resolver_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Spotlight::CarrierwaveFileResolver do
-  let(:masthead) { FactoryGirl.create(:masthead) }
+  let(:masthead) { FactoryBot.create(:masthead) }
   let(:resolver) { described_class.new }
 
   describe 'finding the file' do

data/spec/services/spotlight/iiif_resource_resolver_spec.rb

@@ -6,7 +6,7 @@ describe Spotlight::IiifResourceResolver do
   end
   let(:iiif_manifest_url) { 'https://purl.stanford.edu/gk446cj2442/manifest.json' }
   let(:resource) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :featured_image,
       iiif_manifest_url: iiif_manifest_url,
       iiif_image_id: 'https://purl.stanford.edu/gk446cj2442/iiif/annotation/gk446cj2442_1',

data/spec/services/spotlight/solr_document_builder_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::SolrDocumentBuilder do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:doc_builder) { described_class.new(resource) }
   let(:resource) { Spotlight::Resource.new }
 
@@ -18,8 +18,8 @@ describe Spotlight::SolrDocumentBuilder do
   describe '#documents_to_index' do
     context 'when the document belongs to more than one exhibit' do
       let(:doc) { SolrDocument.new(id: 'abc123') }
-      let(:resource) { FactoryGirl.create(:resource) }
-      let(:resource_alt) { FactoryGirl.create(:resource) }
+      let(:resource) { FactoryBot.create(:resource) }
+      let(:resource_alt) { FactoryBot.create(:resource) }
       subject { resource.document_builder }
 
       before do

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 ENV['RAILS_ENV'] ||= 'test'
-require 'factory_girl'
+require 'factory_bot'
 require 'database_cleaner'
 require 'devise'
 require 'engine_cart'
@@ -12,6 +12,7 @@ require 'rspec/collection_matchers'
 require 'rspec/its'
 require 'rspec/rails'
 require 'rspec/active_model/mocks'
+require 'paper_trail/frameworks/rspec'
 
 require 'selenium-webdriver'
 
@@ -45,8 +46,8 @@ Spotlight::Engine.config.exhibit_themes = %w(default modern)
 
 Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
-FactoryGirl.definition_file_paths = [File.expand_path('../factories', __FILE__)]
-FactoryGirl.find_definitions
+FactoryBot.definition_file_paths = [File.expand_path('../factories', __FILE__)]
+FactoryBot.find_definitions
 
 FIXTURES_PATH = File.expand_path('../fixtures', __FILE__)
 
@@ -72,8 +73,6 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-  config.filter_run_excluding js: true if ENV['CI']
-
   if defined? Devise::Test::ControllerHelpers
     config.include Devise::Test::ControllerHelpers, type: :controller
     config.include Devise::Test::ControllerHelpers, type: :view

data/spec/support/features/test_features_helpers.rb

@@ -24,10 +24,10 @@ module Spotlight
     def click_add_widget
       unless all('.st-block-replacer').present?
         expect(page).to have_css('.st-block-addition')
-        first('.st-block-addition').trigger('click')
+        first('.st-block-addition').click
       end
       expect(page).to have_css('.st-block-replacer')
-      first('.st-block-replacer').trigger('click')
+      first('.st-block-replacer').click
     end
 
     def save_page

data/spec/uploaders/spotlight/featured_image_uploader_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::FeaturedImageUploader do
-  let(:mounter) { FactoryGirl.create(:featured_image) }
+  let(:mounter) { FactoryBot.create(:featured_image) }
   subject(:featured_image_uploader) { described_class.new(mounter, 'mounted_as') }
 
   describe '#extension_whitelist' do

data/spec/views/_user_util_links.html.erb_spec.rb

@@ -1,5 +1,5 @@
 describe '_user_util_links', type: :view do
-  let(:current_exhibit) { FactoryGirl.create(:exhibit) }
+  let(:current_exhibit) { FactoryBot.create(:exhibit) }
   before do
     allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
     allow(view).to receive(:current_user).and_return(current_user)

data/spec/views/shared/_exhibit_navbar.html.erb_spec.rb

@@ -1,9 +1,9 @@
 describe 'shared/_exhibit_navbar', type: :view do
-  let(:current_exhibit) { FactoryGirl.create(:exhibit) }
-  let(:feature_page) { FactoryGirl.create(:feature_page, exhibit: current_exhibit) }
-  let(:unpublished_feature_page) { FactoryGirl.create(:feature_page, published: false, exhibit: current_exhibit) }
-  let(:about_page) { FactoryGirl.create(:about_page, exhibit: current_exhibit) }
-  let(:unpublished_about_page) { FactoryGirl.create(:about_page, published: false, exhibit: current_exhibit) }
+  let(:current_exhibit) { FactoryBot.create(:exhibit) }
+  let(:feature_page) { FactoryBot.create(:feature_page, exhibit: current_exhibit) }
+  let(:unpublished_feature_page) { FactoryBot.create(:feature_page, published: false, exhibit: current_exhibit) }
+  let(:about_page) { FactoryBot.create(:about_page, exhibit: current_exhibit) }
+  let(:unpublished_about_page) { FactoryBot.create(:about_page, published: false, exhibit: current_exhibit) }
 
   before do
     allow(view).to receive_messages(resource_masthead?: false)
@@ -38,7 +38,7 @@ describe 'shared/_exhibit_navbar', type: :view do
 
   it 'provides a dropdown of multiple feature pages' do
     feature_page
-    another_page = FactoryGirl.create(:feature_page, exhibit: current_exhibit)
+    another_page = FactoryBot.create(:feature_page, exhibit: current_exhibit)
     render
     expect(response).to have_selector '.dropdown .dropdown-toggle', text: 'Curated Features'
     expect(response).to have_link feature_page.title, visible: false, href: spotlight.exhibit_feature_page_path(current_exhibit, feature_page)
@@ -57,13 +57,13 @@ describe 'shared/_exhibit_navbar', type: :view do
   end
 
   it "links to the browse index if there's a published search" do
-    FactoryGirl.create :published_search, exhibit: current_exhibit
+    FactoryBot.create :published_search, exhibit: current_exhibit
     render
     expect(response).to have_link 'Browse', href: spotlight.exhibit_browse_index_path(current_exhibit)
   end
 
   it "marks the browse button as active if we're on a browse page" do
-    FactoryGirl.create :published_search, exhibit: current_exhibit
+    FactoryBot.create :published_search, exhibit: current_exhibit
     allow(view).to receive_messages(on_browse_page?: true)
     render
     expect(response).to have_selector 'li.active', text: 'Browse'
@@ -75,7 +75,7 @@ describe 'shared/_exhibit_navbar', type: :view do
   end
 
   it 'does not link to the browse index if only private categories are defined' do
-    FactoryGirl.create :search, exhibit: current_exhibit
+    FactoryBot.create :search, exhibit: current_exhibit
     render
     expect(response).not_to have_link 'Browse'
   end