blacklight-spotlight 2.13.0 → 3.0.0.alpha.1

data/spec/features/add_items_spec.rb

@@ -19,7 +19,7 @@ describe 'Uploading a non-repository item', type: :feature do
 
       within('form#new_resources_upload') do
         expect(page).to have_css('#resources_upload_url[type="file"]')
-        expect(page).to have_css('.help-block', text: 'Valid file types: jpg jpeg png')
+        expect(page).to have_css('.form-text', text: 'Valid file types: jpg jpeg png')
         expect(page).to have_css('#resources_upload_data_full_title_tesim[type="text"]')
         expect(page).to have_css('textarea#resources_upload_data_spotlight_upload_description_tesim')
         expect(page).to have_css('#resources_upload_data_spotlight_upload_attribution_tesim[type="text"]')
@@ -72,7 +72,7 @@ describe 'Uploading a non-repository item', type: :feature do
 
       within('form#new_resources_csv_upload') do
         expect(page).to have_css('#resources_csv_upload_url[type="file"]')
-        expect(page).to have_css('.help-block a', text: 'Download template')
+        expect(page).to have_css('.form-text a', text: 'Download template')
       end
     end
 

data/spec/features/browse_category_admin_spec.rb

@@ -9,7 +9,7 @@ describe 'Browse Category Administration', type: :feature do
   describe 'index' do
     it 'has searches' do
       visit spotlight.exhibit_searches_path(exhibit)
-      expect(page).to have_css('.panel .search .title', text: search.title)
+      expect(page).to have_css('.card-title', text: search.title)
     end
   end
 
@@ -40,7 +40,7 @@ describe 'Browse Category Administration', type: :feature do
       visit spotlight.edit_exhibit_search_path(exhibit, search)
       expect(page).to have_css('h1 small', text: 'Edit Browse Category')
       expect(find_field('search_title').value).to eq search.title
-      within '.appliedFilter' do
+      within '.appliedParams' do
         expect(page).to have_content 'Genre'
         expect(page).to have_content 'Value'
       end
@@ -119,7 +119,7 @@ describe 'Browse Category Administration', type: :feature do
     it 'destroys a tag' do
       skip('TODO: Allow searches to be destroyed without javascript')
       visit spotlight.exhibit_searches_path(exhibit)
-      within('.panel .search') do
+      within('.card .search') do
         click_link('Delete')
       end
       expect(page).to have_content('Search was deleted')

data/spec/features/browse_category_spec.rb

@@ -9,7 +9,7 @@ feature 'Browse pages' do
     let(:mock_response) { Blacklight::Solr::Response.new({ response: { numFound: 10, docs: mock_documents } }, {}) }
     let(:mock_documents) { [] }
     before do
-      allow_any_instance_of(Spotlight::BrowseController).to receive(:search_results).and_return([mock_response, mock_documents])
+      allow_any_instance_of(Blacklight::SearchService).to receive(:search_results).and_return([mock_response, mock_documents])
     end
 
     context 'with the standard exhibit masthead' do
@@ -20,7 +20,7 @@ feature 'Browse pages' do
           expect(page).to have_selector 'h1', text: 'Some Saved Search'
         end
 
-        expect(page).not_to have_selector '.masthead .h1', text: 'Some Saved Search'
+        expect(page).not_to have_selector '.masthead .h2', text: 'Some Saved Search'
       end
 
       it 'shows the search bar' do
@@ -57,7 +57,7 @@ feature 'Browse pages' do
       it 'has a contextual masthead with the title and resource count' do
         visit spotlight.exhibit_browse_path(exhibit, search)
 
-        expect(page).to have_selector '.masthead .h1', text: 'Some Saved Search'
+        expect(page).to have_selector '.masthead .h2', text: 'Some Saved Search'
 
         within '#main-container' do
           expect(page).not_to have_selector 'h1', text: 'Some Saved Search'

data/spec/features/catalog_spec.rb

@@ -23,7 +23,7 @@ describe 'Catalog', type: :feature do
 
     it "has a 'Item Visiblity' facet" do
       visit spotlight.search_exhibit_catalog_path(exhibit)
-      expect(page).to have_selector '.panel-title', text: 'Item Visibility'
+      expect(page).to have_selector '.card-header', text: 'Item Visibility'
     end
   end
 

data/spec/features/exhibits/translation_editing_spec.rb

@@ -21,13 +21,13 @@ describe 'Translation editing', type: :feature do
     end
 
     it 'selects the correct language' do
-      expect(page).to have_css '.nav-pills li.active', text: 'French'
+      expect(page).to have_css '.nav-pills .nav-link.active', text: 'French'
     end
     describe 'basic settings' do
       it 'successfully adds translations' do
         within '.translation-edit-form #general' do
