blacklight-spotlight 1.0.0 → 1.1.0

data/spec/features/javascript/reindex_monitor_spec.rb

@@ -1,12 +1,12 @@
 feature 'Reindex Monitor', js: true do
   let(:resources) do
-    [FactoryGirl.create(:resource)]
+    [FactoryBot.create(:resource)]
   end
-  let(:exhibit) { FactoryGirl.create(:exhibit, resources: resources) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit, resources: resources) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
 
   before do
-    FactoryGirl.create(:in_progress_reindexing_log_entry, exhibit: exhibit, items_reindexed_estimate: 5)
+    FactoryBot.create(:in_progress_reindexing_log_entry, exhibit: exhibit, items_reindexed_estimate: 5)
     login_as exhibit_curator
     visit spotlight.admin_exhibit_catalog_path(exhibit)
   end

data/spec/features/javascript/roles_admin_spec.rb

@@ -1,6 +1,6 @@
 describe 'Roles Admin', type: :feature, js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
   before do
     login_as exhibit_admin
 
@@ -9,7 +9,7 @@ describe 'Roles Admin', type: :feature, js: true do
   end
 
   it 'has the appropriate status message when an existing user is added' do
-    second_user = FactoryGirl.create(:site_admin)
+    second_user = FactoryBot.create(:site_admin)
 
     click_link 'Add a new user'
     fill_in 'User key', with: second_user.email

data/spec/features/javascript/search_config_admin_spec.rb

@@ -1,6 +1,6 @@
 feature 'Search Configuration Administration', js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as user }
 
   describe 'search fields' do
@@ -13,7 +13,6 @@ feature 'Search Configuration Administration', js: true do
         click_link 'Exhibit dashboard'
       end
       click_link 'Search'
-      click_link 'Options'
 
       uncheck 'Display search box'
 

data/spec/features/javascript/search_context_spec.rb

@@ -1,8 +1,8 @@
 feature 'Search contexts' do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   let(:feature_page) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :feature_page,
       title: 'FeaturePage1',
       exhibit: exhibit
@@ -35,7 +35,7 @@ feature 'Search contexts' do
       expect(page).not_to have_css('.title')
     end
 
-    find('.thumbnail a').trigger('click')
+    find('.thumbnail a').click
 
     expect(page).to have_selector '.breadcrumb a', text: 'Home'
   end
@@ -65,14 +65,14 @@ feature 'Search contexts' do
       expect(page).not_to have_css('.title')
     end
 
-    find('.thumbnail a').trigger('click')
+    find('.thumbnail a').click
 
     expect(page).to have_selector '.breadcrumb a', text: 'Home'
     expect(page).to have_link 'FeaturePage1', href: spotlight.exhibit_feature_page_path(exhibit, feature_page)
   end
 
   context 'from a browse page' do
-    let!(:search) { FactoryGirl.create(:search, title: 'Some Saved Search', exhibit: exhibit, published: true) }
+    let!(:search) { FactoryBot.create(:search, title: 'Some Saved Search', exhibit: exhibit, published: true) }
 
     scenario 'should add context breadcrumbs back to the browse page when navigating to an item', js: true do
       visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)

data/spec/features/main_navigation_spec.rb

@@ -1,6 +1,6 @@
 describe 'Main navigation labels are settable', type: :feature do
-  let!(:exhibit) { FactoryGirl.create(:exhibit) }
-  let!(:about) { FactoryGirl.create(:about_page, exhibit: exhibit, published: true) }
+  let!(:exhibit) { FactoryBot.create(:exhibit) }
+  let!(:about) { FactoryBot.create(:about_page, exhibit: exhibit, published: true) }
   before do
     about_nav = exhibit.main_navigations.about
     about_nav.label = 'New About Label'

data/spec/features/metadata_admin_spec.rb

@@ -1,6 +1,6 @@
 describe 'Metadata Administration', type: :feature do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as user }
 
   describe 'edit' do

data/spec/features/report_a_problem_spec.rb

