blacklight-spotlight 2.6.1.1 → 2.9.0

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -100,4 +100,18 @@ describe Spotlight::PagesHelper, type: :helper do
       expect(helper.sir_trevor_markdown(nil)).to be_blank
     end
   end
+
+  describe '#content_editor_class' do
+    context 'with a sir-trevor backed page' do
+      it 'has a custom class' do
+        expect(helper.content_editor_class(Spotlight::Page.new)).to eq 'js-st-instance'
+      end
+    end
+
+    context 'with a sir-trevor backed page' do
+      it 'derives a css class name from the editor type' do
+        expect(helper.content_editor_class(Spotlight::Page.new(content_type: 'Something::Custom'))).to eq 'js-something-custom-instance'
+      end
+    end
+  end
 end

data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb

@@ -7,7 +7,8 @@ describe Spotlight::AddUploadsFromCSV do
   let(:data) do
     [
       { 'url' => 'x' },
-      { 'url' => 'y' }
+      { 'url' => 'y' },
+      { 'url' => '~' }
     ]
   end
 
@@ -29,10 +30,11 @@ describe Spotlight::AddUploadsFromCSV do
 
   it 'creates uploaded resources for each row of data' do
     upload = FactoryBot.create(:uploaded_resource)
-    expect(Spotlight::Resources::Upload).to receive(:new).at_least(:once).and_return(upload)
+    expect(Spotlight::Resources::Upload).to receive(:new).exactly(3).times.and_return(upload)
 
     expect(upload).to receive(:build_upload).with(remote_image_url: 'x').and_call_original
     expect(upload).to receive(:build_upload).with(remote_image_url: 'y').and_call_original
+    expect(upload).not_to receive(:build_upload).with(remote_image_url: '~')
     expect(upload).to receive(:save_and_index).at_least(:once)
 
     job.perform_now

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -96,7 +96,7 @@ describe Spotlight::BlacklightConfiguration, type: :model do
 
       it 'defaults to not showing a custom field in the facets' do
         field = double('field', new_record?: false, field: 'a', solr_field: 'a', configuration: {})
-        custom_fields = double('custom_fields', vocab: [field], reject: [])
+        custom_fields = double('custom_fields', facetable: [field], reject: [])
         allow(custom_fields).to receive(:map).and_yield(field)
         allow(subject.exhibit).to receive(:custom_fields).and_return(custom_fields)
         subject.facet_fields = { 'a' => { enabled: '1', label: 'Label' } }
@@ -523,7 +523,7 @@ describe Spotlight::BlacklightConfiguration, type: :model do
 
   describe '#custom_facet_fields' do
     it 'converts exhibit-specific fields to Blacklight configurations' do
