blacklight-spotlight 1.4.1 → 1.5.1

data/spec/factories/translation.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :translation do
+    locale 'en'
+    exhibit
+  end
+end

data/spec/features/add_iiif_manifest_spec.rb

@@ -18,6 +18,7 @@ describe 'adding IIIF Manifest', type: :feature do
   it 'submits the form to create a new item' do
     expect_any_instance_of(Spotlight::Resource).to receive(:reindex_later).and_return(true)
     url = 'https://purl.stanford.edu/vw754mr2281/iiif/manifest'
+    stub_request(:head, url).to_return(status: 200, headers: { 'Content-Type' => 'application/json' })
     visit spotlight.admin_exhibit_catalog_path(exhibit)
 
     click_link 'Add items'
@@ -30,6 +31,7 @@ describe 'adding IIIF Manifest', type: :feature do
 
   it 'returns an error message if the URL returned in not a IIIF endpoint' do
     visit spotlight.admin_exhibit_catalog_path(exhibit)
+    stub_request(:head, 'http://example.com').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
 
     click_link 'Add items'
     fill_in 'URL', with: 'http://example.com'

data/spec/features/browse_category_spec.rb

@@ -67,6 +67,34 @@ feature 'Browse pages' do
       end
     end
 
+    context 'in an exhibit that is configured to not show metadata in the default view' do
+      let(:mock_documents) do
+        [SolrDocument.new(id: 'abc123', language_ssm: %w[English Flemish])]
+      end
+      before do
+        blacklight_config = exhibit.blacklight_config
+        blacklight_config.index_fields.each do |_, config|
+          config.gallery = false
+        end
+        blacklight_config.save
+
+        allow_any_instance_of(Spotlight::BrowseController).to receive(:blacklight_config).and_return(
+          blacklight_config
+        )
+      end
+
+      it 'uses the appropriate view config' do
+        visit spotlight.exhibit_browse_path(exhibit, search)
+
+        expect(page).to have_css('#documents.gallery .document', count: 1)
+
+        within '.document' do
+          expect(page).not_to have_css('dt')
+          expect(page).not_to have_css('dd')
+        end
+      end
+    end
+
     context 'without a curator-selected view' do
       it 'renders the gallery view' do
         visit spotlight.exhibit_browse_path(exhibit, search)

data/spec/features/edit_search_fields_spec.rb

@@ -27,7 +27,7 @@ describe 'Search Administration', type: :feature do
       it 'allows curators to select and unselect facets for display' do
         visit spotlight.edit_exhibit_search_configuration_path exhibit
 
-        expect(page).to have_content 'Configuration Search Options Facets'
+        expect(page).to have_content "Configuration Search\nOptions Facets Results"
         expect(page).to have_button 'Save'
 
         uncheck 'blacklight_configuration_facet_fields_language_ssim_show' # Language
@@ -50,7 +50,6 @@ describe 'Search Administration', type: :feature do
       it 'updates sort options' do
         visit spotlight.edit_exhibit_search_configuration_path(exhibit)
 
-        # #field_labeled doesn't appear to work for disabled inputs
         expect(page).to have_css("input[name='blacklight_configuration[sort_fields][relevance][enable]'][disabled='disabled']")
         expect(page).to have_css('#nested-sort-fields .dd-item:nth-child(5) h3', text: 'Date (new to old)')
 

data/spec/features/exhibit_masthead_spec.rb

@@ -33,8 +33,8 @@ describe 'Add and update the site masthead', type: :feature do
     click_link 'Exhibit masthead'
 
     within '#site-masthead' do
-      expect(field_labeled('Show background image in masthead')).to be_checked
-      expect(field_labeled('Upload an image')).to be_checked
+      expect(page).to have_checked_field 'Show background image in masthead'
+      expect(page).to have_checked_field 'Upload an image'
     end
   end
 

data/spec/features/exhibit_themes_spec.rb

@@ -19,7 +19,7 @@ describe 'Update the site theme', type: :feature do
 
     click_link 'Exhibit masthead'
 
-    expect(field_labeled('Modern')).to be_checked
+    expect(page).to have_checked_field 'Modern'
     expect(page).to have_xpath('//link[contains(@href, "/assets/application_modern")]', visible: false)
   end
 end

data/spec/features/exhibits/add_tags_spec.rb

@@ -2,7 +2,7 @@
 describe 'Add tags to an item in an exhibit', type: :feature do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
-  let(:custom_field) { FactoryBot.create(:custom_field, exhibit: exhibit) }
+  let(:custom_field) { FactoryBot.build_stubbed(:custom_field, exhibit: exhibit) }
 
   before do
     login_as(curator)

