blacklight-spotlight 3.0.0.alpha.2 → 3.0.0.alpha.3

data/spec/models/spotlight/solr_document_sidecar_spec.rb

@@ -2,6 +2,7 @@
 
 describe Spotlight::SolrDocumentSidecar, type: :model do
   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')
@@ -12,9 +13,9 @@ describe Spotlight::SolrDocumentSidecar, type: :model do
       subject.data = { 'a_tesim' => 1, 'b_tesim' => 2, 'c_tesim' => 3 }
     end
 
-    its(:to_solr) { should include id: 'doc_id' }
-    its(:to_solr) { should include "exhibit_#{exhibit.slug}_public_bsi".to_sym => true }
-    its(:to_solr) { should include 'a_tesim', 'b_tesim', 'c_tesim' }
+    its(:to_solr) { is_expected.to include id: 'doc_id' }
+    its(:to_solr) { is_expected.to include "exhibit_#{exhibit.slug}_public_bsi".to_sym => true }
+    its(:to_solr) { is_expected.to include 'a_tesim', 'b_tesim', 'c_tesim' }
 
     context 'with an uploaded item' do
       before do
@@ -26,7 +27,7 @@ describe Spotlight::SolrDocumentSidecar, type: :model do
         Spotlight::UploadFieldConfig.new(field_name: 'some_configured_field', solr_fields: ['the_solr_field'])
       end
 
-      its(:to_solr) { should include 'the_solr_field' => 'some value' }
+      its(:to_solr) { is_expected.to include 'the_solr_field' => 'some value' }
     end
 
     context 'with blank fields' do
@@ -38,9 +39,9 @@ describe Spotlight::SolrDocumentSidecar, type: :model do
         }
       end
 
-      its(:to_solr) { should include 'a_blank_field' => nil }
-      its(:to_solr) { should include 'a_blank_multivalued_field' => [] }
-      its(:to_solr) { should include 'a_multivalued_field_with_some_blanks' => ['a'] }
+      its(:to_solr) { is_expected.to include 'a_blank_field' => nil }
+      its(:to_solr) { is_expected.to include 'a_blank_multivalued_field' => [] }
+      its(:to_solr) { is_expected.to include 'a_multivalued_field_with_some_blanks' => ['a'] }
     end
   end
 end

data/spec/models/spotlight/user_spec.rb

@@ -2,6 +2,7 @@
 
 describe Spotlight::User do
   subject { Class.new }
+
   before { subject.extend described_class }
 
   describe '#invite_pending?' do

data/spec/models/translation_spec.rb

@@ -2,11 +2,12 @@
 
 describe Translation, type: :model do
   let(:exhibit) { FactoryBot.create(:exhibit) }
+
   describe 'is unique by key, locale, and exhibit' do
     it 'fails validation' do
-      Translation.create(exhibit_id: exhibit.id, key: 'abc', locale: 'fr', value: 'yo')
+      described_class.create(exhibit_id: exhibit.id, key: 'abc', locale: 'fr', value: 'yo')
       expect do
-        Translation.create(exhibit_id: exhibit.id, key: 'abc', locale: 'fr', value: 'lo')
+        described_class.create(exhibit_id: exhibit.id, key: 'abc', locale: 'fr', value: 'lo')
       end.to raise_error(ActiveRecord::RecordNotUnique)
     end
   end

data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 describe Spotlight::ExhibitExportSerializer do
+  subject { JSON.parse(described_class.new(source_exhibit).to_json) }
+
   let!(:source_exhibit) { FactoryBot.create(:exhibit) }
 
   before do
@@ -9,15 +11,13 @@ describe Spotlight::ExhibitExportSerializer do
     allow_any_instance_of(Spotlight::Resource).to receive(:reindex)
   end
 
-  subject { JSON.parse(described_class.new(source_exhibit).to_json) }
-
   it 'does not include unique identifiers' do
-    expect(subject).to_not have_key 'id'
-    expect(subject).to_not have_key 'slug'
-    expect(subject).to_not have_key 'name'
-    expect(subject).to_not have_key 'default'
-    expect(subject).to_not have_key 'masthead_id'
-    expect(subject).to_not have_key 'thumbnail_id'
+    expect(subject).not_to have_key 'id'
+    expect(subject).not_to have_key 'slug'
+    expect(subject).not_to have_key 'name'
+    expect(subject).not_to have_key 'default'
+    expect(subject).not_to have_key 'masthead_id'
+    expect(subject).not_to have_key 'thumbnail_id'
   end
 
   it 'has search attributes' do
@@ -26,9 +26,9 @@ describe Spotlight::ExhibitExportSerializer do
 
   it 'has home page attributes' do
     expect(subject).to have_key 'home_page'
