blacklight-spotlight 3.0.0.alpha.6 → 3.0.0.rc1

data/spec/factories/featured_images.rb

@@ -6,6 +6,10 @@ FactoryBot.define do
     iiif_tilesource { 'https://exhibits-stage.stanford.edu/images/78' }
   end
 
+  factory :temporary_image, class: 'Spotlight::TemporaryImage' do
+    image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
+  end
+
   factory :masthead, class: 'Spotlight::Masthead' do
     image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
   end

data/spec/features/add_contacts_spec.rb

@@ -17,7 +17,7 @@ describe 'Add a contact to an exhibit', type: :feature do
       fill_in 'Location', with: 'Rome'
       fill_in 'Telephone', with: '(555) 555-5555 ext. 12345 (mobile)'
 
-      click_button 'Save'
+      find('input[name="commit"]').click
     end
     expect(page).to have_content 'The contact was created.'
 

data/spec/features/browse_category_admin_spec.rb

@@ -21,7 +21,7 @@ describe 'Browse Category Administration', type: :feature do
       expect(page).to have_css('#save-modal')
       fill_in 'search_title', with: 'Some search'
       expect do
-        click_button 'Save'
+        find('input[name="commit"]').click
         exhibit.searches.reload
       end.to change { exhibit.searches.count }.by 1
       expect(exhibit.searches.last.query_params).to eq 'q' => 'xyz'
@@ -32,7 +32,7 @@ describe 'Browse Category Administration', type: :feature do
       click_button 'Save this search'
       expect(page).to have_css('#save-modal')
       select search.title, from: 'id'
-      click_button 'Save'
+      find('input[name="commit"]').click
       expect(search.reload.query_params).to eq 'q' => 'xyz'
     end
   end

data/spec/features/create_exhibit_spec.rb

@@ -13,8 +13,7 @@ describe 'Create a new exhibit', type: :feature do
     within '.dropdown-menu' do
       click_link 'Create new exhibit'
     end
-    expect(page).to have_selector 'h1', text: 'Manage exhibits'
-    expect(page).to have_selector 'h1 small', text: 'Create a new exhibit'
+    expect(page).to have_selector 'h1', text: 'Create a new exhibit'
   end
 
   it 'allows admins to create a new exhibit' do
@@ -25,7 +24,7 @@ describe 'Create a new exhibit', type: :feature do
 
     fill_in 'Title', with: 'My exhibit title'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
 
     expect(page).to have_content 'The exhibit was created.'
     expect(Spotlight::Exhibit.last.slug).to eq 'my-exhibit-title'
@@ -40,7 +39,7 @@ describe 'Create a new exhibit', type: :feature do
     fill_in 'Title', with: 'My exhibit title'
     fill_in 'URL slug', with: 'custom-slug'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
 
     expect(page).to have_content 'The exhibit was created.'
     expect(Spotlight::Exhibit.last.slug).to eq 'custom-slug'
@@ -52,14 +51,15 @@ describe 'Create a new exhibit', type: :feature do
     fill_in 'Title', with: 'My exhibit title'
     fill_in 'URL slug', with: 'custom-slug'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
 
     visit spotlight.new_exhibit_path
 
     fill_in 'Title', with: 'My exhibit title'
     fill_in 'URL slug', with: 'custom-slug'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
+
     expect(page).to have_content 'has already been taken'
   end
 end

data/spec/features/dashboard_spec.rb

@@ -2,11 +2,6 @@
 
 describe 'Dashboard', type: :feature do
   let(:exhibit) { FactoryBot.create(:exhibit) }
-  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
-  before do
-    login_as(admin)
-  end
-
   let!(:parent_feature_page) do
     FactoryBot.create(:feature_page, title: 'Parent Page', exhibit: exhibit)
   end
@@ -18,6 +13,11 @@ describe 'Dashboard', type: :feature do
       exhibit: exhibit
     )
   end
+  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
+  before do
+    login_as(admin)
+  end
 
   it 'includes a list of recently edited feature pages' do
     visit spotlight.exhibit_dashboard_path(exhibit)

data/spec/features/exhibits/administration_spec.rb

@@ -63,9 +63,9 @@ describe 'Exhibit Administration', type: :feature do
     it 'updates the aria-labels properly', js: true do
       visit spotlight.edit_exhibit_path(exhibit)
 
-      expect(find_field(email_id_0)['aria-label']).to eq 'Contact email 1'
+      expect(find_field(email_id_0)['aria-label']).to eq 'Recipient email 1'
       find('#another-email').click