@@ -1,5 +1,5 @@
 describe 'Report a Problem', type: :feature do
-  let!(:exhibit) { FactoryGirl.create(:exhibit) }
+  let!(:exhibit) { FactoryBot.create(:exhibit) }
   let(:honeypot_field_name) { Spotlight::Engine.config.spambot_honeypot_email_field }
 
   it 'does not have a header link' do
@@ -47,7 +47,7 @@ describe 'Report a Problem', type: :feature do
       expect(find('#contact_form_current_url', visible: false).value).to end_with spotlight.exhibit_solr_document_path(exhibit, id: 'dq287tq6352')
       fill_in 'Name', with: 'Some Body'
       fill_in 'Email', with: 'test@example.com'
-      page.find("#contact_form_#{honeypot_field_name}", visible: false).set 'possible_spam@spam.com'
+      page.evaluate_script("$('#contact_form_#{honeypot_field_name}').val('possible_spam@spam.com')")
       fill_in 'Message', with: 'This is my problem report'
 
       expect do

data/spec/features/site_admin_management_spec.rb

@@ -1,8 +1,8 @@
 describe 'Site admin management', js: true do
-  let(:user) { FactoryGirl.create(:site_admin) }
-  let!(:existing_user) { FactoryGirl.create(:exhibit_visitor) }
-  let!(:exhibit_admin) { FactoryGirl.create(:exhibit_admin) }
-  let!(:exhibit_curator) { FactoryGirl.create(:exhibit_curator) }
+  let(:user) { FactoryBot.create(:site_admin) }
+  let!(:existing_user) { FactoryBot.create(:exhibit_visitor) }
+  let!(:exhibit_admin) { FactoryBot.create(:exhibit_admin) }
+  let!(:exhibit_curator) { FactoryBot.create(:exhibit_curator) }
 
   before do
     login_as(user)

data/spec/features/site_masthead_spec.rb

@@ -1,5 +1,5 @@
 describe 'Add and update the site masthead', type: :feature do
-  let(:user) { FactoryGirl.create(:site_admin) }
+  let(:user) { FactoryBot.create(:site_admin) }
 
   before { login_as user }
 

data/spec/features/slideshow_spec.rb

@@ -1,18 +1,19 @@
 describe 'Slideshow', type: :feature, js: true do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
 
   before do
     login_as user
     exhibit.blacklight_configuration.update(document_index_view_types: %w(list gallery slideshow))
   end
   it 'has slideshow' do
+    pending('does not work with chrome headless')
     visit spotlight.search_exhibit_catalog_path(exhibit, f: { genre_ssim: ['map'] })
     expect(page).to have_content 'You searched for:'
     within '.view-type' do
       click_link 'Slideshow'
     end
-    find('.grid [data-slide-to="1"]').trigger('click')
+    find('.grid [data-slide-to="1"]').click
     expect(page).to have_selector '#slideshow', visible: true
   end
 end

data/spec/features/tags_admin_spec.rb

@@ -1,7 +1,7 @@
 describe 'Tags Administration', type: :feature do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let!(:tagging) { FactoryGirl.create(:tagging, tagger: exhibit, taggable: exhibit) }