-    expect(subject['home_page']).to_not have_key 'id'
-    expect(subject['home_page']).to_not have_key 'scope'
-    expect(subject['home_page']).to_not have_key 'exhibit_id'
+    expect(subject['home_page']).not_to have_key 'id'
+    expect(subject['home_page']).not_to have_key 'scope'
+    expect(subject['home_page']).not_to have_key 'exhibit_id'
   end
 
   it 'has about pages' do
@@ -57,7 +57,7 @@ describe Spotlight::ExhibitExportSerializer do
     expect(subject['solr_document_sidecars']).to have(source_exhibit.solr_document_sidecars.count).items
 
     expect(subject['solr_document_sidecars'].first).to include('document_id', 'public')
-    expect(subject['solr_document_sidecars'].first).to_not include 'id'
+    expect(subject['solr_document_sidecars'].first).not_to include 'id'
   end
 
   it 'has attachments' do
@@ -82,6 +82,11 @@ describe Spotlight::ExhibitExportSerializer do
   end
 
   describe 'should round-trip data' do
+    subject do
+      e = FactoryBot.create(:exhibit)
+      e.import(export).tap(&:save)
+    end
+
     before do
       sidecar = source_exhibit.solr_document_sidecars.create! document: SolrDocument.new(id: 1), public: false
       source_exhibit.tag(sidecar, with: 'xyz', on: :tags)
@@ -91,11 +96,6 @@ describe Spotlight::ExhibitExportSerializer do
       described_class.new(source_exhibit).as_json
     end
 
-    subject do
-      e = FactoryBot.create(:exhibit)
-      e.import(export).tap(&:save)
-    end
-
     it 'has exhibit properties' do
       expect(subject.title).to eq source_exhibit.title
     end
@@ -128,7 +128,7 @@ describe Spotlight::ExhibitExportSerializer do
     end
 
     it 'has sidecars' do
-      expect(SolrDocument.new(id: 1).public?(subject)).to be_falsey
+      expect(SolrDocument.new(id: 1)).not_to be_public(subject)
     end
 
     context 'for an exhibit with contacts' do
@@ -138,6 +138,7 @@ describe Spotlight::ExhibitExportSerializer do
                             exhibit: source_exhibit,
                             contact_info: { title: 'xyz' })
         end
+
         it 'has contacts' do
           expect(subject.contacts.count).to eq 1
           contact = subject.contacts.first
@@ -336,6 +337,11 @@ describe Spotlight::ExhibitExportSerializer do
   end
 
   describe 'should export saved searches with query parameters that can be re-generated' do
+    subject do
+      e = FactoryBot.create(:exhibit)
+      e.import(export).tap(&:save)
+    end
+
     before do
       source_exhibit.feature_pages.create content: [{
         type: 'search_results',
@@ -348,11 +354,6 @@ describe Spotlight::ExhibitExportSerializer do
       }].to_json
     end
 
-    subject do
-      e = FactoryBot.create(:exhibit)
-      e.import(export).tap(&:save)
-    end
-
     let :export do
       described_class.new(source_exhibit).as_json
     end

data/spec/services/spotlight/clone_translated_page_from_locale_spec.rb