data/spec/features/item_admin_spec.rb

@@ -34,7 +34,7 @@ describe 'Item Administration', type: :feature do
       item.click_button 'Make Public'
     end
 
-    it "toggles the 'blacklight-private' label", js: true do
+    it "toggles the 'blacklight-private' label", js: true, default_max_wait_time: 5 do
       visit spotlight.admin_exhibit_catalog_path(exhibit)
       # The label should be toggled when the checkbox is clicked
       expect(page).to_not have_css('tr.blacklight-private')

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

@@ -1,4 +1,4 @@
-feature 'Solr Document Block', feature: true, versioning: true do
+feature 'Solr Document Block', feature: true, versioning: true, default_max_wait_time: 15 do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   let(:feature_page) do
@@ -26,7 +26,7 @@ feature 'Solr Document Block', feature: true, versioning: true do
   end
 
   scenario 'it should allow you to add a solr document to the widget', js: true do
-    fill_in_typeahead_field with: 'dq287tq6352'
+    fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
     within(:css, '.panel') do
       expect(page).to have_content "L'AMERIQUE"
     end
@@ -34,7 +34,7 @@ feature 'Solr Document Block', feature: true, versioning: true do
     save_page
 
     # verify that the item + image widget is displaying an image from the document.
-    within(:css, '.items-block') do
+    within(:css, '.items-block', visible: true) do
       expect(page).to have_css('.thumbnail')
       expect(page).to have_css('.thumbnail a img')
       expect(page).not_to have_css('.title')
@@ -42,22 +42,24 @@ feature 'Solr Document Block', feature: true, versioning: true do
   end
 
   scenario 'it should allow you to add multiple solr documents to the widget', js: true do
-    fill_in_typeahead_field with: 'dq287tq6352'
-    fill_in_typeahead_field with: 'gk446cj2442'
+    fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
+    fill_in_solr_document_block_typeahead_field with: 'gk446cj2442'
+    expect(page).to have_selector '.panels li', count: 2, visible: true
 
     save_page
 
-    expect(page).to have_selector '.items-block .box', count: 2
+    expect(page).to have_selector '.items-block .box', count: 2, visible: true
   end
 
-  scenario 'it should allow you to choose from a multi-image solr document (and persist through edits)', js: true do
-    fill_in_typeahead_field with: 'xd327cm9378'
+  scenario 'it should allow you to choose from a multi-image solr document (and persist through edits)', js: true, default_max_wait_time: 30 do
+    fill_in_solr_document_block_typeahead_field with: 'xd327cm9378'
 
     expect(page).to have_css('[data-panel-image-pagination]', text: /Image 1 of 2/, visible: true)
 
     # Select the last image
     click_link('Change')
-    find('.thumbs-list li:last-child').click
+    find('.thumbs-list li[data-index="1"]').click
+    expect(page).to have_css('[data-panel-image-pagination]', text: /Image 2 of 2/, visible: true)
 
     save_page
 
@@ -81,13 +83,13 @@ feature 'Solr Document Block', feature: true, versioning: true do
   end
 
   scenario 'it should allow you toggle visibility of solr documents', js: true do
-    fill_in_typeahead_field with: 'dq287tq6352'
+    fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
 
     within(:css, '.panel') do
       uncheck 'Display?'
     end
 
-    fill_in_typeahead_field with: 'gk446cj2442'
+    fill_in_solr_document_block_typeahead_field with: 'gk446cj2442'
 
     # display the title as the primary caption
     within('.primary-caption') do
@@ -97,13 +99,13 @@ feature 'Solr Document Block', feature: true, versioning: true do
 
     save_page
 
-    expect(page).to have_selector '.items-block .box', count: 1
+    expect(page).to have_selector '.items-block .box', count: 1, visible: true
     expect(page).to have_content '[World map]'
     expect(page).not_to have_content "L'AMERIQUE"
   end
 
   scenario 'should allow you to optionally display captions with the image', js: true do
-    fill_in_typeahead_field with: 'gk446cj2442'
+    fill_in_solr_document_block_typeahead_field with: 'gk446cj2442'
 
     # display the title as the primary caption
     within('.primary-caption') do
@@ -119,7 +121,7 @@ feature 'Solr Document Block', feature: true, versioning: true do
     save_page
 
     # verify that the item + image widget is displaying image and title from the requested document.
-    within(:css, '.items-block') do
+    within(:css, '.items-block', visible: true) do
       expect(page).to have_css('.thumbnail')
       expect(page).to have_css('.thumbnail a img')
       expect(page).to have_css('.primary-caption', text: '[World map]')