-      allow(subject.exhibit).to receive_message_chain(:custom_fields, vocab: [
+      allow(subject.exhibit).to receive_message_chain(:custom_fields, facetable: [
                                                         stub_model(Spotlight::CustomField, field: 'abc', configuration: { a: 1 }, exhibit: subject.exhibit),
                                                         stub_model(Spotlight::CustomField, field: 'xyz', configuration: { x: 2 }, exhibit: subject.exhibit)
                                                       ])

data/spec/models/spotlight/custom_field_spec.rb

@@ -67,13 +67,13 @@ describe Spotlight::CustomField, type: :model do
     it 'ends in the text suffix if it is a text field' do
       subject.field_type = 'text'
       subject.save
-      expect(subject.field).to end_with Spotlight::Engine.config.solr_fields.text_suffix
+      expect(subject.field).to end_with '_tesim'
     end
 
     it 'ends in a string suffix if it is a vocab field' do
       subject.field_type = 'vocab'
       subject.save
-      expect(subject.field).to end_with Spotlight::Engine.config.solr_fields.string_suffix
+      expect(subject.field).to end_with '_ssim'
     end
 
     it 'begins with readonly if it is readonly' do
@@ -182,7 +182,12 @@ describe Spotlight::CustomField, type: :model do
     end
 
     it 'queues a job to reindex any documents with data in the old field' do
-      expect(Spotlight::RenameSidecarFieldJob).to receive(:perform_later).with(exhibit, subject.field, subject.field.sub('tesim', 'ssim'))
+      expect(Spotlight::RenameSidecarFieldJob).to receive(:perform_later).with(
+        exhibit,
+        subject.field, subject.field.sub('tesim', 'ssim'),
+        subject.slug, subject.slug
+      )
+
       subject.field_type = 'vocab'
       subject.save
     end

data/spec/models/spotlight/custom_translation_extension_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+describe Spotlight::CustomTranslationExtension do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  subject do
+    Class.new(ActiveRecord::Base) do
+      include Spotlight::CustomTranslationExtension
+    end
+  end
+
+  describe '.current_exhibit' do
+    it 'sets the current exhibit' do
+      subject.current_exhibit = exhibit
+      expect(subject.current_exhibit).to eq exhibit
+    end
+
+    it 'reloads the i18n' do
+      allow(I18n.backend).to receive(:reload!)
+
+      subject.current_exhibit = exhibit
+    end
+  end
+end

data/spec/models/spotlight/page_spec.rb

@@ -65,6 +65,28 @@ describe Spotlight::Page, type: :model do
       page.content = []
       expect(page.content).to be_a_kind_of SirTrevorRails::BlockArray
     end
+
+    context 'with an alternate page content type' do
+      let(:page) { FactoryBot.create(:feature_page, content_type: 'Static') }
+      let(:fake_class) do
+        Class.new do
+          def self.parse(*_args)
+            'xyz'
+          end
+        end
+      end
+
+      before do
+        # needed so we don't accidentally stub Spotlight::PageContent below
+        require 'spotlight/page_content'
+        stub_const('Spotlight::PageContent::Static', fake_class)
+      end
+
+      it 'works' do
+        page.content = [].to_json
+        expect(page.content).to eq 'xyz'
+      end
+    end
   end
 
   describe '#content?' do
@@ -81,6 +103,19 @@ describe Spotlight::Page, type: :model do
     end
   end
 
+  describe '#content_type' do
+    let(:page) { FactoryBot.create(:feature_page) }
+
+    it 'can be set as an attribute' do
+      page.content_type = 'Xyz'
+      expect(page.content_type).to eq 'Xyz'
+    end
+
+    it 'defauts to SirTrevor' do
+      expect(page.content_type).to eq 'SirTrevor'
+    end
+  end
+
   describe '#slug' do
     let(:page) { FactoryBot.create(:feature_page) }
 
@@ -172,6 +207,16 @@ describe Spotlight::Page, type: :model do
       end
     end
 
+    context 'when cloning a page that has been deleted with a FriendlyId UUID added' do
+      let(:feature_page_static_title) { FactoryBot.create(:feature_page_static_title, exhibit: exhibit) }
+      let(:feature_page_static_title_two) { FactoryBot.create(:feature_page_static_title, exhibit: exhibit) }
+      it 'translated page has the same UUID' do
+        expect(feature_page_static_title.slug).to eq 'featurepage'
+        expect(feature_page_static_title_two.slug).not_to eq feature_page_static_title.slug
+        expect(feature_page_static_title_two.clone_for_locale('es').slug).to eq feature_page_static_title_two.slug
+      end
+    end
+
     context 'when cloning a parent page whose children pages have already been cloned' do
       let(:parent_page_es) { parent_page.clone_for_locale('es') }
       let(:child_page_es) { child_page.clone_for_locale('es') }

data/spec/services/spotlight/solr_document_builder_spec.rb

@@ -51,6 +51,15 @@ describe Spotlight::SolrDocumentBuilder do
         expect(sidecar.exhibit).to eq resource.exhibit
         expect(sidecar.resource).to eq resource
       end
+
+      context 'without a persisted resource' do
+        let(:resource) { FactoryBot.build(:resource) }
+
+        it 'does not implicitly persist the resource' do
+          resource.document_builder.documents_to_index.first
+          expect(resource).not_to be_persisted
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -15,26 +15,26 @@ require 'rspec/rails'
 require 'rspec/active_model/mocks'
 require 'paper_trail/frameworks/rspec'
 
-require 'chromedriver-helper'
 require 'selenium-webdriver'
+require 'webdrivers'
 require 'webmock/rspec'
 
 Capybara.javascript_driver = :headless_chrome
 
-# @note In January 2018, TravisCI disabled Chrome sandboxing in its Linux
-#       container build environments to mitigate Meltdown/Spectre
-#       vulnerabilities, at which point Spotlight needs to use the --no-sandbox
-#       flag. https://github.com/travis-ci/docs-travis-ci-com/blob/c1da4af0b7ee5de35fa4490fa8e0fc4b44881089/user/chrome.md
-#       h/t @mjgiarlo
 Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless disable-gpu no-sandbox window-size=1280,1696] }