-      expect(find_field(email_id_1)['aria-label']).to eq 'Contact email 2'
+      expect(find_field(email_id_1)['aria-label']).to eq 'Recipient email 2'
     end
 
     it 'allows deletion of contact email addresses', js: true do
@@ -135,7 +135,7 @@ describe 'Exhibit Administration', type: :feature do
         find_all('.contact-email-delete').first.click
       end
 
-      expect(page).to have_css("##{hidden_input_id_0}~div span.contact-email-delete-error", text: 'Problem deleting contact email: Not Found')
+      expect(page).to have_css("##{hidden_input_id_0}~div span.contact-email-delete-error", text: 'Problem deleting recipient: Not Found')
     end
   end
 end

data/spec/features/exhibits/language_create_edit_spec.rb

@@ -13,7 +13,7 @@ describe 'Language', type: :feature do
     it 'successfully adds languages' do
       within '#language' do
         select 'Albanian'
-        click_button 'Add language'
+        find('input[name="commit"]').click
       end
       expect(page).to have_css '.flash_messages', text: 'The language was created.'
       within '#language' do
@@ -27,7 +27,7 @@ describe 'Language', type: :feature do
     it 'successfully updates the language' do
       within '#language' do
         select 'Albanian'
-        click_button 'Add language'
+        find('input[name="commit"]').click
       end
       expect(page).to have_css '.flash_messages', text: 'The language was created.'
       within '#language' do
@@ -43,7 +43,7 @@ describe 'Language', type: :feature do
     it 'successfully updates the language' do
       within '#language' do
         select 'Albanian'
-        click_button 'Add language'
+        find('input[name="commit"]').click
       end
       expect(page).to have_css '.flash_messages', text: 'The language was created.'
       within '#language' do

data/spec/features/exhibits/translation_editing_spec.rb

@@ -330,7 +330,7 @@ describe 'Translation editing', type: :feature do
 
     it 'has a title and description for every browse category' do
       within '#browse' do
-        expect(page).to have_css('input[type="text"]', count: 2)
+        expect(page).to have_css('input[type="text"]', count: 4)
         expect(page).to have_css('textarea', count: 2)
 
         expect(page).to have_field 'All Exhibit Items'
@@ -407,7 +407,7 @@ describe 'Translation editing', type: :feature do
       visit spotlight.edit_exhibit_translations_path(exhibit, language: 'fr')
       expect(page).to have_link('General 1/8')
       expect(page).to have_link('Search field labels 0/16')
-      expect(page).to have_link('Browse categories 0/2')
+      expect(page).to have_link('Browse categories 0/3')
       expect(page).to have_link('Metadata field labels 0/17')
     end
   end

data/spec/features/home_page_spec.rb

@@ -31,6 +31,15 @@ describe 'Home page', type: :feature, versioning: true do
     expect(page).to have_selector '.card-title a', text: 'New Home Page Title'
   end
 
+  it 'redirects back to the correct home page URL after updating (no format param to interfere w/ faceting)' do
+    visit spotlight.exhibit_home_page_path(exhibit.home_page)
+
+    click_link 'Edit'
+    click_button 'Save changes'
+
+    expect(page.current_url).to eq spotlight.exhibit_home_page_url(exhibit)
+  end
+
   it 'has working facet links' do
     visit spotlight.exhibit_home_page_path(exhibit.home_page)
     click_button 'Genre'

data/spec/features/javascript/block_controls_spec.rb

@@ -27,10 +27,12 @@ describe 'Block controls' do
 
     within('.spotlight-block-controls') do
       expect(page).to have_css('.st-controls-group', count: 2)
+
       within(first('.st-controls-group')) do
         expect(page).to have_content 'Standard widgets'
         expect(page).to have_css('.st-block-controls__button')
       end
+
       within(all('.st-controls-group').last) do
         expect(page).to have_content 'Exhibit item widgets'
         expect(page).to have_css('.st-block-controls__button')

data/spec/features/javascript/blocks/uploaded_items_block_spec.rb

@@ -26,6 +26,7 @@ describe 'Uploaded Items Block', feature: true, js: true, versioning: true do
     within('.dd-list') do
       expect(page).to have_css('.card-title', text: '800x600.png')
       fill_in 'Caption', with: 'Some caption text'
+      fill_in 'Link URL', with: 'https://example.com/'
     end
 
     attach_file('uploaded_item_url', fixture_file2)
@@ -41,8 +42,10 @@ describe 'Uploaded Items Block', feature: true, js: true, versioning: true do
     expect(page).to have_css('p', text: text)
 
     within('.uploaded-items-block') do
