blacklight-spotlight 3.0.0.rc3 → 3.0.1

data/spec/factories/bulk_updates.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :bulk_update, class: 'Spotlight::BulkUpdate' do
+    file { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'updated-bulk-update-template.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__)) }
+
+    exhibit
+  end
+end

data/spec/factories/exhibits.rb

@@ -10,4 +10,8 @@ FactoryBot.define do
       association :thumbnail, factory: :exhibit_thumbnail
     end
   end
+  factory :skinny_exhibit, class: 'Spotlight::Exhibit' do
+    sequence(:title) { |n| "Exhibit Title #{n}" }
+    published { true }
+  end
 end

data/spec/factories/job_trackers.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :job_tracker, class: 'Spotlight::JobTracker' do
+    user
+    on factory: :exhibit
+    resource factory: :exhibit
+    created_at { Time.zone.parse('2017-01-05 23:00:00') }
+    updated_at { Time.zone.parse('2017-01-05 23:05:00') }
+  end
+end

data/spec/factories/users.rb

@@ -2,26 +2,45 @@
 
 FactoryBot.define do
   factory :user do
-    transient do
-      exhibit { FactoryBot.create(:exhibit) }
-    end
     sequence(:email) { |n| "user#{n}@example.com" }
     password { 'insecure' }
-
     factory :site_admin do
       after(:create) do |user, _evaluator|
         user.roles.create role: 'admin', resource: Spotlight::Site.instance
       end
     end
 
-    factory :exhibit_admin do
+    factory :named_exhibit_roles do
+      transient do
+        exhibit { FactoryBot.create(:exhibit) }
+        role { nil }
+      end
+
       after(:create) do |user, evaluator|
-        user.roles.create role: 'admin', resource: evaluator.exhibit
+        user.roles.create role: evaluator.role, resource: evaluator.exhibit if evaluator.role
+      end
+
+      factory :exhibit_admin do
+        transient do
+          role { 'admin' }
+        end
+      end
+
+      factory :exhibit_curator do
+        transient do
+          role { 'curator' }
+        end
       end
     end
-    factory :exhibit_curator do
+
+    trait :with_exhibit_role do
+      transient do
+        exhibit { FactoryBot.create(:exhibit) }
+        role { nil }
+      end
+
       after(:create) do |user, evaluator|
-        user.roles.create role: 'curator', resource: evaluator.exhibit
+        user.roles.create role: evaluator.role, resource: evaluator.exhibit if evaluator.role
       end
     end
 

data/spec/features/add_items_spec.rb

@@ -43,7 +43,8 @@ describe 'Uploading a non-repository item', type: :feature do
       expect(page).to have_content 'Object uploaded successfully.'
 
       expect(Spotlight::Resource.last.upload.image.file.path).to end_with '800x600.png'
-      Blacklight.default_index.connection.delete_by_id Spotlight::Resource.last.send(:compound_id)
+    ensure
+      Blacklight.default_index.connection.delete_by_query 'spotlight_resource_type_ssim:spotlight/resources/uploads'
       Blacklight.default_index.connection.commit
     end
 
@@ -59,8 +60,8 @@ describe 'Uploading a non-repository item', type: :feature do
       end
       expect(page).to have_content 'Object uploaded successfully.'
       expect(Spotlight::Resource.last.data['full_title_tesim']).to eq 'no-image'
-
-      Blacklight.default_index.connection.delete_by_id Spotlight::Resource.last.send(:compound_id)
+    ensure
+      Blacklight.default_index.connection.delete_by_query 'spotlight_resource_type_ssim:spotlight/resources/uploads'
       Blacklight.default_index.connection.commit
     end
 
@@ -84,7 +85,7 @@ describe 'Uploading a non-repository item', type: :feature do
     end
 
     context 'as an site administrator' do
-      let(:user) { FactoryBot.create(:site_admin, exhibit: exhibit) }
+      let(:user) { FactoryBot.create(:site_admin) }
 
       it 'displays the JSON upload form' do
         visit spotlight.new_exhibit_resource_path(exhibit)
@@ -113,6 +114,9 @@ describe 'Uploading a non-repository item', type: :feature do
         end
       end
 
+      Blacklight.default_index.connection.commit
+      visit current_path
+
       click_link '800x600'
       click_link 'Edit'
       fill_in 'Title', with: 'This is a now an avatar'
@@ -123,7 +127,8 @@ describe 'Uploading a non-repository item', type: :feature do
 
       expect(page).to have_content 'This is a now an avatar'
       expect(Spotlight::Resource.last.upload.image.path).to end_with 'avatar.png'
-      Blacklight.default_index.connection.delete_by_id Spotlight::Resource.last.send(:compound_id)
+    ensure
+      Blacklight.default_index.connection.delete_by_query 'spotlight_resource_type_ssim:spotlight/resources/uploads'
       Blacklight.default_index.connection.commit
     end
   end

data/spec/features/bulk_actions_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+describe 'Bulk actions', type: :feature do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+
+  before do
+    login_as curator
+    d = SolrDocument.new(id: 'dq287tq6352')
+    exhibit.tag(d.sidecar(exhibit), with: ['foo'], on: :tags)
+    d.make_private! exhibit
+    d.reindex
+    Blacklight.default_index.connection.commit
+  end
+
+  after do
+    d = SolrDocument.new(id: 'dq287tq6352')
+    exhibit.tag(d.sidecar(exhibit), with: [], on: :tags)
+    exhibit.owned_tags.destroy_all
+    d.make_public! exhibit
+    d.reindex
+    Blacklight.default_index.connection.commit
+  end
+
+  it 'setting item visibility', js: true do
+    visit spotlight.search_exhibit_catalog_path(exhibit, { q: 'dq287tq6352' })
+
+    click_button 'Bulk actions'
+    click_link 'Change item visibility'
+    expect(page).to have_css 'h4', text: 'Change item visibility', visible: true
+    choose 'Private'
+    accept_confirm 'All items in the result set will be updated. Are you sure?' do
+      click_button 'Change'
+    end
+    expect(page).to have_css '.alert', text: 'Visibility of 1 item is being updated.'
+    expect(SolrDocument.new(id: 'dq287tq6352').private?(exhibit)).to be true
+  end
+
+  it 'adding tags', js: true do
+    visit spotlight.search_exhibit_catalog_path(exhibit, { q: 'dq287tq6352' })
+
+    click_button 'Bulk actions'
+    click_link 'Add tags'
+    expect(page).to have_css 'h4', text: 'Add tags', visible: true
+    within '#add-tags-modal' do
+      find('[data-autocomplete-fetched="true"]', visible: false)
+      find('.tt-input').set('good,stuff')
+    end
+    accept_confirm 'All items in the result set will be updated. Are you sure?' do
+      click_button 'Add'
+    end
+    expect(page).to have_css '.alert', text: 'Tags are being added for 1 item.'
+    expect(SolrDocument.new(id: 'dq287tq6352').sidecar(exhibit).all_tags_list).to include('foo', 'good', 'stuff')
+  end
+
+  it 'removing tags', js: true do
+    visit spotlight.search_exhibit_catalog_path(exhibit, { q: 'dq287tq6352' })
+
+    click_button 'Bulk actions'
+    click_link 'Remove tags'
+    expect(page).to have_css 'h4', text: 'Remove tags', visible: true
+    within '#remove-tags-modal' do
+      find('[data-autocomplete-fetched="true"]', visible: false)
+      find('.tt-input').set('foo')
+    end
+    accept_confirm 'All items in the result set will be updated. Are you sure?' do
+      click_button 'Remove'
+    end
+    expect(page).to have_css '.alert', text: 'Tags are being removed for 1 item.'
+    expect(SolrDocument.new(id: 'dq287tq6352').sidecar(exhibit).all_tags_list).to eq []
+  end
+end

data/spec/features/catalog_spec.rb

@@ -30,6 +30,7 @@ describe 'Catalog', type: :feature do
   it 'has breadcrumbs' do
     visit spotlight.search_exhibit_catalog_path(exhibit, q: 'xyz')
     expect(page).to have_breadcrumbs 'Home', 'Search results'
+    expect(page).to have_selector '.breadcrumb-item.active', text: 'Search results'
   end
 
   describe 'Non-spotlight #show' do

data/spec/features/import_exhibit_spec.rb

@@ -6,7 +6,11 @@ describe 'Allow exhibit admins to import and export content from an exhibit', ty
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
 
-  before { login_as user }
+  before do
+    allow(Spotlight::ReindexExhibitJob).to receive(:perform_later).and_return(true) if Rails.version < '6'
+
+    login_as user
+  end
 
   pending 'should allow admins to export content from an exhibit' do
     pending(%(There's not really any good way to test the contents of a

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

@@ -142,14 +142,14 @@ describe 'Solr Document Block', feature: true, versioning: true, default_max_wai
   it 'allows you to optionally display a ZPR link with the image', js: true do
     fill_in_solr_document_block_typeahead_field with: 'gk446cj2442'
 
-    check 'Display ZPR link'
+    check 'Offer "View larger" option'
     # this seems silly, but also seems to help with the flappy-ness of this spec
-    expect(find_field('Display ZPR link', checked: true)).to be_checked
+    expect(find_field('Offer "View larger" option', checked: true)).to be_checked
 
     save_page
 
     within '.contents' do
-      click_button 'Show in ZPR viewer'
+      click_button 'View [World map] larger'
     end
 
     within '.modal-content' do
@@ -225,6 +225,6 @@ describe 'Solr Document Block', feature: true, versioning: true, default_max_wai
 
     # for some reason, the text area above isn't getting filled in
     # expect(page).to have_selector ".st-text-block", text: "zzz"
-    expect(find_field('primary-caption-field').value).to eq 'full_title_tesim'
+    expect(find_field('primary-caption-field').value).to eq Spotlight::PageConfigurations::DOCUMENT_TITLE_KEY
   end
 end

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

@@ -54,7 +54,7 @@ describe 'Uploaded Items Block', feature: true, js: true, versioning: true do
     attach_file('uploaded_item_url', fixture_file2)
 
     # This line blocks until the javascript has added the file to the page:
-    expect(find('#st-block-3_display-checkbox_2')).to be_present
+    expect(find('input[name="item[file_0][display]"]')).to be_present
 
     # Uncheck the first checkbox
     all('input[type="checkbox"]').first.click
@@ -65,4 +65,30 @@ describe 'Uploaded Items Block', feature: true, js: true, versioning: true do
       expect(page).to have_css('img[alt=""]', count: 1)
     end
   end
+
+  it 'may have ZPR links' do
+    attach_file('uploaded_item_url', fixture_file1)
+    attach_file('uploaded_item_url', fixture_file2)
+
+    check 'Offer "View larger" option'
+    # this seems silly, but also seems to help with the flappy-ness of this spec
+    expect(find_field('Offer "View larger" option', checked: true)).to be_checked
+
+    save_page
+
+    within('.uploaded-items-block') do
+      expect(page).to have_button('View larger', count: 2)
+    end
+
+    within first('.contents') do
+      data = find('button')['data-iiif-tilesource']
+      expect(data).to be_present
+      expect(JSON.parse(data).with_indifferent_access).to include type: 'image', url: end_with('800x600.png')
+      click_button 'View larger'
+    end
+
+    within '.modal-content' do
+      expect(page).to have_css('#osd-modal-container')
+    end
+  end
 end

data/spec/features/javascript/reindex_monitor_spec.rb

@@ -8,7 +8,7 @@ describe 'Reindex Monitor', js: true, default_max_wait_time: 10 do
   let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
 
   before do
-    FactoryBot.create(:in_progress_reindexing_log_entry, exhibit: exhibit, items_reindexed_estimate: 5)
+    exhibit.job_trackers.create(resource: exhibit, status: 'completed', job_class: 'Spotlight::ReindexExhibitJob')
     login_as exhibit_curator
     visit spotlight.admin_exhibit_catalog_path(exhibit)
   end

data/spec/features/site_users_management_spec.rb

@@ -42,15 +42,15 @@ describe 'Site users management', js: true do
 
     click_button 'Add role'
 
-    expect(page).to have_css(:td, text: 'not-an-admin@example.com')
+    expect(page).to have_css('td', text: 'not-an-admin@example.com')
 
-    expect(page).to have_css(:a, text: 'Remove from admin role', count: 4)
+    expect(page).to have_css('a', text: 'Remove from admin role', count: 2)
     within(all('table tbody tr:not([data-edit-for])').last) do
       click_link 'Remove from admin role'
     end
 
     expect(page).to have_content 'User removed from site adminstrator role'
-    expect(page).to have_css(:a, text: 'Remove from admin role', count: 2)
+    expect(page).to have_css('a', text: 'Remove from admin role', count: 0)
   end
 
   it 'sends an invitation email to users who do not exist' do
@@ -68,7 +68,7 @@ describe 'Site users management', js: true do
     click_link 'Add new administrator'
 
     expect(page).to have_css('td', text: user.email)
-    # There are two users, the original site admin and our admin user so only one button
-    expect(page).to have_css(:a, text: 'Remove from admin role', count: 2)
+    # There is just our admin user so no button
+    expect(page).to have_css('a', text: 'Remove from admin role', count: 0)
   end
 end

data/spec/fixtures/bulk-update-template.csv

@@ -0,0 +1,57 @@
+Item ID,Item Title,Visibility
+bm387cy2596,L'AMERIQVE,true
+cz507zk0531,NEW MEXICO,true
+dq287tq6352,L'AMERIQUE,false
+ds525vw8509,"Mappa mondo and Figura prima del capitolo IV., ossia della divisione della terra",true
+dx157dh4345,KAART der REYZE van drie Schepen naar het ZUYDLAND in de Jaaren 1721 en 1722,true
+dy396mt9665,a Map of the Middle Part of AMERICA,true
+fh912bx9878,[Americas],true
+gk446cj2442,[World map],true
+gt736xf9712,HEMISPHERE OCCIDENTAL DU GLOBE TERRESTRE contenant L'AMERIQUE SEPTENT.LE et L'AMERIQUE M.LE et P.tie des TERRES ARCTIQUES et ANTARCTIQUES Subdivisées en leurs Regions.,true
+gv664gb7394,SITVS TERRÆ CIRCVLIS COELESTIBVS CIRCVNDATÆ.,true
+gw298sq0504,"PLANISPHÆRIVM BRAHEVM, Sive Structura MVNDI TOTIVS, EX HYPOTHESI TYCHONIS BRAHEI IN PLANO DELINEATA. [Amstelodami : Apud Joannem Janssonium, 1660].",true
+jp266yb7109,AMERICA,false
+jr961xz9944,AMERICA SEPTENTRIONALIS,true
+jy409qg0248,Novissima et Accuratissima TOTIUS AMERICÆ DESCRIPTIO.,true
+kw406zk5778,[America],true
+kw703rh2327,"Mappe-monde pour connoitre les progŕes & les conquestes les plus remarquables des Provinces-Vnies, ainsy que celles des Compagnies d'Orient et d'Occident et les païs quelles possédent dans l'un et dans l'autre hemisphere and Atlas historique, ou, nouvelle introduction à l’histoire, à la chronologie & à la géographie ancienne & moderne",true
+mw236cd6430,"AMERIQUE SEPTENTRIONALE divisée en ses principales parties, ou sont distingués les vns des autres LES ESTATS suivant qu'ils appartiennent presentemet aux FRANÇOIS, CASTILLANS, ANGLOIS, SUEDOIS, DANOIS, HOLLANDOIS. Tirée des Relations de toutes ces Nations Par le Sr. Sanson, Geographe Ordinaire du Roy",true
+np731wc7689,L'AMERIQUE | Suivant les dernieres | Observations de l'Acade= | mie Royale des Sciences Seventh of 18 States,true
+nq874ts4848,"Introduction a la Geographie Avec une Description Historique Sur Touttes les parties de la Terre
+Title page",true
+nr766vt0518,GEOGRAPHISCHE UNIVERSAL - ZEIG UND SCHLAG-UHR : WEERELD-BEELDIGH WYS EN SLAG WERK,true
+nz081wv9348,AMERIQUE SEPTENTRIONALE Par N. Sanson Geographe Ord.re du Roy. Reveue et changée en plusieurs endroits suivant les Memoires les plus recents augmentée et corrigée en cette seconde edition,true
+pm812zf5263,AMERICÆ,true
+ps921pn8250,PLANISPHERE URANO-GEOGRAPHIQUE c'estadire LES SPHERES CELESTE et TERRESTRE mises en plan.,false
+pt603pv6417,"A Map of the WORLD with the Ships DUKE & DUTCHESS Tract Round it, from 1708 to 1711. Second of 2 States",true
+qb677kc3995,L'AMERIQVE autrement Le NOVVEAV MONDE et INDES OCCIDENTALES,true
+qt469cf8909,"Pascaart vertoonende de Zeecusten van Chili, Peru, Hispania, Nova, Nova Granada, en California.",true
+rc221bv1386,[Armenian map of the world],true
+rj993fh5469,"A New Map of the World Shewing the Course of Sr. Francis Drake, William Shouten and Capt. William Dampiers Voyages Round it.",true
+rx614sw9194,AMERICÆ nova discriptio.,true
+rz043dh7915,MAR DEL ZUR HISPANIS MARE PACIFICUM.,true
+rz818vx8201,'t Noorder deel van WEST-INDIEN,true
+sb904gg2771,Planisphaerium terrestre cum utroque coelesti hemisphaerio ... = Vlakke ared-kloot met het beide hemelsch half-rond,true
+sd345mz1879,A MAP of AMERICA from the latest and best Observations,true
+sn161bw2027,"Pas-caart van Zuyd-Zee, tusschen California en ilhas de Ladrones and La Atlas del mundo o el mundo aguado",true
+sn343fc0807,AMERICQVE SEPTENTRIONALE,true
+sp821gh4463,[World],true
+sw106rc9347,AMERIQUE SEPTENTRIONALE,true
+sx619yv5558,"Recentissima NOVI ORBIS, Sive AMERICÆ SEPTENTRIONALIS et MERIDIONALIS TABULA",true
+tg729zw9405,NOVA TOTIVS AMERICÆ DESCRIPTIO.,true
+vb000vb1451,AMERICA,true
+vw323gf4937,AMERICA with those known parts in that unknowne worlde both people and manner of buildings Discribed and inlarged by I.S.Ano.1626,false
+vy180gj7659,L'AMERIQUE Suivant les dernieres observations de l'Acad. Royale des Sciences.,true
+wb806ct0449,A Generall Chart of the | SOUTH SEA | from the River of Plate to | Dampiers Streights on ye Coast | of NEW GUINEA,true
+wt855xd4818,CONTINENT ARCTIQVE,true
+xd327cm9378,"Mapa mundi, con los meridianos, y paralelos, iguales como los del globo tere- y arreglado a las mejores, y ultimas relaciones",true
+yh941cp6284,Orbis terrarum tabula recens emendata et in lucem edita,true
+ym733yc1437,"[Maps of the world] and A new and universal dictionary of arts and sciences: ... With an introductory preface, ... And illustrated with a great number of copper-plates, engraven by the best hands",true
+yn959jw9550,A New Map of North AMERICA According to the Newest Observations.,true
+ys360dp2191,TYPUS SELENOGRAPHICUS LUNÆ PHASES ET ASPECTUS VARIOS ADUMBRANS.,true
+zn001wm6450,L'AMERIQVE autrement Le NOVVEAV MONDE et INDES OCCIDENTALES,true
+zn845sh3664,PLANISPHERE REPRESENTANT TOUTE L'ETENDUE DU MONDE. DANS L'ORDRE QU'ON A SUIVI DANS CE LIVRE. NB. LES CHIFFRES SE RAPORTENT AUX CARTES ET AUX PAGES DES DESCRIPTIONS.,true
+zq083qg2931,[Pacific Ocean],true
+zr014mj0786,A New and Exact Map of ASIA According to the Best Observations,true
+zs247rr8237,"AMERIQUE SEPTENTRIONALE divisée en ses principales parties, ou sont distingués les vns des autres LES ESTATS suivant qu'ils appartiennent presentemet aux FRANÇOIS, CASTILLANS, ANGLOIS, SUEDOIS, DANOIS, HOLLANDOIS. Tirée des Relations de toutes ces Nations Par le Sr. Sanson, Geographe Ordinaire du Roy",true
+zv316zr9542,AMERIQUE SEPTENTRIONALE,false

data/spec/fixtures/updated-bulk-update-template-w-tags.csv

@@ -0,0 +1,4 @@
+Item ID,Item Title,Visibility,Tag: CSV Tag1,Tag: CSV Tag2,Tag: CSV DoesntExist
+bm387cy2596,L'AMERIQVE,true,true,true,false
+cz507zk0531,NEW MEXICO,true,false,true,false
+dq287tq6352,L'AMERIQUE,true,true,true,false

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

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

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -66,7 +66,6 @@ describe Spotlight::ApplicationHelper, type: :helper do
     end
 
     it 'is a url for a search with the given tag facet' do
-      allow(SolrDocument).to receive_messages(solr_field_for_tagger: :exhibit_tags)
       expected = spotlight.search_exhibit_catalog_path(exhibit_id: helper.current_exhibit, f: { exhibit_tags: ['tag_value'] })
       expect(helper.url_to_tag_facet('tag_value')).to eq expected
     end
@@ -156,8 +155,8 @@ describe Spotlight::ApplicationHelper, type: :helper do
     end
 
     it 'excludes view fields that are never visible (e.g. atom, rss)' do
-      blacklight_config.view.a.if = true
-      blacklight_config.view.b.if = false
+      blacklight_config.view.a(if: true)
+      blacklight_config.view.b(if: false)
 
       expect(helper.available_view_fields).to include :a
       expect(helper.available_view_fields).not_to include :b
@@ -173,9 +172,9 @@ describe Spotlight::ApplicationHelper, type: :helper do
       # clean out the default views
       blacklight_config.view.reject! { |_| true }
 
-      blacklight_config.view.a
-      blacklight_config.view.b
-      blacklight_config.view.c
+      blacklight_config.view.a!
+      blacklight_config.view.b!
+      blacklight_config.view.c!
       allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
     end