-  )
-
-  Capybara::Selenium::Driver.new(app,
-                                 browser: :chrome,
-                                 desired_capabilities: capabilities)
+  Capybara::Selenium::Driver.load_selenium
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+    opts.args << '--headless'
+    opts.args << '--disable-gpu'
+    opts.args << '--no-sandbox'
+    opts.args << '--window-size=1280,1696'
+  end
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
+require 'webmock/rspec'
+allowed_sites = ['chromedriver.storage.googleapis.com']
+
+WebMock.disable_net_connect!(allow_localhost: true, allow: allowed_sites)
 
 if ENV['COVERAGE'] || ENV['CI']
   require 'simplecov'
@@ -61,9 +61,7 @@ RSpec.configure do |config|
   config.filter_rails_from_backtrace!
 
   config.use_transactional_fixtures = true
-  config.before :all do
-    WebMock.disable_net_connect!(allow_localhost: true)
-  end
+
   config.before :each 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'

data/spec/test_app_templates/Gemfile.extra

@@ -1,2 +1 @@
 gem 'thor', '~> 0.20'
-gem 'i18n', '< 1.1' # pinned until Rails and i18n sort our compatibility https://github.com/rails/rails/pull/33574

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 2.6.1.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -509,6 +509,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -636,7 +650,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -775,57 +789,61 @@ files:
 - app/assets/images/spotlight/default_browse_thumbnail.jpg
 - app/assets/images/spotlight/default_thumbnail.jpg
 - app/assets/images/spotlight/fallback/default.png
-- app/assets/javascripts/spotlight/add_new_page_button.js
-- app/assets/javascripts/spotlight/analytics.js
-- app/assets/javascripts/spotlight/appearance.js
+- app/assets/javascripts/spotlight/admin/add_another.js
+- app/assets/javascripts/spotlight/admin/add_new_page_button.js
+- app/assets/javascripts/spotlight/admin/appearance.js
+- app/assets/javascripts/spotlight/admin/attachments.js
+- app/assets/javascripts/spotlight/admin/blacklight_configuration.js
+- app/assets/javascripts/spotlight/admin/block_mixins/autocompleteable.js
+- app/assets/javascripts/spotlight/admin/block_mixins/formable.js
+- app/assets/javascripts/spotlight/admin/block_mixins/plustextable.js
+- app/assets/javascripts/spotlight/admin/blocks/block.js
+- app/assets/javascripts/spotlight/admin/blocks/browse_block.js
+- app/assets/javascripts/spotlight/admin/blocks/iframe_block.js
+- app/assets/javascripts/spotlight/admin/blocks/link_to_search_block.js
+- app/assets/javascripts/spotlight/admin/blocks/oembed_block.js
+- app/assets/javascripts/spotlight/admin/blocks/pages_block.js
+- app/assets/javascripts/spotlight/admin/blocks/resources_block.js
+- app/assets/javascripts/spotlight/admin/blocks/rule_block.js
+- app/assets/javascripts/spotlight/admin/blocks/search_result_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_base_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_carousel_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_embed_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_features_block.js
+- app/assets/javascripts/spotlight/admin/blocks/solr_documents_grid_block.js
+- app/assets/javascripts/spotlight/admin/blocks/uploaded_items_block.js
+- app/assets/javascripts/spotlight/admin/catalog_edit.js
+- app/assets/javascripts/spotlight/admin/copy_email_addresses.js
+- app/assets/javascripts/spotlight/admin/crop.es6
+- app/assets/javascripts/spotlight/admin/croppable.js
+- app/assets/javascripts/spotlight/admin/edit_in_place.js
+- app/assets/javascripts/spotlight/admin/exhibits.js
+- app/assets/javascripts/spotlight/admin/form_observer.js
+- app/assets/javascripts/spotlight/admin/iiif.es6
+- app/assets/javascripts/spotlight/admin/index.js
+- app/assets/javascripts/spotlight/admin/locks.js
+- app/assets/javascripts/spotlight/admin/multi_image_selector.js
+- app/assets/javascripts/spotlight/admin/pages.js.erb
+- app/assets/javascripts/spotlight/admin/readonly_checkbox.js
+- app/assets/javascripts/spotlight/admin/reindex_monitor.js
+- app/assets/javascripts/spotlight/admin/search_typeahead.js
+- app/assets/javascripts/spotlight/admin/select_related_input.js
+- app/assets/javascripts/spotlight/admin/sir-trevor/block_controls.js
+- app/assets/javascripts/spotlight/admin/sir-trevor/block_limits.js
+- app/assets/javascripts/spotlight/admin/sir-trevor/locales.js
+- app/assets/javascripts/spotlight/admin/spotlight_nestable.js
+- app/assets/javascripts/spotlight/admin/tabs.js
+- app/assets/javascripts/spotlight/admin/translation_progress.js
+- app/assets/javascripts/spotlight/admin/users.js
 - app/assets/javascripts/spotlight/application.js