-  let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let!(:tagging) { FactoryBot.create(:tagging, tagger: exhibit, taggable: exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   before { login_as exhibit_curator }
 
   describe 'index' do

data/spec/features/user_admin_spec.rb

@@ -1,6 +1,6 @@
 describe 'User Administration', type: :feature do
-  let!(:exhibit) { FactoryGirl.create(:exhibit) }
-  let!(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
+  let!(:exhibit) { FactoryBot.create(:exhibit) }
+  let!(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as user }
   describe 'index' do
     it 'shows the users for the exhibit' do

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -52,7 +52,7 @@ describe Spotlight::ApplicationHelper, type: :helper do
 
   describe '#url_to_tag_facet' do
     before do
-      allow(helper).to receive_messages(current_exhibit: FactoryGirl.create(:exhibit))
+      allow(helper).to receive_messages(current_exhibit: FactoryBot.create(:exhibit))
       allow(helper).to receive_messages(blacklight_config: Blacklight::Configuration.new)
 
       # controller provided helper.
@@ -101,7 +101,7 @@ describe Spotlight::ApplicationHelper, type: :helper do
   end
 
   describe 'render_document_class' do
-    let(:current_exhibit) { FactoryGirl.create(:exhibit) }
+    let(:current_exhibit) { FactoryBot.create(:exhibit) }
     let(:document) { SolrDocument.new(some_field: 'Some data') }
     before do
       allow(helper).to receive_messages(current_exhibit: current_exhibit)

data/spec/helpers/spotlight/crud_link_helpers_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::CrudLinkHelpers, type: :helper do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:some_model) { Spotlight::FeaturePage.create! exhibit: exhibit }
   describe '#cancel_link' do
     it 'is a model-specific cancel link' do

data/spec/helpers/spotlight/main_app_helpers_spec.rb

@@ -2,8 +2,8 @@
 describe Spotlight::MainAppHelpers, type: :helper do
   describe '#show_contact_form?' do
     subject { helper }
-    let(:exhibit) { FactoryGirl.create :exhibit }
-    let(:exhibit_with_contacts) { FactoryGirl.create :exhibit }
+    let(:exhibit) { FactoryBot.create :exhibit }
+    let(:exhibit_with_contacts) { FactoryBot.create :exhibit }
     context 'with an exhibit with confirmed contacts' do
       before do
         exhibit_with_contacts.contact_emails.create(email: 'cabeer@stanford.edu').tap do |e|
@@ -42,7 +42,7 @@ describe Spotlight::MainAppHelpers, type: :helper do
   end
 
   describe '#exhibit_stylesheet_link_tag' do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     before do
       allow(helper).to receive_messages(current_exhibit: exhibit)
     end

data/spec/helpers/spotlight/meta_helper_spec.rb

@@ -1,6 +1,6 @@
 describe Spotlight::MetaHelper, type: :helper do
   describe '#add_exhibit_meta_content' do
-    let(:current_exhibit) { FactoryGirl.create(:exhibit) }
+    let(:current_exhibit) { FactoryBot.create(:exhibit) }
     before do
       allow(helper).to receive_messages(current_exhibit: current_exhibit)
       allow(helper).to receive(:site_title).and_return('some title')

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -2,9 +2,9 @@ describe Spotlight::PagesHelper, type: :helper do
   let(:blacklight_config) { Blacklight::Configuration.new { |config| config.show.title_field = :abc } }
   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!(:current_exhibit) { FactoryBot.create(:exhibit) }
   let!(:home_page) { current_exhibit.home_page }
-  let!(:search) { FactoryGirl.create(:search, exhibit: current_exhibit, query_params: { 'q' => 'query' }, published: true) }
+  let!(:search) { FactoryBot.create(:search, exhibit: current_exhibit, query_params: { 'q' => 'query' }, published: true) }
 
   before do
     allow(helper).to receive_messages(blacklight_config: blacklight_config)

data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb

@@ -1,7 +1,7 @@
 describe Spotlight::AddUploadsFromCSV do
   subject(:job) { described_class.new(data, exhibit, user) }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   let(:data) do
     [
       { 'url' => 'x' },
@@ -26,7 +26,7 @@ describe Spotlight::AddUploadsFromCSV do
   end
 
   it 'creates uploaded resources for each row of data' do
-    upload = FactoryGirl.create(:uploaded_resource)
+    upload = FactoryBot.create(:uploaded_resource)
     expect(Spotlight::Resources::Upload).to receive(:new).at_least(:once).and_return(upload)
 
     expect(upload).to receive(:build_upload).with(remote_image_url: 'x').and_call_original

data/spec/jobs/spotlight/reindex_job_spec.rb

@@ -1,8 +1,8 @@
 
 describe Spotlight::ReindexJob do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:resource) { FactoryGirl.create(:resource) }
-  let(:user) { FactoryGirl.create(:user) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:resource) { FactoryBot.create(:resource) }
+  let(:user) { FactoryBot.create(:user) }
   let(:log_entry) { Spotlight::ReindexingLogEntry.create(exhibit: exhibit, user: user) }
 
   before do

data/spec/jobs/spotlight/rename_sidecar_field_job_spec.rb

@@ -2,7 +2,7 @@
 describe Spotlight::RenameSidecarFieldJob do
   include ActiveJob::TestHelper
 
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:sidecar) { SolrDocument.new(id: 'test').sidecar(exhibit).tap(&:save!) }
 
   it 'updates the sidecar data and reindex affected documents' do

data/spec/lib/migration/iiif_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Migration::IIIF do
   let(:instance) { described_class.new('http://test.host') }
 
   context '#migrate_featured_images' do
-    let!(:old_exhibit_thumbnail) { FactoryGirl.create(:featured_image, type: nil, iiif_tilesource: nil) }
-    let!(:exhibit) { FactoryGirl.create(:exhibit, thumbnail_id: old_exhibit_thumbnail.id) }
+    let!(:old_exhibit_thumbnail) { FactoryBot.create(:featured_image, type: nil, iiif_tilesource: nil) }
+    let!(:exhibit) { FactoryBot.create(:exhibit, thumbnail_id: old_exhibit_thumbnail.id) }
     let(:updated_thumb) { Spotlight::FeaturedImage.find(old_exhibit_thumbnail.id) }
 
     context "when it's an exhibit thumbnail" do
@@ -47,7 +47,7 @@ RSpec.describe Migration::IIIF do
 
   describe '#migrate_upload_images' do
     let(:file) { double }
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     let!(:upload) { Spotlight::Resources::Upload.create(exhibit: exhibit) }
 
     before do

data/spec/lib/spotlight/controller_spec.rb

@@ -49,8 +49,8 @@ describe Spotlight::Controller do
     let(:search_masthead) { double('search-masthead', display?: true) }
     let(:no_display_search_masthead) { double('no-display-search-masthead', display?: false) }
     let(:exhibit_masthead) { double('exhibit-masthead', display?: true) }
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
-    let(:search) { FactoryGirl.create(:search) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
+    let(:search) { FactoryBot.create(:search) }
 
     it 'is nil by default' do
       expect(subject.current_masthead).to be_nil
@@ -86,7 +86,7 @@ describe Spotlight::Controller do
   end
 
   describe '#exhibit_search_facet_url' do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     let(:params) { { action: 'index', q: 'xyz' } }
 
     before do

data/spec/models/sir_trevor_rails/blocks/browse_block_spec.rb

@@ -1,6 +1,6 @@
 
 describe SirTrevorRails::Blocks::BrowseBlock do
-  let(:page) { FactoryGirl.create(:feature_page) }
+  let(:page) { FactoryBot.create(:feature_page) }
   let(:block_data) { {} }
   subject { described_class.new({ type: '', data: block_data }, page) }
 
@@ -18,4 +18,22 @@ describe SirTrevorRails::Blocks::BrowseBlock do
       expect(subject.items).to eq([])
     end
   end
+  describe '#as_json' do
+    context 'when no items are present' do
+      it 'returns an empty items value' do
+        block_data[:item] = nil
+        expect(subject.as_json[:data]).to include item: {}
+      end
+    end
+
+    context 'when the id of a browse category does not exist' do
+      it 'is not included the returned items hash' do
+        search = FactoryBot.create(:search, exhibit: page.exhibit)
+        block_data[:item] = { item_0: { 'id' => 'abc123' }, item_1: { 'id' => search.slug } }
+
+        expect(subject.as_json[:data][:item]).not_to have_key :item_0
+        expect(subject.as_json[:data][:item]).to have_key :item_1
+      end
+    end
+  end
 end

data/spec/models/sir_trevor_rails/blocks/featured_pages_block_spec.rb

@@ -1,5 +1,5 @@
 describe SirTrevorRails::Blocks::FeaturedPagesBlock do
-  let(:page) { FactoryGirl.create(:feature_page) }
+  let(:page) { FactoryBot.create(:feature_page) }
   let(:block_data) { {} }
   subject { described_class.new({ type: '', data: block_data }, page) }
 
@@ -17,4 +17,12 @@ describe SirTrevorRails::Blocks::FeaturedPagesBlock do
       expect(subject.items).to eq([])
     end
   end
+  describe '#as_json' do
+    context 'when no items are present' do
+      it 'returns an empty items value' do
+        block_data[:item] = nil
+        expect(subject.as_json[:data]).to include item: {}
+      end
+    end
+  end
 end

data/spec/models/sir_trevor_rails/blocks/search_results_block_spec.rb

@@ -1,5 +1,5 @@
 describe SirTrevorRails::Blocks::SearchResultsBlock do
-  let(:page) { FactoryGirl.create(:feature_page) }
+  let(:page) { FactoryBot.create(:feature_page) }
   let(:block_data) { {} }
   subject { described_class.new({ type: '', data: block_data }, page) }
 

data/spec/models/sir_trevor_rails/blocks/solr_documents_block_spec.rb

@@ -1,6 +1,6 @@
 
 describe SirTrevorRails::Blocks::SolrDocumentsBlock do
-  let(:page) { FactoryGirl.create(:feature_page) }
+  let(:page) { FactoryBot.create(:feature_page) }
   let(:block_data) { {} }
   subject { described_class.new({ type: '', data: block_data }, page) }
 

data/spec/models/solr_document_spec.rb

@@ -7,8 +7,8 @@ describe SolrDocument, type: :model do
     allow(subject).to receive_messages(reindex: nil)
   end
 
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:exhibit_alt) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_alt) { FactoryBot.create(:exhibit) }
 
   describe '.build_for_exhibit' do
     let(:id) { '123abc' }