-          expect(page).to have_css '.help-block', text: 'Sample'
-          expect(page).to have_css '.help-block', text: 'SubSample'
+          expect(page).to have_css '.form-text', text: 'Sample'
+          expect(page).to have_css '.form-text', text: 'SubSample'
           fill_in 'Title', id: 'exhibit_translations_attributes_0_value', with: 'Titre français'
           fill_in 'Subtitle', with: 'Sous-titre français'
           click_button 'Save changes'
@@ -35,14 +35,14 @@ describe 'Translation editing', type: :feature do
         expect(page).to have_css '.flash_messages', text: 'The exhibit was successfully updated.'
         within '.translation-basic-settings-title' do
           expect(page).to have_css 'input[value="Titre français"]'
-          expect(page).to have_css 'span.glyphicon.glyphicon-ok'
+          expect(page).to have_css '.translation-complete'
         end
         within '.translation-basic-settings-subtitle' do
           expect(page).to have_css 'input[value="Sous-titre français"]'
-          expect(page).to have_css 'span.glyphicon.glyphicon-ok'
+          expect(page).to have_css '.translation-complete'
         end
         within '.translation-basic-settings-description' do
-          expect(page).to_not have_css 'span.glyphicon.glyphicon-ok'
+          expect(page).to_not have_css '.translation-complete'
         end
       end
     end
@@ -59,7 +59,7 @@ describe 'Translation editing', type: :feature do
 
       it 'adds translations to exhibit navbar' do
         within '.translation-edit-form #general' do
-          expect(page).to have_css '.help-block', text: 'Home'
+          expect(page).to have_css '.form-text', text: 'Home'
           fill_in 'Home', with: 'Maison'
           fill_in 'Browse', with: 'parcourir ceci!'
           click_button 'Save changes'
@@ -67,17 +67,17 @@ describe 'Translation editing', type: :feature do
         expect(page).to have_css '.flash_messages', text: 'The exhibit was successfully updated.'
         within '.translation-main-menu-home' do
           expect(page).to have_css 'input[value="Maison"]'
-          expect(page).to have_css 'span.glyphicon.glyphicon-ok'
+          expect(page).to have_css '.translation-complete'
         end
         within '.translation-main-menu-browse' do
           expect(page).to have_css 'input[value="parcourir ceci!"]'
-          expect(page).to have_css 'span.glyphicon.glyphicon-ok'
+          expect(page).to have_css '.translation-complete'
         end
-        within '.translation-main-menu-curated-features' do
-          expect(page).to_not have_css 'span.glyphicon.glyphicon-ok'
+        within '.translation-main-menu-curated_features' do
+          expect(page).to_not have_css '.translation-complete'
         end
         within '.translation-main-menu-about' do
-          expect(page).to_not have_css 'span.glyphicon.glyphicon-ok'
+          expect(page).to_not have_css '.translation-complete'
         end
         I18n.locale = :fr
         expect(exhibit.main_navigations.browse.label).to eq 'parcourir ceci!'
@@ -175,8 +175,8 @@ describe 'Translation editing', type: :feature do
         click_button 'Save changes'
       end
 
-      expect(page).to have_css '.nav-pills li.active', text: 'French'
-      expect(page).to have_css '.nav-tabs li.active', text: 'Metadata field labels'
+      expect(page).to have_css '.nav-pills .nav-link.active', text: 'French'
+      expect(page).to have_css '.nav-tabs .nav-link.active', text: 'Metadata field labels'
     end
 
     describe 'configured fields' do
@@ -252,8 +252,8 @@ describe 'Translation editing', type: :feature do
         click_button 'Save changes'
       end
 
-      expect(page).to have_css '.nav-pills li.active', text: 'French'
-      expect(page).to have_css '.nav-tabs li.active', text: 'Search field labels'
+      expect(page).to have_css '.nav-pills .nav-link.active', text: 'French'
+      expect(page).to have_css '.nav-tabs .nav-link.active', text: 'Search field labels'
     end
 
     describe 'field-based search fields' do
@@ -315,7 +315,7 @@ describe 'Translation editing', type: :feature do
 
         visit spotlight.search_exhibit_catalog_path(exhibit, q: '*', locale: 'fr')
 
-        expect(page).to have_css('.dropdown-toggle', text: 'Trier par French Relevance', visible: true)
+        expect(page).to have_css('#sort-dropdown', text: 'Trier par French Relevance', visible: true)
       end
     end
   end
@@ -334,7 +334,7 @@ describe 'Translation editing', type: :feature do
 
         expect(page).to have_field 'All Exhibit Items'
         expect(page).to have_field 'Browse Category 1'
-        expect(page).to have_css('.help-block', text: 'All items in this exhibit.')
+        expect(page).to have_css('.form-text', text: 'All items in this exhibit.')
       end
     end
 