-      expect(page).to have_css('img[alt=""]', count: 2)
+      expect(page).to have_css('img[alt=""]', count: 1)
+      expect(page).to have_css('img[alt="Some caption text"]', count: 1)
       expect(page).to have_css '.caption', text: 'Some caption text'
+      expect(page).to have_link 'Some caption text', href: 'https://example.com/'
     end
   end
 

data/spec/features/report_a_problem_spec.rb

@@ -33,9 +33,10 @@ describe 'Report a Problem', type: :feature do
     it 'accepts a problem report', js: true do
       visit spotlight.exhibit_solr_document_path(exhibit, id: 'dq287tq6352')
       click_on 'Feedback'
+      expect(page).to have_css('.alert-primary', text: '/dq287tq6352')
       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'
+      fill_in 'Your name', with: 'Some Body'
+      fill_in 'Your email', with: 'test@example.com'
       fill_in 'Message', with: 'This is my problem report'
 
       expect do
@@ -47,8 +48,8 @@ describe 'Report a Problem', type: :feature do
       visit spotlight.exhibit_solr_document_path(exhibit, id: 'dq287tq6352')
       click_on 'Feedback'
       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'
+      fill_in 'Your name', with: 'Some Body'
+      fill_in 'Your email', with: 'test@example.com'
       page.evaluate_script("$('#contact_form_#{honeypot_field_name}').val('possible_spam@spam.com')")
       fill_in 'Message', with: 'This is my problem report'
 

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -109,13 +109,13 @@ describe Spotlight::PagesHelper, type: :helper do
   end
 
   describe '#content_editor_class' do
-    context 'with a sir-trevor backed page' do
+    context 'a sir-trevor backed page with a custom class' 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
+    context 'a sir-trevor backed page with a derived class' 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

data/spec/helpers/spotlight/title_helper_spec.rb

@@ -17,6 +17,19 @@ describe Spotlight::TitleHelper, type: :helper do
       expect(title).to have_selector 'h1', text: 'Section'
       expect(title).to have_selector 'h1 small', text: 'Title'
     end
+
+    it 'renders just the section title if that was all that was provided' do
+      allow(helper).to receive(:t).and_call_original
+      allow(helper).to receive(:t).with(:'.header', default: '').and_return('')
+
+      title = helper.page_title('Section')
+
+      expect(title).to have_selector 'h1', text: 'Section'
+      expect(title).not_to have_selector 'h1 small'
+
+      title = helper.instance_variable_get(:@page_title)
+      expect(title).to eq 'Section | Application'
+    end
   end
 
   describe '#set_html_page_title' do

data/spec/i18n_spec.rb

@@ -2,7 +2,6 @@
 
 require 'i18n/tasks'
 
-# rubocop:disable RSpec/DescribeClass
 RSpec.describe 'I18n' do
   let(:i18n) { I18n::Tasks::BaseTask.new }
   let(:missing_keys) { i18n.missing_keys }
@@ -26,4 +25,3 @@ RSpec.describe 'I18n' do
     expect(non_normalized).to be_empty, error_message
   end
 end
-# rubocop:enable RSpec/DescribeClass

data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Spotlight::AddUploadsFromCSV do
+describe Spotlight::AddUploadsFromCsv do
   subject(:job) { described_class.new(data, exhibit, user) }
 
   let(:exhibit) { FactoryBot.create(:exhibit) }
@@ -40,4 +40,16 @@ describe Spotlight::AddUploadsFromCSV do
 
     job.perform_now
   end
+
+  context 'with errors' do
+    it 'collects errors uploaded resources for each row of data' do
+      allow(Spotlight::IndexingCompleteMailer).to receive(:documents_indexed).and_return(double(deliver_now: true))
+      job.perform_now
+      expect(Spotlight::IndexingCompleteMailer).to have_received(:documents_indexed).with(
+        data, exhibit, user,
+        indexed_count: 1,
+        errors: { 1 => array_including(match(/relative URI: x/)), 2 => array_including(match(/Upload is invalid/)) }
+      )
+    end
+  end
 end

data/spec/mailers/spotlight/indexing_complete_mailer_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe Spotlight::IndexingCompleteMailer do
-  subject { described_class.documents_indexed [1, 2, 3], exhibit, user }
+  subject { described_class.documents_indexed [1, 2, 3], exhibit, user, indexed_count: 3 }
 
   let(:user) { double(email: 'test@example.com') }
   let(:exhibit) { double(title: 'Exhibit title') }
@@ -29,4 +29,14 @@ describe Spotlight::IndexingCompleteMailer do
   it 'includes the exhibit title' do
     expect(subject.body.encoded).to match exhibit.title
   end