data/spec/models/spotlight/ability_spec.rb

@@ -4,10 +4,10 @@ describe Spotlight::Ability, type: :model do
   before do
     allow_any_instance_of(Spotlight::Search).to receive(:set_default_featured_image)
   end
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
-  let(:search) { FactoryGirl.create(:published_search, exhibit: exhibit) }
-  let(:unpublished_search) { FactoryGirl.create(:search, exhibit: exhibit) }
-  let(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:search) { FactoryBot.create(:published_search, exhibit: exhibit) }
+  let(:unpublished_search) { FactoryBot.create(:search, exhibit: exhibit) }
+  let(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
   subject { Ability.new(user) }
 
   describe 'a user with no roles' do
@@ -22,14 +22,14 @@ describe Spotlight::Ability, type: :model do
   end
 
   describe 'a superadmin' do
-    let(:user) { FactoryGirl.create(:site_admin) }
+    let(:user) { FactoryBot.create(:site_admin) }
 
     it { is_expected.to be_able_to(:create, Spotlight::Exhibit) }
   end
 
   describe 'a user with admin role' do
-    let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
-    let(:role) { FactoryGirl.create(:role, resource: exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+    let(:role) { FactoryBot.create(:role, resource: exhibit) }
 
     it { is_expected.to be_able_to(:update, exhibit) }
 
@@ -46,7 +46,7 @@ describe Spotlight::Ability, type: :model do
   end
 
   describe 'a user with curate role' do
-    let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
+    let(:user) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
 
     it { is_expected.not_to be_able_to(:update, exhibit) }
     it { is_expected.to be_able_to(:curate, exhibit) }
@@ -64,7 +64,7 @@ describe Spotlight::Ability, type: :model do
 
     it { is_expected.to be_able_to(:tag, exhibit) }
 
-    let(:contact) { FactoryGirl.create(:contact, exhibit: exhibit) }
+    let(:contact) { FactoryBot.create(:contact, exhibit: exhibit) }
 
     it { is_expected.to be_able_to(:edit, contact) }
     it { is_expected.to be_able_to(:new, contact) }