@@ -128,15 +130,21 @@ feature 'Solr Document Block', feature: true, versioning: true do
   end
 
   scenario 'should allow you to optionally display a ZPR link with the image', js: true do
-    fill_in_typeahead_field with: 'gk446cj2442'
+    fill_in_solr_document_block_typeahead_field with: 'gk446cj2442'
 
-    check 'zpr_link'
+    check 'Display ZPR link'
+    # 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
 
     save_page
 
-    expect(page).to have_selector('.zpr-link[data-iiif-tilesource]')
-    click_on 'Show in ZPR viewer'
-    expect(page).to have_css('#osd-modal-container')
+    within '.contents' do
+      click_button 'Show in ZPR viewer'
+    end
+
+    within '.modal-content' do
+      expect(page).to have_css('#osd-modal-container')
+    end
   end
 
   scenario 'should allow you to add text to the image', js: true do
@@ -148,38 +156,43 @@ feature 'Solr Document Block', feature: true, versioning: true do
 
     # visit the show page for the document we just saved
     # verify that the item + image widget is displaying image and title from the requested document.
-    within(:css, '.items-block') do
+    within(:css, '.items-block', visible: true) do
       expect(page).to have_content 'zzz'
     end
   end
 
   scenario 'should allow you to choose which side the text will be on', js: true do
-    fill_in_typeahead_field with: 'dq287tq6352'
+    fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
+
+    # Select to align the text right
+    choose 'Right'
+    # this seems silly, but also seems to help with the flappy-ness of this spec
+    expect(find_field('Right', checked: true)).to be_checked
 
     # fill in the content editable div
     content_editable = find('.st-text-block')
     content_editable.set('zzz')
-    # Select to align the text right
-    choose 'Right'
+
     # create the page
     save_page
 
     # verify that the item + image widget is displaying image and title from the requested document.
     within(:css, '.items-block') do
-      expect(page).to have_content 'zzz'
+      within('.text-col') do
+        expect(page).to have_content 'zzz'
+      end
       expect(page).to have_css('.items-col.pull-left')
-      expect(page).to have_css('.text-col')
     end
   end
 
   scenario 'round-trip data', js: true do
-    fill_in_typeahead_field with: 'dq287tq6352'
+    fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
 
     within(:css, '.panel') do
       uncheck 'Display?'
     end
 
-    fill_in_typeahead_field with: 'gk446cj2442'
+    fill_in_solr_document_block_typeahead_field with: 'gk446cj2442'
 
     # display the title as the primary caption
     within('.primary-caption') do
@@ -197,7 +210,7 @@ feature 'Solr Document Block', feature: true, versioning: true do
 
     click_on 'Edit'
 
-    expect(page).to have_selector '.panel', count: 2
+    expect(page).to have_selector '.panel', count: 2, visible: true
 
     # for some reason, the text area above isn't getting filled in
     # expect(page).to have_selector ".st-text-block", text: "zzz"

data/spec/features/javascript/multi_image_select_spec.rb

@@ -1,4 +1,4 @@
-describe 'Multi image selector', type: :feature, js: true, versioning: true do
+describe 'Multi image selector', type: :feature, js: true, versioning: true, default_max_wait_time: 5 do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
   let(:feature_page) { FactoryBot.create(:feature_page, exhibit: exhibit) }

data/spec/features/javascript/reindex_monitor_spec.rb

@@ -1,4 +1,4 @@
-feature 'Reindex Monitor', js: true do
+feature 'Reindex Monitor', js: true, default_max_wait_time: 10 do
   let(:resources) do
     [FactoryBot.create(:resource)]
   end

data/spec/features/javascript/search_config_admin_spec.rb

@@ -3,31 +3,24 @@ feature 'Search Configuration Administration', js: true do
   let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
   before { login_as user }
 
-  describe 'search fields' do
+  describe 'search fields', default_max_wait_time: 5 do
     it 'allows the curator to disable all search fields' do
       visit spotlight.exhibit_home_page_path(exhibit, exhibit.home_page)
       expect(page).to have_css 'select#search_field'
 
-      click_link user.email
-      within '#user-util-collapse .dropdown' do
-        click_link 'Exhibit dashboard'
-      end
-      click_link 'Search'
-
+      visit spotlight.edit_exhibit_search_configuration_path(exhibit)
       expect(page).to have_css 'input#enable_feature', visible: true
       uncheck 'Display search box'
 
       click_button 'Save changes'
 
-      expect(page).to have_content('The exhibit was successfully updated.')
+      expect(page).to have_css('.alert', text: 'The exhibit was successfully updated.', visible: true)
 
       expect(page).not_to have_css 'select#search_field'
     end
 
     it 'allows the curator to update search field options' do