+
+  context 'with errors' do
+    subject { described_class.documents_indexed [], exhibit, user, indexed_count: 0, errors: { 1 => ['missing title'], 20 => ['whatever'] } }
+
+    it 'includes some errors' do
+      expect(subject.body.encoded).to match 'Errors'
+      expect(subject.body.encoded).to match 'Row 1: missing title'
+      expect(subject.body.encoded).to match 'Row 20: whatever'
+    end
+  end
 end

data/spec/models/solr_document_spec.rb

@@ -4,14 +4,13 @@ describe SolrDocument, type: :model do
   subject { document }
 
   let(:document) { described_class.new(id: 'abcd123') }
+  let(:exhibit_alt) { FactoryBot.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   before do
     allow(subject).to receive_messages(reindex: nil)
   end
 
-  let(:exhibit_alt) { FactoryBot.create(:exhibit) }
-  let(:exhibit) { FactoryBot.create(:exhibit) }
-
   its(:to_key) { is_expected.to eq ['abcd123'] }
   its(:persisted?) { is_expected.to be_truthy }
 

data/spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb

@@ -3,6 +3,7 @@
 describe Spotlight::AccessControlsEnforcementSearchBuilder do
   class MockSearchBuilder < Blacklight::SearchBuilder
     attr_reader :blacklight_params, :scope
+
     def initialize(blacklight_params, scope)
       @blacklight_params = blacklight_params
       @scope = scope

data/spec/models/spotlight/exhibit_spec.rb

@@ -28,7 +28,7 @@ describe Spotlight::Exhibit, type: :model do
     end
 
     it 'does not validate the presence of the title under a non-default locale' do
-      expect(I18n).to receive(:locale).and_return(:fr)
+      allow(I18n).to receive(:locale).and_return(:fr)
       exhibit.title = ''
       expect do
         exhibit.save
@@ -402,6 +402,7 @@ describe Spotlight::Exhibit, type: :model do
       I18n.locale = 'fr'
       persisted_exhibit.reload
       expect(persisted_exhibit.title).to eq 'Titre français'
+      expect(persisted_exhibit.translated_title).to eq 'Titre français'
     end
 
     it 'has a translatable subtitle' do
@@ -417,5 +418,12 @@ describe Spotlight::Exhibit, type: :model do
       persisted_exhibit.reload
       expect(persisted_exhibit.description).to eq 'Description français'
     end
+
+    it 'is nil if no translation has been prrovided' do
+      expect(persisted_exhibit.title).to eq 'Sample'
+      I18n.locale = 'es'
+      persisted_exhibit.reload
+      expect(persisted_exhibit.translated_title(default: '')).to eq nil
+    end
   end
 end

data/spec/models/spotlight/feature_page_spec.rb

@@ -57,11 +57,6 @@ describe Spotlight::FeaturePage, type: :model do
       expect(low_weight).not_to be_valid
       expect(high_weight).not_to be_valid
     end
-
-    it 'settable valid maximum' do
-      stub_const('Spotlight::Page::MAX_PAGES', 2000)
-      expect(high_weight).to be_valid
-    end
   end
 
   it { is_expected.to be_feature_page }

data/spec/models/spotlight/featured_image_spec.rb

@@ -3,6 +3,22 @@
 describe Spotlight::FeaturedImage do
   subject(:featured_image) { described_class.new }
 
+  let(:temp_image) { FactoryBot.create(:temporary_image) }
+
+  context 'with an uploaded image' do
+    it 'copies the temporary uploaded image to this model' do
+      featured_image.source = 'remote'
+      featured_image.upload_id = temp_image.id
+
+      featured_image.save
+
+      expect(featured_image.image.filename).to eq temp_image.image.filename
+      expect(featured_image.image.read).to eq temp_image.image.read
+
+      expect { temp_image.reload }.to raise_exception ActiveRecord::RecordNotFound
+    end
+  end
+
   describe '#iiif_url' do
     let(:iiif_tilesource) { 'http://example.com/iiif/abc123/info.json' }
     let(:iiif_region) { '0,0,400,300' }
@@ -17,6 +33,17 @@ describe Spotlight::FeaturedImage do
         expect(subject.iiif_url).to match(%r{^http://example.com/iiif/abc123/})
         expect(subject.iiif_url).not_to include('info.json')
       end
+
+      context 'with an uploaded image' do
+        before do
+          featured_image.image = temp_image.image
+          featured_image.save!
+        end
+
+        it 'points at the RIIIF endpoint' do
+          expect(subject.iiif_url).to match(%r{^/images/\d+/})
+        end
+      end
     end
 
     describe 'region' do