blacklight-spotlight 1.0.0 → 1.1.0

data/spec/models/spotlight/about_page_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::AboutPage, type: :model do
-  let(:page) { described_class.create! exhibit: FactoryGirl.create(:exhibit) }
+  let(:page) { described_class.create! exhibit: FactoryBot.create(:exhibit) }
   it { is_expected.not_to be_feature_page }
   it { is_expected.to be_about_page }
   it 'displays the sidebar' do

data/spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb

@@ -14,7 +14,7 @@ describe Spotlight::AccessControlsEnforcementSearchBuilder do
   end
 
   subject { MockSearchBuilder.new blacklight_params, scope }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:scope) { double(current_exhibit: exhibit) }
   let(:solr_request) { Blacklight::Solr::Request.new }
   let(:blacklight_params) { Hash.new }

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -12,7 +12,11 @@ describe Spotlight::BlacklightConfiguration, type: :model do
       config.add_sort_field 'identifier', sort: 'id asc', label: 'Identifier'
     end
     allow(subject).to receive_messages default_blacklight_config: blacklight_config
-    subject.exhibit = FactoryGirl.create(:exhibit)
+    subject.exhibit = FactoryBot.create(:exhibit)
+  end
+
+  it 'is expected to be versioned' do
+    is_expected.to be_versioned
   end
 
   it 'touches the exhibit' do
@@ -336,6 +340,11 @@ describe Spotlight::BlacklightConfiguration, type: :model do
       expect(subject.blacklight_config.sort_fields.select { |_k, v| v.enabled == true }).to include('a', 'c')
       expect(subject.blacklight_config.sort_fields.select { |_k, v| v.enabled == true }).not_to include('b', 'd')
     end
+
+    it 'is disabled when enabled = false' do
+      blacklight_config.add_sort_field 'a', enabled: false
+      expect(subject.blacklight_config.sort_fields['a'].enabled).to eq false
+    end
   end
 
   describe 'search fields' do
@@ -369,6 +378,11 @@ describe Spotlight::BlacklightConfiguration, type: :model do
       blacklight_config.add_search_field 'a', if: false
       expect(subject.blacklight_config.search_fields['a'].if).to eq false
     end
+
+    it 'is disabled when enabled = false' do
+      blacklight_config.add_search_field 'a', enabled: false
+      expect(subject.blacklight_config.search_fields['a'].enabled).to eq false
+    end
   end
 
   describe 'per page' do

data/spec/models/spotlight/contact_email_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::ContactEmail, type: :model do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   subject { described_class.new(exhibit: exhibit) }
 
   it { is_expected.not_to be_valid }

data/spec/models/spotlight/contact_form_spec.rb

@@ -1,6 +1,6 @@
 describe Spotlight::ContactForm do
   subject { described_class.new(name: 'Root', email: 'user@example.com').tap { |c| c.current_exhibit = exhibit } }
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:honeypot_field_name) { Spotlight::Engine.config.spambot_honeypot_email_field }
 
   context 'with a site-wide contact email' do

data/spec/models/spotlight/contact_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::Contact, type: :model do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   before do
     subject.exhibit = exhibit

data/spec/models/spotlight/custom_field_spec.rb

@@ -7,7 +7,7 @@ describe Spotlight::CustomField, type: :model do
     end
 
     describe 'when the exhibit has a config' do
-      let(:exhibit) { FactoryGirl.create(:exhibit) }
+      let(:exhibit) { FactoryBot.create(:exhibit) }
       before { subject.exhibit = exhibit }
       describe 'that overrides the label' do
         before do
@@ -29,7 +29,7 @@ describe Spotlight::CustomField, type: :model do
     end
 
     describe 'when the exhibit has a config' do
-      let(:exhibit) { FactoryGirl.create(:exhibit) }
+      let(:exhibit) { FactoryBot.create(:exhibit) }
       before { subject.exhibit = exhibit }
       describe 'that overrides the label' do
         before do
@@ -77,7 +77,7 @@ describe Spotlight::CustomField, type: :model do
   end
 
   describe '#solr_field' do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     let(:custom_field) do
       described_class.create(exhibit: exhibit, configuration: { 'label' => 'xyz' })
     end
