blacklight-spotlight 3.0.0.rc6 → 3.1.0

data/spec/factories/bulk_updates.rb

@@ -7,6 +7,12 @@ FactoryBot.define do
     exhibit
   end
 
+  factory :bulk_update_no_cols, class: 'Spotlight::BulkUpdate' do
+    file { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'updated-bulk-update-template-no-cols.csv'), __dir__)) }
+
+    exhibit
+  end
+
   factory :tagged_bulk_update, class: 'Spotlight::BulkUpdate' do
     file { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'updated-bulk-update-template-w-tags.csv'), __dir__)) }
 

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

@@ -42,6 +42,6 @@ describe 'Search Result Block', type: :feature, js: true do
     end
 
     # Documents should exist
-    expect(page).to have_css('.documents .document')
+    expect(page).to have_css('.documents-gallery .document')
   end
 end

data/spec/features/report_a_problem_spec.rb

@@ -28,6 +28,7 @@ describe 'Report a Problem', type: :feature do
       click_on 'Feedback'
 
       expect(page).to have_css('h2', text: 'Contact us', visible: true)
+      expect(page).to have_css('#contact_form_name', count: 1)
     end
 
     it 'accepts a problem report', js: true do

data/spec/fixtures/iiif_responses.rb

@@ -5,24 +5,24 @@ module IiifResponses
     {
       "@id": 'uri://for-top-level-collection',
       "@type": 'sc:Collection',
-      "label": 'Complex Collection',
-      "collections": [
+      label: 'Complex Collection',
+      collections: [
         {
           "@id": 'uri://for-child-collection1',
           "@type": 'sc:Collection',
-          "label": 'Child Collection 1'
+          label: 'Child Collection 1'
         },
         {
           "@id": 'uri://for-child-collection2',
           "@type": 'sc:Collection',
-          "label": 'Child Collection 2'
+          label: 'Child Collection 2'
         }
       ],
-      "manifests": [
+      manifests: [
         {
           "@id": 'uri://for-manifest1',
           "@type": 'sc:Manifest',
-          "label": 'Test Manifest 1'
+          label: 'Test Manifest 1'
         }
       ]
     }.to_json
@@ -32,19 +32,19 @@ module IiifResponses
     {
       "@id": 'uri://for-child-collection1',
       "@type": 'sc:Collection',
-      "label": 'Child Collection 1',
-      "collections": [
+      label: 'Child Collection 1',
+      collections: [
         {
           "@id": 'uri://for-child-collection3',
           "@type": 'sc:Collection',
-          "label": 'Child Collection 3'
+          label: 'Child Collection 3'
         }
       ],
-      "manifests": [
+      manifests: [
         {
           "@id": 'uri://for-manifest2',
           "@type": 'sc:Manifest',
-          "label": 'Test Manifest 2'
+          label: 'Test Manifest 2'
         }
       ]
     }.to_json
@@ -54,12 +54,12 @@ module IiifResponses
     {
       "@id": 'uri://for-child-collection2',
       "@type": 'sc:Collection',
-      "label": 'Child Collection 2',
-      "manifests": [
+      label: 'Child Collection 2',
+      manifests: [
         {
           "@id": 'uri://for-manifest4',
           "@type": 'sc:Manifest',
-          "label": 'Test Manifest 4'
+          label: 'Test Manifest 4'
         }
       ]
     }.to_json
@@ -69,12 +69,12 @@ module IiifResponses
     {
       "@id": 'uri://for-child-collection3',
       "@type": 'sc:Collection',
-      "label": 'Child Collection 3',
-      "manifests": [
+      label: 'Child Collection 3',
+      manifests: [
         {
           "@id": 'uri://for-manifest3',
           "@type": 'sc:Manifest',
-          "label": 'Test Manifest 3'
+          label: 'Test Manifest 3'
         }
       ]
     }.to_json
@@ -84,40 +84,40 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest1',
       "@type": 'sc:Manifest',
-      "label": 'Test Manifest 1',
-      "attribution": 'Attribution Data',
-      "description": 'A test IIIF manifest',
-      "license": 'http://www.example.org/license.html',
-      "metadata": [
+      label: 'Test Manifest 1',
+      attribution: 'Attribution Data',
+      description: 'A test IIIF manifest',
+      license: 'http://www.example.org/license.html',
+      metadata: [
         {
-          "label": 'Author',
-          "value": 'John Doe'
+          label: 'Author',
+          value: 'John Doe'
         },
         {
-          "label": 'Author',
-          "value": 'Jane Doe'
+          label: 'Author',
+          value: 'Jane Doe'
         },
         {
-          "label": 'Another Field',
-          "value": 'Some data'
+          label: 'Another Field',
+          value: 'Some data'
         }
       ],
-      "thumbnail": {
+      thumbnail: {
         "@id": 'uri://to-thumbnail'
       },
-      "sequences": [
+      sequences: [
         {
           "@type": 'sc:Sequence',
-          "canvases": [
+          canvases: [
             {
               "@type": 'sc:Canvas',
-              "images": [
+              images: [
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
                     "@id": 'uri://full-image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service'
                     }
                   }
@@ -134,47 +134,47 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest2',
       "@type": 'sc:Manifest',
-      "label": {
+      label: {
         "@value": 'Test Manifest 2',
         "@language": 'en'
       },
-      "attribution": 'Attribution Data',
-      "description": 'A test IIIF manifest',
-      "license": 'http://www.example.org/license.html',
-      "metadata": [
+      attribution: 'Attribution Data',
+      description: 'A test IIIF manifest',
+      license: 'http://www.example.org/license.html',
+      metadata: [
         {
-          "label": 'Contributor',
-          "value": 'John Doe'
+          label: 'Contributor',
+          value: 'John Doe'
         },
         {
-          "label": 'Yet Another Field',
-          "value": 'Some data'
+          label: 'Yet Another Field',
+          value: 'Some data'
         }
       ],
-      "thumbnail": {
+      thumbnail: {
         "@id": 'uri://to-thumbnail'
       },
-      "sequences": [
+      sequences: [
         {
           "@type": 'sc:Sequence',
-          "canvases": [
+          canvases: [
             {
               "@type": 'sc:Canvas',
-              "images": [
+              images: [
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service'
                     }
                   }
                 },
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service2'
                     }
                   }
@@ -191,7 +191,7 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest3',
       "@type": 'sc:Manifest',
-      "label": [
+      label: [
         {
           "@value": 'Test Manifest 3',
           "@language": 'en'
@@ -201,34 +201,34 @@ module IiifResponses
           "@language": 'fr'
         }
       ],
-      "attribution": 'Attribution Data',
-      "description": 'A test IIIF manifest',
-      "license": 'http://www.example.org/license.html',
-      "metadata": [
+      attribution: 'Attribution Data',
+      description: 'A test IIIF manifest',
+      license: 'http://www.example.org/license.html',
+      metadata: [
         {
-          "label": 'Author',
-          "value": 'Jane Doe'
+          label: 'Author',
+          value: 'Jane Doe'
         },
         {
-          "label": 'Collection',
-          "value": 'Some Collection'
+          label: 'Collection',
+          value: 'Some Collection'
         }
       ],
-      "thumbnail": {
+      thumbnail: {
         "@id": 'uri://to-thumbnail'
       },
-      "sequences": [
+      sequences: [
         {
           "@type": 'sc:Sequence',
-          "canvases": [
+          canvases: [
             {
               "@type": 'sc:Canvas',
-              "images": [
+              images: [
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service'
                     }
                   }
@@ -245,35 +245,35 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest4',
       "@type": 'sc:Manifest',
-      "label": 'Test Manifest 4',
-      "attribution": 'Attribution Data',
-      "description": 'A test IIIF manifest',
-      "license": 'http://www.example.org/license.html',
-      "metadata": [
+      label: 'Test Manifest 4',
+      attribution: 'Attribution Data',
+      description: 'A test IIIF manifest',
+      license: 'http://www.example.org/license.html',
+      metadata: [
         {
-          "label": 'Contributor',
-          "value": 'Jane Doe'
+          label: 'Contributor',
+          value: 'Jane Doe'
         },
         {
-          "label": 'Location',
-          "value": 'Some location'
+          label: 'Location',
+          value: 'Some location'
         }
       ],
-      "thumbnail": {
+      thumbnail: {
         "@id": 'uri://to-thumbnail'
       },
-      "sequences": [
+      sequences: [
         {
           "@type": 'sc:Sequence',
-          "canvases": [
+          canvases: [
             {
               "@type": 'sc:Canvas',
-              "images": [
+              images: [
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service'
                     }
                   }

data/spec/fixtures/updated-bulk-update-template-no-cols.csv

@@ -0,0 +1,4 @@
+Item ID,Item Title
+bm387cy2596,L'AMERIQVE
+cz507zk0531,NEW MEXICO
+dq287tq6352,L'AMERIQUE

data/spec/jobs/spotlight/process_bulk_updates_csv_job_spec.rb

@@ -36,6 +36,14 @@ describe Spotlight::ProcessBulkUpdatesCsvJob do
         expect(SolrDocument.index.connection).not_to have_received(:update)
       end
     end
+
+    context 'without a visibility column' do
+      let(:bulk_update) { FactoryBot.create(:bulk_update_no_cols, exhibit: exhibit) }
+
+      it 'does nothing with the data' do
+        expect { subject.perform_now }.not_to(change { exhibit.reload.solr_document_sidecars.where(public: false).count })
+      end
+    end
   end
 
   describe 'tags' do

data/spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb

@@ -42,8 +42,7 @@ describe Spotlight::AccessControlsEnforcementSearchBuilder do
     it 'does not filter resources to just those created by the exhibit' do
       allow(current_ability).to receive(:can?).and_return(true)
       subject.apply_permissive_visibility_filter(solr_request)
-      expect(solr_request).to include :fq
-      expect(solr_request[:fq]).not_to include "{!term f=spotlight_exhibit_slug_#{exhibit.slug}_bsi}true"
+      expect(solr_request[:fq]).to be_blank
     end
   end
 

data/spec/models/spotlight/featured_image_spec.rb

@@ -5,6 +5,18 @@ describe Spotlight::FeaturedImage do
 
   let(:temp_image) { FactoryBot.create(:temporary_image) }
 
+  describe '#bust_containing_resource_caches' do
+    let!(:feature_page) { FactoryBot.create(:feature_page, thumbnail: temp_image) }
+    let!(:feature_page2) { FactoryBot.create(:feature_page, thumbnail: temp_image) }
+
+    it 'changes the updated_at for all resources that might be using this image' do
+      temp_image.save
+
+      expect(feature_page.updated_at).to be < feature_page.reload.updated_at
+      expect(feature_page2.updated_at).to be < feature_page2.reload.updated_at
+    end
+  end
+
   context 'with an uploaded image' do
     it 'copies the temporary uploaded image to this model' do
       featured_image.source = 'remote'

data/spec/models/spotlight/page_configurations_spec.rb

@@ -28,9 +28,9 @@ describe Spotlight::PageConfigurations, type: :model do
 
   describe 'downstream configured_params' do
     it 'merges the supplied hash into the configs' do
-      expect(page_config).to receive_messages(configured_params: { 'hello': 'goodbye' })
+      expect(page_config).to receive_messages(configured_params: { hello: 'goodbye' })
 
-      expect(page_config.as_json).to include('hello': 'goodbye')
+      expect(page_config.as_json).to include(hello: 'goodbye')
     end
 
     it 'sends the #call method to the value if it can respond (e.g. a lamda)' do

data/spec/test_app_templates/catalog_controller.rb

@@ -36,7 +36,6 @@ class CatalogController < ApplicationController
     config.index.thumbnail_field = Spotlight::Engine.config.thumbnail_field
 
     config.show.tile_source_field = :content_metadata_image_iiif_info_ssm
-    config.show.partials.insert(1, :openseadragon)
 
     config.add_results_collection_tool(:sort_widget)
     config.add_results_collection_tool(:per_page_widget)

data/spec/views/spotlight/pages/show.html.erb_spec.rb

@@ -33,12 +33,22 @@ describe 'spotlight/pages/show', type: :view do
     render
   end
 
-  it 'does not double-escape HTML entities in the HTML title' do
-    allow(page).to receive_messages(title: 'Abbott & Costello')
-    stub_template 'shared/_user_util_links.html.erb' => ''
-    stub_template 'shared/_masthead.html.erb' => ''
-    render template: 'spotlight/pages/show', layout: 'layouts/spotlight/spotlight'
-    expect(rendered).to have_content('Abbott & Costello | Blacklight')
+  context 'when rendering with layout' do
+    before do
+      allow(page).to receive_messages(title: 'Abbott & Costello')
+      stub_template 'shared/_analytics.html.erb' => 'analytics'
+      stub_template 'shared/_user_util_links.html.erb' => ''
+      stub_template 'shared/_masthead.html.erb' => ''
+      render template: 'spotlight/pages/show', layout: 'layouts/spotlight/spotlight'
+    end
+
+    it 'does not double-escape HTML entities in the HTML title' do
+      expect(rendered).to have_content('Abbott & Costello | Blacklight')
+    end
+
+    it 'includes analytics reporting' do
+      expect(rendered).to have_content 'analytics'
+    end
   end
 
   it 'does not include the page title' do