@@ -345,8 +345,8 @@ describe 'Translation editing', type: :feature do
         click_button 'Save changes'
       end
 
-      expect(page).to have_css '.nav-pills li.active', text: 'French'
-      expect(page).to have_css '.nav-tabs li.active', text: 'Browse categories'
+      expect(page).to have_css '.nav-pills .nav-link.active', text: 'French'
+      expect(page).to have_css '.nav-tabs .nav-link.active', text: 'Browse categories'
     end
 
     it 'persists changes', js: true do
@@ -355,7 +355,7 @@ describe 'Translation editing', type: :feature do
       within('#browse', visible: true) do
         fill_in 'All Exhibit Items', with: "Tous les objets d'exposition"
 
-        first('.tanslation-description-toggle').click
+        first('.translation-description-toggle').click
 
         textarea = page.find('textarea')
         textarea.set('Tous les articles de cette exposition.')

data/spec/features/feature_page_spec.rb

@@ -42,7 +42,7 @@ describe 'Feature page', type: :feature, versioning: true do
         # the sidebar should display
         within('#sidebar') do
           # the current page should be the sidebar header
-          expect(page).to have_css('h4', text: parent_feature_page.title)
+          expect(page).to have_css('li', text: parent_feature_page.title)
           # within the sidebar navigation
           within('ol.sidenav') do
             # there should be a link to the child page

data/spec/features/home_page_spec.rb

@@ -9,7 +9,7 @@ describe 'Home page', type: :feature, versioning: true do
     visit spotlight.exhibit_dashboard_path(exhibit)
     click_link 'Feature pages'
     expect(page).to have_selector 'h3', text: 'Homepage'
-    expect(page).to have_selector 'h3.panel-title', text: 'Exhibit Home'
+    expect(page).to have_selector 'h3.card-title', text: 'Exhibit Home'
   end
 
   it 'allows users to edit the home page title' do
@@ -27,12 +27,12 @@ describe 'Home page', type: :feature, versioning: true do
     end
     click_link 'Feature pages'
     expect(page).to have_content 'New Home Page Title'
-    expect(page).to have_selector '.panel-title a', text: 'New Home Page Title'
+    expect(page).to have_selector '.card-title a', text: 'New Home Page Title'
   end
 
   it 'has working facet links' do
     visit spotlight.exhibit_home_page_path(exhibit.home_page)
-    click_link 'Genre'
+    click_button 'Genre'
     click_link 'map'
     expect(page).to have_content exhibit.title
     expect(page).to have_content 'You searched for: Genre map'

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

@@ -21,7 +21,7 @@ describe 'Featured Browse Category Block', type: :feature, js: true do
 
     fill_in_typeahead_field with: 'Title1'
 
-    within(:css, '.panel') do
+    within(:css, '.card') do
       uncheck 'Display?'
     end
 

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

@@ -21,7 +21,7 @@ describe 'Link to Search Block', type: :feature, js: true do
 
     fill_in_typeahead_field with: 'Title1'
 
-    within(:css, '.panel') do
+    within(:css, '.card') do
       uncheck 'Display?'
     end
 

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

@@ -11,14 +11,19 @@ describe 'Search Result Block', type: :feature, js: true do
     login_as exhibit_curator
 
     exhibit.searches.each { |x| x.update published: true }
-
     visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
     add_widget 'search_results'
   end
 
-  pending 'allows a curator to select from existing browse categories' do
-    pending('Prefetched autocomplete does not work the same way as solr-backed autocompletes')
-    fill_in_typeahead_field with: 'All Exhibit Items'
+  it 'allows a curator to select from existing browse categories' do
+    # Manually inject the inputs to the widget that the autocomplete would.
+    # fill_in_typeahead_field does not work here for us for some reason.
+    page.execute_script <<-JS
+      $("[data-twitter-typeahead]:visible").after(
+        "<input type='hidden' name='item[item_0][id]' value='all-exhibit-items' />" +
+        "<input type='hidden' name='item[item_0][display]' value='true' />"
+      );
+    JS
 
     check 'Gallery'
     check 'Slideshow'

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

@@ -29,7 +29,7 @@ feature 'Solr Document Block', feature: true, versioning: true, default_max_wait
 
   scenario 'it should allow you to add a solr document to the widget', js: true do
     fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
-    within(:css, '.panel') do
+    within(:css, '.card') do
       expect(page).to have_content "L'AMERIQUE"
     end
 
@@ -37,8 +37,7 @@ feature 'Solr Document Block', feature: true, versioning: true, default_max_wait
 
     # verify that the item + image widget is displaying an image from the document.
     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('.img-thumbnail')
       expect(page).not_to have_css('.title')
     end
   end