-- app/assets/javascripts/spotlight/attachments.js
-- app/assets/javascripts/spotlight/blacklight_configuration.js
-- app/assets/javascripts/spotlight/block_mixins/autocompleteable.js
-- app/assets/javascripts/spotlight/block_mixins/formable.js
-- app/assets/javascripts/spotlight/block_mixins/plustextable.js
-- app/assets/javascripts/spotlight/blocks/block.js
-- app/assets/javascripts/spotlight/blocks/browse_block.js
-- app/assets/javascripts/spotlight/blocks/iframe_block.js
-- app/assets/javascripts/spotlight/blocks/link_to_search_block.js
-- app/assets/javascripts/spotlight/blocks/oembed_block.js
-- app/assets/javascripts/spotlight/blocks/pages_block.js
-- app/assets/javascripts/spotlight/blocks/resources_block.js
-- app/assets/javascripts/spotlight/blocks/rule_block.js
-- app/assets/javascripts/spotlight/blocks/search_result_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_base_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_carousel_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_embed_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_features_block.js
-- app/assets/javascripts/spotlight/blocks/solr_documents_grid_block.js
-- app/assets/javascripts/spotlight/blocks/uploaded_items_block.js
-- app/assets/javascripts/spotlight/catalog_edit.js
-- app/assets/javascripts/spotlight/clear_form_button.js
-- app/assets/javascripts/spotlight/copy_email_addresses.js
-- app/assets/javascripts/spotlight/crop.es6
-- app/assets/javascripts/spotlight/croppable.js
-- app/assets/javascripts/spotlight/edit_in_place.js
-- app/assets/javascripts/spotlight/exhibits.js
-- app/assets/javascripts/spotlight/form_observer.js
-- app/assets/javascripts/spotlight/iiif.es6
-- app/assets/javascripts/spotlight/locks.js
-- app/assets/javascripts/spotlight/multi_image_selector.js
-- app/assets/javascripts/spotlight/pages.js.erb
-- app/assets/javascripts/spotlight/readonly_checkbox.js
-- app/assets/javascripts/spotlight/reindex_monitor.js
-- app/assets/javascripts/spotlight/report_a_problem.js
-- app/assets/javascripts/spotlight/search_typeahead.js
-- app/assets/javascripts/spotlight/select_related_input.js
-- app/assets/javascripts/spotlight/sir-trevor/block_controls.js
-- app/assets/javascripts/spotlight/sir-trevor/block_limits.js
-- app/assets/javascripts/spotlight/sir-trevor/locales.js
 - app/assets/javascripts/spotlight/spotlight.js