@@ -3,10 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe Spotlight::CloneTranslatedPageFromLocale do
+  subject(:clone) { described_class.call(locale: language.locale, page: page) }
+
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let!(:page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
   let!(:language) { FactoryBot.create(:language, locale: 'es', exhibit: exhibit) }
-  subject(:clone) { described_class.call(locale: language.locale, page: page) }
 
   it 'clones the exhibit home page for a particular exhibit' do
     expect(Spotlight::Page.where(locale: 'es')).not_to be_present

data/spec/services/spotlight/iiif_resource_resolver_spec.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 describe Spotlight::IiifResourceResolver do
+  subject(:resolver) { described_class.new(resource) }
+
   let(:fixture_json) do
     File.open(
       File.expand_path(File.join('..', 'spec', 'fixtures', 'gk446cj2442-manifest.json'), Rails.root)
@@ -17,8 +19,6 @@ describe Spotlight::IiifResourceResolver do
     )
   end
 
-  subject(:resolver) { described_class.new(resource) }
-
   before do
     expect(resolver).to receive(:response).and_return(fixture_json)
   end
@@ -81,6 +81,7 @@ describe Spotlight::IiifResourceResolver do
 
     context 'when the JSON is unparsable' do
       let(:fixture_json) { 'Some sort of html error!' }
+
       it 'logs that the JSON was unparsable and falls through to an no-canvas error' do
         klass = described_class.name
         expect(Rails.logger).to receive(:warn).with(

data/spec/services/spotlight/solr_document_builder_spec.rb

@@ -20,10 +20,11 @@ describe Spotlight::SolrDocumentBuilder do
 
   describe '#documents_to_index' do
     context 'when the document belongs to more than one exhibit' do
+      subject { resource.document_builder }
+
       let(:doc) { SolrDocument.new(id: 'abc123') }
       let(:resource) { FactoryBot.create(:resource) }
       let(:resource_alt) { FactoryBot.create(:resource) }
-      subject { resource.document_builder }
 
       before do
         allow(Spotlight::Engine.config).to receive(:filter_resources_by_exhibit).and_return(true)

data/spec/spec_helper.rb

@@ -47,14 +47,14 @@ end
 require 'spotlight'
 
 # configure spotlight with all the settings necessary to test functionality
-Spotlight::Engine.config.exhibit_themes = %w(default modern)
+Spotlight::Engine.config.exhibit_themes = %w[default modern]
 
 Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
-FactoryBot.definition_file_paths = [File.expand_path('../factories', __FILE__)]
+FactoryBot.definition_file_paths = [File.expand_path('factories', __dir__)]
 FactoryBot.find_definitions
 
-FIXTURES_PATH = File.expand_path('../fixtures', __FILE__)
+FIXTURES_PATH = File.expand_path('fixtures', __dir__)
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
@@ -62,7 +62,7 @@ RSpec.configure do |config|
 
   config.use_transactional_fixtures = true
 
-  config.before :each do
+  config.before do
     # The first user is automatically granted admin privileges; we don't want that behavior for many of our tests
     Spotlight::Engine.user_class.create email: 'initial+admin@example.com', password: 'password', password_confirmation: 'password'
   end

data/spec/support/features/test_features_helpers.rb

@@ -45,7 +45,7 @@ module Spotlight
       EOF
       click_button('Save changes')
       # verify that the page was created
-      expect(page).to_not have_selector('.alert-danger')
+      expect(page).not_to have_selector('.alert-danger')
       expect(page).to have_selector('.alert-info', text: 'page was successfully updated')
     end
 

data/spec/test_app_templates/Gemfile.extra

@@ -1,4 +1,4 @@
-gem 'thor', '~> 0.20'
 gem 'blacklight', '~> 7.0'
 gem 'blacklight-oembed', '>= 0.1', github: 'sul-dlss/blacklight-oembed'
 gem 'sprockets', '< 4'
+gem 'thor', '~> 0.20'

data/spec/test_app_templates/catalog_controller.rb

@@ -29,7 +29,7 @@ class CatalogController < ApplicationController
     config.index.display_type_field = 'content_metadata_type_ssm'
     config.index.thumbnail_field = Spotlight::Engine.config.thumbnail_field
 
-    config.view.gallery.partials = [:index_header, :index]
+    config.view.gallery.partials = %i[index_header index]
     config.view.slideshow.partials = [:index]
 
     config.show.tile_source_field = :content_metadata_image_iiif_info_ssm

data/spec/test_app_templates/spotlight_test.rake

@@ -6,7 +6,7 @@ namespace :spotlight_test do
   namespace :solr do
     desc 'Index test data into solr; must be run from within an app (see spotlight:fixtures)'
     task :seed do
-      docs = YAML.load(File.open(File.expand_path(File.join('..', 'spec', 'fixtures', 'sample_solr_documents.yml'), Rails.root)))
+      docs = YAML.safe_load(File.open(File.expand_path(File.join('..', 'spec', 'fixtures', 'sample_solr_documents.yml'), Rails.root)))
       Blacklight.default_index.connection.add docs
       Blacklight.default_index.connection.commit
     end

data/spec/uploaders/spotlight/attachment_uploader_spec.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 describe Spotlight::AttachmentUploader do
-  let(:mounter) { Spotlight::Attachment.new(id: '5') }
   subject(:attachment_uploader) { described_class.new(mounter, 'mounted_as') }
 
+  let(:mounter) { Spotlight::Attachment.new(id: '5') }
+
   describe '#store_dir' do
     let(:store_dir) { attachment_uploader.store_dir }
 

data/spec/uploaders/spotlight/featured_image_uploader_spec.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 describe Spotlight::FeaturedImageUploader do
-  let(:mounter) { FactoryBot.create(:featured_image) }
   subject(:featured_image_uploader) { described_class.new(mounter, 'mounted_as') }
 
+  let(:mounter) { FactoryBot.create(:featured_image) }
+
   describe '#extension_whitelist' do
     it 'is the configured array of approved extension to be uploaded' do
       expect(featured_image_uploader.extension_whitelist).to eq Spotlight::Engine.config.allowed_upload_extensions

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

@@ -5,6 +5,7 @@ describe 'shared/_analytics', type: :view do
     render
     expect(rendered).to be_empty
   end
+
   it 'renders the GA script tag if the web property id is configured' do
     allow(Spotlight::Engine.config).to receive(:ga_web_property_id).and_return('XYZ-234')
     allow(Spotlight::Engine.config).to receive(:ga_anonymize_ip).and_return(true)

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

@@ -49,13 +49,13 @@ describe 'shared/_exhibit_navbar', type: :view do
 
   it 'does not display links to feature pages if none are defined' do
     render
-    expect(response).to_not have_link 'Curated Features'
+    expect(response).not_to have_link 'Curated Features'
   end
 
   it 'does not display links to feature pages that are not published' do
     unpublished_feature_page
     render
-    expect(response).to_not have_link 'Curated Features'
+    expect(response).not_to have_link 'Curated Features'
   end
 
   it "links to the browse index if there's a published search" do
@@ -90,13 +90,13 @@ describe 'shared/_exhibit_navbar', type: :view do
 
   it 'does not link to the about page if no about page exists' do
     render
-    expect(response).to_not have_link 'About'
+    expect(response).not_to have_link 'About'
   end
 
   it 'does not to the about page if none are published' do
     unpublished_about_page
     render
-    expect(response).to_not have_link 'About'
+    expect(response).not_to have_link 'About'
   end
 
   it "marks the about button as active if we're on an about page" do
@@ -115,7 +115,7 @@ describe 'shared/_exhibit_navbar', type: :view do
   it 'does not include the search bar when the exhibit is not searchable' do
     expect(current_exhibit).to receive(:searchable?).and_return(false)
     render
-    expect(response).to_not have_content 'Search Bar'
+    expect(response).not_to have_content 'Search Bar'
   end
 
   it 'does not include any navigation menu items that are not configured' do

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

@@ -8,6 +8,8 @@ describe 'shared/_masthead', type: :view do
     stub_template 'shared/_exhibit_navbar.html.erb' => 'navbar'
     allow(view).to receive_messages(current_exhibit: exhibit,
                                     current_masthead: masthead,
+                                    masthead_heading_content: exhibit.title,
+                                    masthead_subheading_content: exhibit.subtitle,
                                     resource_masthead?: false)
   end
 
@@ -19,7 +21,7 @@ describe 'shared/_masthead', type: :view do
 
   context 'for an exhibit without a subtitle' do
     before do
-      exhibit.update(subtitle: nil)
+      allow(view).to receive_messages(masthead_subheading_content: nil)
     end
 
     it 'does not include the subtitle' do
@@ -68,6 +70,7 @@ describe 'shared/_masthead', type: :view do
       render
       expect(rendered).to have_selector '.masthead.resource-masthead'
     end
+
     it 'puts the navbar before the title' do
       render
       expect(rendered.index('navbar')).to be < rendered.index(exhibit.title)

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

@@ -2,6 +2,7 @@
 
 describe 'shared/_user_util_links', type: :view do
   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)
@@ -11,6 +12,7 @@ describe 'shared/_user_util_links', type: :view do
 
   describe 'when user is not logged in' do
     let(:current_user) { nil }
+
     it 'renders the links' do
       render
       expect(rendered).to have_link 'Sign in'
@@ -20,28 +22,31 @@ describe 'shared/_user_util_links', type: :view do
 
   describe 'when show_contact_form is false' do
     let(:current_user) { nil }
+
     before do
       allow(view).to receive_messages(show_contact_form?: false)
     end
 
     it 'does not render the feedback link' do
       render
-      expect(rendered).to_not have_link 'Feedback'
+      expect(rendered).not_to have_link 'Feedback'
     end
   end
 
   describe 'when user is logged in' do
     let(:current_user) { Spotlight::Engine.user_class.new }
+
     it 'renders the links' do
       render
       expect(rendered).to have_link 'Feedback'
-      expect(rendered).to_not have_link 'Exhibit dashboard'
+      expect(rendered).not_to have_link 'Exhibit dashboard'
       expect(rendered).to have_link 'Sign out'
     end
   end
 
   describe 'when user is a curator' do
     let(:current_user) { Spotlight::Engine.user_class.new }
+
     before do
       allow(view).to receive(:can?).with(:manage, Spotlight::Site).and_return(false)
       allow(view).to receive(:can?).with(:update, current_exhibit).and_return(false)
@@ -59,6 +64,7 @@ describe 'shared/_user_util_links', type: :view do
 
   describe 'when user is an admin' do
     let(:current_user) { Spotlight::Engine.user_class.new }
+
     before do
       allow(view).to receive(:can?).with(:manage, Spotlight::Site).and_return(false)
       allow(view).to receive(:can?).with(:update, current_exhibit).and_return(true)
@@ -76,6 +82,7 @@ describe 'shared/_user_util_links', type: :view do
 
   describe 'when user is a site-wide admin' do
     let(:current_user) { Spotlight::Engine.user_class.new }
+
     before do
       allow(view).to receive(:can?).with(:manage, Spotlight::Site).and_return(true)
       allow(view).to receive(:can?).with(:update, current_exhibit).and_return(true)