@@ -66,7 +65,7 @@ feature 'Solr Document Block', feature: true, versioning: true, default_max_wait
     save_page
 
     # The thumbnail on the rendered block should be correct
-    thumb = find('.thumbnail img')
+    thumb = find('.img-thumbnail')
     expect(thumb['src']).to match(%r{xd327cm9378_05_0002/full})
 
     # revisit the edit page
@@ -74,20 +73,20 @@ feature 'Solr Document Block', feature: true, versioning: true, default_max_wait
 
     # Expect the image on the rendered edit screen to be correct
     expect(page).to have_css('[data-panel-image-pagination]', text: /Image 2 of 2/, visible: true)
-    thumb = find('.pic.thumbnail img')
+    thumb = find('.pic .img-thumbnail')
     expect(thumb['src']).to match(%r{xd327cm9378_05_0002/full})
 
     save_page
 
     # Expect that the original image selection was retained
-    thumb = find('.thumbnail img')
+    thumb = find('.img-thumbnail')
     expect(thumb['src']).to match(%r{xd327cm9378_05_0002/full})
   end
 
   scenario 'it should allow you toggle visibility of solr documents', js: true do
     fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
 
-    within(:css, '.panel') do
+    within(:css, '.card') do
       uncheck 'Display?'
     end
 
@@ -104,6 +103,16 @@ feature 'Solr Document Block', feature: true, versioning: true, default_max_wait
     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"
+
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+    # display the title as the primary caption
+    within('.primary-caption') do
+      uncheck('Primary caption')
+    end
+
+    save_page
+    expect(page).to have_selector '.items-block .box', count: 1, visible: true
+    expect(page).not_to have_content '[World map]'
   end
 
   scenario 'should allow you to optionally display captions with the image', js: true do
@@ -124,8 +133,7 @@ feature 'Solr Document Block', feature: true, versioning: true, default_max_wait
 
     # verify that the item + image widget is displaying image and title from the requested document.
     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('.img-thumbnail')
       expect(page).to have_css('.primary-caption', text: '[World map]')
       expect(page).to have_css('.secondary-caption', text: 'Latin')
     end
@@ -168,9 +176,9 @@ feature 'Solr Document Block', feature: true, versioning: true, default_max_wait
     fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
 
     # Select to align the text right
-    choose 'Right'
+    choose 'Left'
     # this seems silly, but also seems to help with the flappy-ness of this spec
-    expect(find_field('Right', checked: true)).to be_checked
+    expect(find_field('Left', checked: true)).to be_checked
 
     # fill in the content editable div
     content_editable = find('.st-text-block')
@@ -180,18 +188,18 @@ feature 'Solr Document Block', feature: true, versioning: true, default_max_wait
     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.flex-row-reverse') do
       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('.items-col')
     end
   end
 
   scenario 'round-trip data', js: true do
     fill_in_solr_document_block_typeahead_field with: 'dq287tq6352'
 
-    within(:css, '.panel') do
+    within(:css, '.card') do
       uncheck 'Display?'
     end
 
@@ -213,7 +221,7 @@ feature 'Solr Document Block', feature: true, versioning: true, default_max_wait
 
     click_on 'Edit'
 
-    expect(page).to have_selector '.panel', count: 2, visible: true
+    expect(page).to have_selector '.card', 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/blocks/solr_documents_carousel_block_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+describe 'Solr Documents Carousel Block', type: :feature, js: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+
+  let!(:feature_page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
+
+  before do
+    login_as exhibit_curator
+
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+    add_widget 'solr_documents_carousel'
+  end
+
+  it 'allows a curator to select a caption to display' do
+    fill_in_typeahead_field with: 'dq287tq6352'
+
+    check 'Primary caption'
+    select 'Title', from: 'primary-caption-field'
+
+    save_page
+
+    within '.carousel-block' do
+      expect(page).to have_css('.carousel-item', count: 1)
+      expect(page).to have_css('.carousel-caption .primary', text: "L'AMERIQUE")
+    end
+  end
+end

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

@@ -24,7 +24,7 @@ feature 'Uploaded Items Block', feature: true, js: true, versioning: true do
 
     expect(page).to have_css('.dd-list li', count: 1)
     within('.dd-list') do
-      expect(page).to have_css('.panel-title', text: '800x600.png')
+      expect(page).to have_css('.card-title', text: '800x600.png')
       fill_in 'Caption', with: 'Some caption text'
     end
 
@@ -32,7 +32,7 @@ feature 'Uploaded Items Block', feature: true, js: true, versioning: true do
 
     expect(page).to have_css('.dd-list li', count: 2)
     within('.dd-list') do
-      expect(page).to have_css('.panel-title', text: 'avatar.png')
+      expect(page).to have_css('.card-title', text: 'avatar.png')
     end
 
     save_page