@@ -110,7 +110,7 @@ describe Spotlight::CustomField, type: :model do
   end
 
   describe '#configured_to_display?' do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     before do
       exhibit.blacklight_configuration.blacklight_config.view = { view_name: {} }
       subject.exhibit = exhibit
@@ -147,7 +147,7 @@ describe Spotlight::CustomField, type: :model do
   end
 
   describe 'changing the field type' do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     before do
       subject.label = 'xyz'
       subject.exhibit = exhibit

data/spec/models/spotlight/exhibit_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::Exhibit, type: :model do
-  subject(:exhibit) { FactoryGirl.build(:exhibit, title: 'Sample') }
+  subject(:exhibit) { FactoryBot.build(:exhibit, title: 'Sample') }
 
   it 'has a title' do
     subject.title = 'Test title'
@@ -46,7 +46,7 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#main_navigations' do
-    subject { FactoryGirl.create(:exhibit, title: 'Sample') }
+    subject { FactoryBot.create(:exhibit, title: 'Sample') }
     it 'has main navigations' do
       expect(subject.main_navigations).to have(3).main_navigations
       expect(subject.main_navigations.map(&:label).compact).to be_blank
@@ -86,7 +86,7 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#blacklight_config' do
-    subject { FactoryGirl.create(:exhibit) }
+    subject { FactoryBot.create(:exhibit) }
     before do
       subject.blacklight_configuration.index = { timestamp_field: 'timestamp_field' }
       subject.save!
@@ -99,7 +99,7 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#solr_data' do
-    let(:exhibit) { FactoryGirl.create(:exhibit) }
+    let(:exhibit) { FactoryBot.create(:exhibit) }
     subject { exhibit.solr_data }
 
     context 'when not filtering by exhibit' do
@@ -133,7 +133,7 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#analytics' do
-    subject { FactoryGirl.create(:exhibit) }
+    subject { FactoryBot.create(:exhibit) }
     let(:ga_data) { OpenStruct.new(pageviews: 123) }
 
     before do
@@ -147,7 +147,7 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#page_analytics' do
-    subject { FactoryGirl.create(:exhibit) }
+    subject { FactoryBot.create(:exhibit) }
     let(:ga_data) { [OpenStruct.new(pageviews: 123)] }
 
     before do
@@ -162,7 +162,7 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#reindex_later' do
-    subject { FactoryGirl.create(:exhibit) }
+    subject { FactoryBot.create(:exhibit) }
     let(:log_entry) { Spotlight::ReindexingLogEntry.new(exhibit: subject, user: user, items_reindexed_count: 0) }
 
     context 'user is omitted' do
@@ -177,7 +177,7 @@ describe Spotlight::Exhibit, type: :model do
     end
 
     context 'non-nil user is provided' do
-      let(:user) { FactoryGirl.build(:user) }
+      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)
@@ -189,7 +189,7 @@ describe Spotlight::Exhibit, type: :model do
   end
 
   describe '#new_reindexing_log_entry' do
-    let(:user) { FactoryGirl.build(:user) }
+    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
@@ -259,8 +259,8 @@ describe Spotlight::Exhibit, type: :model do
 
   describe '#requested_by' do
     context 'with multiple exhibit users' do
-      let!(:exhibit_admin) { FactoryGirl.create(:exhibit_admin, exhibit: subject) }
-      let!(:another_exhibit_admin) { FactoryGirl.create(:exhibit_admin, exhibit: subject) }
+      let!(:exhibit_admin) { FactoryBot.create(:exhibit_admin, exhibit: subject) }
+      let!(:another_exhibit_admin) { FactoryBot.create(:exhibit_admin, exhibit: subject) }
 
       it 'is the first listed user' do
         expect(subject.requested_by).to eq exhibit_admin
@@ -277,16 +277,16 @@ describe Spotlight::Exhibit, type: :model do
   describe '#reindex_progress' do
     let!(:reindexing_log_entries) do
       [
-        FactoryGirl.create(:unstarted_reindexing_log_entry, exhibit: exhibit),
-        FactoryGirl.create(:reindexing_log_entry, exhibit: exhibit),
+        FactoryBot.create(:unstarted_reindexing_log_entry, exhibit: exhibit),
+        FactoryBot.create(:reindexing_log_entry, exhibit: exhibit),
         in_progress_entry,
-        FactoryGirl.create(:failed_reindexing_log_entry, exhibit: exhibit),
-        FactoryGirl.create(:unstarted_reindexing_log_entry, exhibit: exhibit)
+        FactoryBot.create(:failed_reindexing_log_entry, exhibit: exhibit),
+        FactoryBot.create(:unstarted_reindexing_log_entry, exhibit: exhibit)
       ]
     end
 
     let(:in_progress_entry) do