-      visit spotlight.exhibit_dashboard_path(exhibit)
-
-      click_link 'Search'
+      visit spotlight.edit_exhibit_search_configuration_path(exhibit)
 
       click_link 'Options'
 
@@ -42,7 +35,7 @@ feature 'Search Configuration Administration', js: true do
 
       click_button 'Save changes'
 
-      expect(page).to have_content('The exhibit was successfully updated.')
+      expect(page).to have_css('.alert', text: 'The exhibit was successfully updated.', visible: true)
       expect(page).to have_select 'Search in', with_options: ['My Title Label']
     end
   end
@@ -50,9 +43,7 @@ feature 'Search Configuration Administration', js: true do
   describe 'facets' do
     it 'allows us to update the label with edit-in-place' do
       input_id = 'blacklight_configuration_facet_fields_genre_ssim_label'
-      visit spotlight.exhibit_dashboard_path(exhibit)
-
-      click_link 'Search'
+      visit spotlight.edit_exhibit_search_configuration_path(exhibit)
 
       click_link 'Facets'
 
@@ -69,7 +60,7 @@ feature 'Search Configuration Administration', js: true do
       click_button 'Save changes'
       click_link 'Facets'
 
-      expect(page).to have_content('The exhibit was successfully updated.')
+      expect(page).to have_css('.alert', text: 'The exhibit was successfully updated.', visible: true)
 
       expect(page).not_to have_content('Genre')
       expect(page).to have_content('Topic')
@@ -88,7 +79,7 @@ feature 'Search Configuration Administration', js: true do
 
       click_button 'Save changes'
 
-      expect(page).to have_content('The exhibit was successfully updated.')
+      expect(page).to have_css('.alert', text: 'The exhibit was successfully updated.', visible: true)
 
       exhibit.reload
       expect(exhibit.blacklight_config.facet_fields['genre_ssim'].sort).to eq 'index'
@@ -97,9 +88,7 @@ feature 'Search Configuration Administration', js: true do
 
   describe 'results' do
     it 'updates search result options' do
-      visit spotlight.exhibit_dashboard_path(exhibit)
-
-      click_link 'Search'
+      visit spotlight.edit_exhibit_search_configuration_path(exhibit)
 
       click_link 'Results'
 
@@ -109,20 +98,18 @@ feature 'Search Configuration Administration', js: true do
 
       click_button 'Save changes'
 
-      expect(page).to have_content('The exhibit was successfully updated.')
+      expect(page).to have_css('.alert', text: 'The exhibit was successfully updated.', visible: true)
 
       click_link 'Results'
 
-      expect(field_labeled('List')).to_not be_checked
-      expect(field_labeled('Gallery')).to be_checked
+      expect(page).to have_unchecked_field 'List'
+      expect(page).to have_checked_field 'Gallery'
 
-      expect(field_labeled('20')).to be_checked
-      expect(field_labeled('10')).to_not be_checked
+      expect(page).to have_checked_field '20'
+      expect(page).to have_unchecked_field '10'
     end
     it 'updates Sort field result options' do
-      visit spotlight.exhibit_dashboard_path(exhibit)
-
-      click_link 'Search'
+      visit spotlight.edit_exhibit_search_configuration_path(exhibit)
 
       click_link 'Results'
 
@@ -137,7 +124,7 @@ feature 'Search Configuration Administration', js: true do
 
       click_button 'Save changes'
 
-      expect(page).to have_content('The exhibit was successfully updated.')
+      expect(page).to have_css('.alert', text: 'The exhibit was successfully updated.', visible: true)
 
       click_link 'Results'
 

data/spec/features/site_masthead_spec.rb

@@ -24,7 +24,7 @@ describe 'Add and update the site masthead', type: :feature do
     click_link 'Site masthead'
 
     within '#site-masthead' do
-      expect(field_labeled('Show background image in masthead')).to be_checked
+      expect(page).to have_checked_field 'Show background image in masthead'
     end
   end
 

data/spec/features/slideshow_spec.rb

@@ -7,13 +7,12 @@ describe 'Slideshow', type: :feature, js: true do
     exhibit.blacklight_configuration.update(document_index_view_types: %w(list gallery slideshow))
   end
   it 'has slideshow' do
-    pending('does not work with chrome headless')
     visit spotlight.search_exhibit_catalog_path(exhibit, f: { genre_ssim: ['map'] })
     expect(page).to have_content 'You searched for:'
     within '.view-type' do
       click_link 'Slideshow'
     end
-    find('.grid [data-slide-to="1"]').click
+    find('.grid [data-slide-to="1"] img').click
     expect(page).to have_selector '#slideshow', visible: true
   end
 end