-- app/assets/javascripts/spotlight/spotlight_nestable.js
-- app/assets/javascripts/spotlight/tabs.js
-- app/assets/javascripts/spotlight/translation_progress.js
-- app/assets/javascripts/spotlight/users.js
-- app/assets/javascripts/spotlight/zpr_links.js.erb
+- app/assets/javascripts/spotlight/user/analytics.js
+- app/assets/javascripts/spotlight/user/carousel.js
+- app/assets/javascripts/spotlight/user/clear_form_button.js
+- app/assets/javascripts/spotlight/user/index.js
+- app/assets/javascripts/spotlight/user/report_a_problem.js
+- app/assets/javascripts/spotlight/user/zpr_links.js.erb
 - app/assets/stylesheets/spotlight/_attachments.css
 - app/assets/stylesheets/spotlight/_blacklight_configuration.scss
 - app/assets/stylesheets/spotlight/_blacklight_overrides.scss
@@ -976,6 +994,8 @@ files:
 - app/models/spotlight/masthead.rb
 - app/models/spotlight/page.rb
 - app/models/spotlight/page_configurations.rb
+- app/models/spotlight/page_content.rb
+- app/models/spotlight/page_content/sir_trevor.rb
 - app/models/spotlight/reindex_progress.rb
 - app/models/spotlight/reindexing_log_entry.rb
 - app/models/spotlight/resource.rb
@@ -1065,6 +1085,8 @@ files:
 - app/views/spotlight/contacts/new.html.erb
 - app/views/spotlight/custom_fields/_form.html.erb
 - app/views/spotlight/custom_fields/edit.html.erb
+- app/views/spotlight/custom_fields/form_group/_text.html.erb
+- app/views/spotlight/custom_fields/form_group/_vocab.html.erb
 - app/views/spotlight/custom_fields/new.html.erb
 - app/views/spotlight/dashboards/_analytics.html.erb
 - app/views/spotlight/dashboards/_page.html.erb
@@ -1183,7 +1205,9 @@ files:
 - app/views/spotlight/translations/edit.html.erb
 - config/i18n-tasks.yml
 - config/locales/devise.en.yml
+- config/locales/spotlight.ar.yml
 - config/locales/spotlight.en.yml
+- config/locales/spotlight.fr.yml
 - config/locales/spotlight.it.yml
 - config/locales/spotlight.zh.yml
 - config/routes.rb
@@ -1250,6 +1274,8 @@ files:
 - db/migrate/20180529225807_change_spotlight_pages_content_column_to_medium_text.rb
 - db/migrate/20180822233601_change_type_of_taggings_taggable.rb
 - db/migrate/20181127085432_change_weight_on_pages.rb
+- db/migrate/20190807085432_add_content_type_to_pages.rb
+- db/migrate/20190813085432_add_is_multiple_to_custom_fields.rb
 - lib/blacklight/spotlight.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/scaffold_resource_generator.rb
@@ -1423,6 +1449,7 @@ files:
 - spec/models/spotlight/contact_image_spec.rb
 - spec/models/spotlight/contact_spec.rb
 - spec/models/spotlight/custom_field_spec.rb
+- spec/models/spotlight/custom_translation_extension_spec.rb
 - spec/models/spotlight/exhibit_spec.rb
 - spec/models/spotlight/exhibit_thumbnail_spec.rb
 - spec/models/spotlight/feature_page_spec.rb
@@ -1662,6 +1689,7 @@ test_files:
 - spec/models/spotlight/exhibit_spec.rb
 - spec/models/spotlight/featured_image_spec.rb
 - spec/models/spotlight/ability_spec.rb
+- spec/models/spotlight/custom_translation_extension_spec.rb
 - spec/models/spotlight/site_spec.rb
 - spec/models/spotlight/solr_document_sidecar_spec.rb
 - spec/models/spotlight/search_spec.rb