-      FactoryGirl.create(:in_progress_reindexing_log_entry, exhibit: exhibit)
+      FactoryBot.create(:in_progress_reindexing_log_entry, exhibit: exhibit)
     end
 
     it 'returns the latest log entry that is not unstarted' do
@@ -295,4 +295,8 @@ describe Spotlight::Exhibit, type: :model do
       expect(reindex_progress.current_log_entry).to eq in_progress_entry
     end
   end
+
+  it 'is expected to be versioned' do
+    is_expected.to be_versioned
+  end
 end

data/spec/models/spotlight/feature_page_spec.rb

@@ -1,19 +1,19 @@
 describe Spotlight::FeaturePage, type: :model do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   describe 'default_scope' do
-    let!(:page1) { FactoryGirl.create(:feature_page, weight: 5, exhibit: exhibit) }
-    let!(:page2) { FactoryGirl.create(:feature_page, weight: 1, exhibit: exhibit) }
-    let!(:page3) { FactoryGirl.create(:feature_page, weight: 10, exhibit: exhibit) }
+    let!(:page1) { FactoryBot.create(:feature_page, weight: 5, exhibit: exhibit) }
+    let!(:page2) { FactoryBot.create(:feature_page, weight: 1, exhibit: exhibit) }
+    let!(:page3) { FactoryBot.create(:feature_page, weight: 10, exhibit: exhibit) }
     it 'orders by weight' do
       expect(described_class.all.map(&:weight)).to eq [1, 5, 10]
     end
   end
 
   describe 'display_sidebar?' do
-    let(:parent) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
-    let!(:child) { FactoryGirl.create(:feature_page, parent_page: parent, exhibit: exhibit) }
-    let!(:unpublished_parent) { FactoryGirl.create(:feature_page, published: false, exhibit: exhibit) }
-    let!(:unpublished_child) { FactoryGirl.create(:feature_page, parent_page: unpublished_parent, published: false, exhibit: exhibit) }
+    let(:parent) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+    let!(:child) { FactoryBot.create(:feature_page, parent_page: parent, exhibit: exhibit) }
+    let!(:unpublished_parent) { FactoryBot.create(:feature_page, published: false, exhibit: exhibit) }
+    let!(:unpublished_child) { FactoryBot.create(:feature_page, parent_page: unpublished_parent, published: false, exhibit: exhibit) }
     before { unpublished_parent.display_sidebar = false }
     it 'is set to true if the page has a published child' do
       expect(parent.display_sidebar?).to be_truthy
@@ -32,9 +32,9 @@ describe Spotlight::FeaturePage, type: :model do
   end
 
   describe 'weight' do
-    let(:good_weight) { FactoryGirl.build(:feature_page, weight: 10, exhibit: exhibit) }
-    let(:low_weight) { FactoryGirl.build(:feature_page, weight: -1, exhibit: exhibit) }
-    let(:high_weight) { FactoryGirl.build(:feature_page, weight: 51, exhibit: exhibit) }
+    let(:good_weight) { FactoryBot.build(:feature_page, weight: 10, exhibit: exhibit) }
+    let(:low_weight) { FactoryBot.build(:feature_page, weight: -1, exhibit: exhibit) }
+    let(:high_weight) { FactoryBot.build(:feature_page, weight: 51, exhibit: exhibit) }
     it 'defaults to 50' do
       expect(described_class.new.weight).to eq 50
     end
@@ -56,9 +56,9 @@ describe Spotlight::FeaturePage, type: :model do
   it { is_expected.not_to be_about_page }
 
   describe 'relationships' do
-    let(:parent) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
-    let!(:child1) { FactoryGirl.create(:feature_page, parent_page: parent, exhibit: exhibit) }
-    let!(:child2) { FactoryGirl.create(:feature_page, parent_page: parent, exhibit: exhibit) }
+    let(:parent) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+    let!(:child1) { FactoryBot.create(:feature_page, parent_page: parent, exhibit: exhibit) }
+    let!(:child2) { FactoryBot.create(:feature_page, parent_page: parent, exhibit: exhibit) }
     it 'child pages should have a parent_page' do
       [child1, child2].each do |child|
         expect(child.parent_page).to eq parent

data/spec/models/spotlight/field_metadata_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::FieldMetadata do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:repository) { double }
   let(:blacklight_config) do
     Blacklight::Configuration.new do |config|

data/spec/models/spotlight/home_page_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::HomePage, type: :model do
-  let(:home_page) { FactoryGirl.create(:home_page) }
+  let(:home_page) { FactoryBot.create(:home_page) }
   it { is_expected.not_to be_feature_page }
   it { is_expected.not_to be_about_page }
   it 'displays the sidebar' do

data/spec/models/spotlight/main_navigation_spec.rb

@@ -1,6 +1,6 @@
 describe Spotlight::MainNavigation, type: :model do
   before do
-    subject.exhibit = FactoryGirl.create(:exhibit)
+    subject.exhibit = FactoryBot.create(:exhibit)
   end
 
   it 'has a default_label' do

data/spec/models/spotlight/page_spec.rb

@@ -1,5 +1,5 @@
 describe Spotlight::Page, type: :model do
-  let(:exhibit) { FactoryGirl.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
   let!(:parent_page) { Spotlight::FeaturePage.create! exhibit: exhibit, published: true }
   let!(:child_page) { Spotlight::FeaturePage.create! exhibit: exhibit, published: false, parent_page: parent_page }
 
@@ -15,6 +15,10 @@ describe Spotlight::Page, type: :model do
     end
   end
 
+  it 'is expected to be versioned' do
+    is_expected.to be_versioned
+  end
+
   describe '#top_level_page?' do
     it 'checks if the page is a top-level page' do
       expect(parent_page).to be_a_top_level_page
@@ -37,7 +41,7 @@ describe Spotlight::Page, type: :model do
     end
   end
   describe 'should_display_title?' do
-    let(:page) { FactoryGirl.create(:feature_page) }
+    let(:page) { FactoryBot.create(:feature_page) }
     it 'returns if the title is present or not' do
       expect(page.title).not_to be_blank
       expect(page.should_display_title?).to be_truthy
@@ -47,7 +51,7 @@ describe Spotlight::Page, type: :model do
   end
 
   describe '#content=' do
-    let(:page) { FactoryGirl.create(:feature_page) }
+    let(:page) { FactoryBot.create(:feature_page) }
 
     it 'works with a serialized JSON array' do
       page.content = [].to_json
@@ -60,7 +64,7 @@ describe Spotlight::Page, type: :model do
   end
 
   describe '#content?' do
-    let(:page) { FactoryGirl.create(:feature_page) }
+    let(:page) { FactoryBot.create(:feature_page) }
 
     it 'does not have content when the page is empty' do
       page.content = []
@@ -74,7 +78,7 @@ describe Spotlight::Page, type: :model do
   end
 
   describe '#slug' do
-    let(:page) { FactoryGirl.create(:feature_page) }
+    let(:page) { FactoryBot.create(:feature_page) }
 
     it 'gets a default slug' do
       expect(page.slug).not_to be_blank
@@ -86,7 +90,7 @@ describe Spotlight::Page, type: :model do
     end
 
     context 'with a custom slug' do
-      let(:page) { FactoryGirl.create(:feature_page, slug: 'xyz') }
+      let(:page) { FactoryBot.create(:feature_page, slug: 'xyz') }
 
       it 'gets a default slug' do
         expect(page.slug).to eq 'xyz'
@@ -95,8 +99,8 @@ describe Spotlight::Page, type: :model do
   end
 
   describe 'thumbnail_image_url' do
-    subject(:thumbnail) { FactoryGirl.create(:featured_image) }
-    subject(:page) { FactoryGirl.create(:feature_page, exhibit: exhibit) }
+    subject(:thumbnail) { FactoryBot.create(:featured_image) }
+    subject(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
 
     it 'is nil when there is no thumbnail' do
       expect(page.thumbnail_image_url).to be_nil

data/spec/models/spotlight/reindex_progress_spec.rb

@@ -1,6 +1,6 @@
 describe Spotlight::ReindexProgress, type: :model do
   let(:reindexing_log_entry) do
-    FactoryGirl.create(:failed_reindexing_log_entry, items_reindexed_estimate: 12)
+    FactoryBot.create(:failed_reindexing_log_entry, items_reindexed_estimate: 12)
   end
 
   let(:subject) { described_class.new(reindexing_log_entry) }
@@ -64,7 +64,7 @@ describe Spotlight::ReindexProgress, type: :model do
 
   describe '#recently_in_progress?' do
     context 'there is no end_time for current_log_entry' do
-      let(:reindexing_log_entry) { FactoryGirl.create(:in_progress_reindexing_log_entry) }
+      let(:reindexing_log_entry) { FactoryBot.create(:in_progress_reindexing_log_entry) }
 
       it 'returns true' do
         expect(subject).to be_recently_in_progress
@@ -72,7 +72,7 @@ describe Spotlight::ReindexProgress, type: :model do
     end
 
     context 'current_log_entry has an end_time less than Spotlight::Engine.config.reindex_progress_window.minutes.ago' do
-      let(:reindexing_log_entry) { FactoryGirl.create(:recent_reindexing_log_entry, end_time: Time.zone.now) }
+      let(:reindexing_log_entry) { FactoryBot.create(:recent_reindexing_log_entry, end_time: Time.zone.now) }
 
       it 'returns true' do
         expect(subject).to be_recently_in_progress
@@ -80,7 +80,7 @@ describe Spotlight::ReindexProgress, type: :model do
     end
 
     context 'current_log_entry is unstarted ' do
-      let(:reindexing_log_entry) { FactoryGirl.create(:unstarted_reindexing_log_entry) }
+      let(:reindexing_log_entry) { FactoryBot.create(:unstarted_reindexing_log_entry) }
 
       it 'returns false' do
         expect(subject).not_to be_recently_in_progress

data/spec/models/spotlight/reindexing_log_entry_spec.rb

@@ -1,11 +1,11 @@
 describe Spotlight::ReindexingLogEntry, type: :model do
-  subject { FactoryGirl.build(:reindexing_log_entry) }
+  subject { FactoryBot.build(:reindexing_log_entry) }
 
   describe 'scope' do
     before do
-      (0..10).to_a.each { FactoryGirl.create(:recent_reindexing_log_entry) }
-      FactoryGirl.create(:unstarted_reindexing_log_entry)
-      (0..10).to_a.each { FactoryGirl.create(:recent_reindexing_log_entry) }
+      (0..10).to_a.each { FactoryBot.create(:recent_reindexing_log_entry) }
+      FactoryBot.create(:unstarted_reindexing_log_entry)
+      (0..10).to_a.each { FactoryBot.create(:recent_reindexing_log_entry) }
     end
 
     let(:sorted_log_entry_list) do
@@ -37,7 +37,7 @@ describe Spotlight::ReindexingLogEntry, type: :model do
     end
 
     context 'when end_time is not present' do
-      subject { FactoryGirl.build(:in_progress_reindexing_log_entry) }
+      subject { FactoryBot.build(:in_progress_reindexing_log_entry) }
 
       it 'is nil' do
         expect(subject.duration).to be nil
@@ -47,7 +47,7 @@ describe Spotlight::ReindexingLogEntry, type: :model do
 
   describe 'state updating methods' do
     describe '#in_progress!' do
-      subject { FactoryGirl.build(:unstarted_reindexing_log_entry) }
+      subject { FactoryBot.build(:unstarted_reindexing_log_entry) }
 
       context 'executes normally' do
         it 'sets start_time and job_status' do
@@ -73,7 +73,7 @@ describe Spotlight::ReindexingLogEntry, type: :model do
     end
 
     describe '#succeeded!' do
-      subject { FactoryGirl.build(:in_progress_reindexing_log_entry) }
+      subject { FactoryBot.build(:in_progress_reindexing_log_entry) }
 
       context 'executes normally' do
         it 'sets end_time and job_status' do
@@ -99,7 +99,7 @@ describe Spotlight::ReindexingLogEntry, type: :model do
     end
 
     describe '#failed!' do
-      subject { FactoryGirl.build(:in_progress_reindexing_log_entry) }
+      subject { FactoryBot.build(:in_progress_reindexing_log_entry) }
 
       context 'executes normally' do
         it 'sets end_time and job_status' do