blacklight-spotlight 3.0.0.rc1 → 3.0.0.rc6

data/spec/features/exhibits/edit_metadata_fields_spec.rb

@@ -9,7 +9,7 @@ describe 'Editing metadata fields', type: :feature do
   it 'works' do
     visit spotlight.edit_exhibit_metadata_configuration_path exhibit
 
-    expect(page).to have_content 'Display and Order Metadata Fields'
+    expect(page).to have_content 'Display and order metadata fields'
 
     check :blacklight_configuration_index_fields_language_ssm_show
     check :blacklight_configuration_index_fields_abstract_tesim_show

data/spec/features/exhibits/translation_editing_spec.rb

@@ -148,7 +148,7 @@ describe 'Translation editing', type: :feature do
         before do
           within '.translation-edit-form #general' do
             fill_in 'Home', with: 'Maison'
-            fill_in 'Search Results', with: 'Résultats de la recherche'
+            fill_in 'Search results', with: 'Résultats de la recherche'
             click_button 'Save changes'
           end
         end
@@ -310,7 +310,7 @@ describe 'Translation editing', type: :feature do
         click_link 'Search field labels'
 
         within('#search_fields', visible: true) do
-          fill_in 'Relevance', with: 'French Relevance'
+          fill_in 'relevance', with: 'French Relevance'
           click_button 'Save changes'
         end
 
@@ -333,7 +333,7 @@ describe 'Translation editing', type: :feature do
         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'
+        expect(page).to have_field 'All exhibit items'
         expect(page).to have_field 'Browse Category 1'
         expect(page).to have_css('.form-text', text: 'All items in this exhibit.')
       end
@@ -342,7 +342,7 @@ describe 'Translation editing', type: :feature do
     it 'redirects to the same form tab' do
       click_link 'Browse categories'
       within('#browse', visible: true) do
-        fill_in 'All Exhibit Items', with: "Tous les objets d'exposition"
+        fill_in 'All exhibit items', with: "Tous les objets d'exposition"
         click_button 'Save changes'
       end
 
@@ -354,7 +354,7 @@ describe 'Translation editing', type: :feature do
       click_link 'Browse categories'
 
       within('#browse', visible: true) do
-        fill_in 'All Exhibit Items', with: "Tous les objets d'exposition"
+        fill_in 'All exhibit items', with: "Tous les objets d'exposition"
 
         first('.translation-description-toggle').click
 
@@ -366,7 +366,7 @@ describe 'Translation editing', type: :feature do
 
       expect(page).to have_css('.flash_messages', text: 'The exhibit was successfully updated.')
 
-      expect(exhibit.searches.first.title).to eq 'All Exhibit Items'
+      expect(exhibit.searches.first.title).to eq 'All exhibit items'
       expect(exhibit.searches.first.long_description).to eq 'All items in this exhibit.'
 
       I18n.locale = :fr
@@ -378,6 +378,55 @@ describe 'Translation editing', type: :feature do
     end
   end
 
+  describe 'Browse groups' do
+    before do
+      FactoryBot.create(:group, exhibit: exhibit, title: 'Browse Group 1')
+      FactoryBot.create(:group, exhibit: exhibit, title: 'Browse Group 2')
+
+      visit spotlight.edit_exhibit_translations_path(exhibit, language: 'fr')
+    end
+
+    it 'has a title browse group' do
+      within '#groups' do
+        expect(page).to have_css('input[type="text"]', count: 2)
+
+        expect(page).to have_field 'Browse Group 1'
+        expect(page).to have_field 'Browse Group 2'
+      end
+    end
+
+    it 'redirects to the same form tab' do
+      click_link 'Browse categories'
+      within('#groups', visible: true) do
+        fill_in 'Browse Group 1', with: 'parcourir le groupe 1'
+        click_button 'Save changes'
+      end
+
+      expect(page).to have_css '.nav-pills .nav-link.active', text: 'French'
+      expect(page).to have_css '.nav-tabs .nav-link.active', text: 'Browse groups'
+    end
+
+    it 'persists changes', js: true do
+      click_link 'Browse groups'
+
+      within('#groups', visible: true) do
+        fill_in 'Browse Group 1', with: 'parcourir le groupe 1'
+
+        click_button 'Save changes'
+      end
+
+      expect(page).to have_css('.flash_messages', text: 'The exhibit was successfully updated.')
+
+      expect(exhibit.groups.first.title).to eq 'Browse Group 1'
+
+      I18n.locale = :fr
+      Translation.current_exhibit = exhibit
+      expect(exhibit.groups.first.title).to eq 'parcourir le groupe 1'
+      I18n.locale = I18n.default_locale
+      Translation.current_exhibit = nil
+    end
+  end
+
   describe 'home page translation table entry' do
     let(:feature_page) { FactoryBot.create(:feature_page, exhibit: exhibit) }
     let(:about_page) { FactoryBot.create(:about_page, exhibit: exhibit) }

data/spec/features/home_page_spec.rb

@@ -10,7 +10,7 @@ describe 'Home page', type: :feature, versioning: true do
     visit spotlight.exhibit_dashboard_path(exhibit)
     click_link 'Feature pages'
     expect(page).to have_selector 'h2', text: 'Homepage'
-    expect(page).to have_selector 'h3.card-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
@@ -32,7 +32,7 @@ describe 'Home page', type: :feature, versioning: true do
   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)
+    visit spotlight.exhibit_home_page_path(exhibit)
 
     click_link 'Edit'
     click_button 'Save changes'
@@ -41,7 +41,7 @@ describe 'Home page', type: :feature, versioning: true do
   end
 
   it 'has working facet links' do
-    visit spotlight.exhibit_home_page_path(exhibit.home_page)
+    visit spotlight.exhibit_home_page_path(exhibit)
     click_button 'Genre'
     click_link 'map'
     expect(page).to have_content exhibit.title
@@ -49,7 +49,7 @@ describe 'Home page', type: :feature, versioning: true do
   end
 
   it 'has a search box' do
-    visit spotlight.exhibit_home_page_path(exhibit.home_page)
+    visit spotlight.exhibit_home_page_path(exhibit)
     fill_in 'q', with: 'query'
     click_button 'Search'
 
@@ -62,7 +62,7 @@ describe 'Home page', type: :feature, versioning: true do
     TopHat.current['opengraph'] = nil
     Spotlight::Site.instance.update(title: 'some title')
 
-    visit spotlight.exhibit_home_page_path(exhibit.home_page)
+    visit spotlight.exhibit_home_page_path(exhibit)
 
     expect(page).to have_css "meta[name='twitter:card'][value='summary']", visible: false
     expect(page).to have_css "meta[name='twitter:url'][value='#{spotlight.exhibit_root_url(exhibit)}']", visible: false

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/item_admin_spec.rb

@@ -30,12 +30,12 @@ describe 'Item Administration', type: :feature do
     it 'has a public/private toggle' do
       visit spotlight.admin_exhibit_catalog_path(exhibit)
       item = first('tr[itemscope]')
-      expect(item).to have_button 'Make Private'
-      item.click_button 'Make Private'
+      expect(item).to have_button 'Make private'
+      item.click_button 'Make private'
 
       item = first('tr[itemscope]')
-      expect(item).to have_button 'Make Public'
-      item.click_button 'Make Public'
+      expect(item).to have_button 'Make public'
+      item.click_button 'Make public'
     end
 
     it "toggles the 'blacklight-private' label", js: true, default_max_wait_time: 5 do

data/spec/features/javascript/about_page_admin_spec.rb

@@ -12,7 +12,7 @@ describe 'About Pages Adminstration', js: true do
 
     click_link 'About pages'
 
-    add_new_page_via_button('My New Page')
+    add_new_via_button('My New Page')
 
     expect(page).to have_content 'The about page was created.'
     expect(page).to have_css('li.dd-item')

data/spec/features/javascript/block_controls_spec.rb

@@ -12,7 +12,7 @@ describe 'Block controls' do
 
     click_link 'Feature pages'
 
-    add_new_page_via_button('My New Feature Page')
+    add_new_via_button('My New Feature Page')
 
     expect(page).to have_css('h3', text: 'My New Feature Page')
 

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+describe 'Browse Group Categories', 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) }
+  let(:search1) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'All of the good dogs') }
+  let(:search2) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'All of the good cats') }
+  let(:search3) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'All of the good birds') }
+  let(:search4) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'All of the good pigs') }
+  let(:search5) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'All of the good tigers') }
+  let(:search6) { FactoryBot.create(:published_search, exhibit: exhibit, title: 'All of the good ferrets') }
+  let(:search7) { FactoryBot.create(:search, exhibit: exhibit, title: 'All of the good turtles') }
+  let!(:group) { FactoryBot.create(:group, exhibit: exhibit, searches: [search1, search2, search3, search4, search5, search6], title: 'Pets', published: true) }
+  let!(:group2) { FactoryBot.create(:group, exhibit: exhibit, searches: [search1, search2], title: 'Good animals', published: true) }
+
+  before do
+    login_as exhibit_curator
+
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+    add_widget 'browse_group_categories'
+  end
+
+  it 'allows a curator to select a caption to display' do
+    fill_in_prefetched_typeahead_field with: 'Pets', wait_for: '[data-type="browse_group_categories"] [data-browse-groups-fetched]'
+    within '.dd-list' do
+      expect(page).to have_css '.title', text: 'Pets'
+    end
+
+    save_page
+
+    expect(page).to have_css 'h2', text: 'Pets'
+  end
+
+  it 'can navigate using arrows' do
+    fill_in_prefetched_typeahead_field with: 'Pets', wait_for: '[data-type="browse_group_categories"] [data-browse-groups-fetched]'
+    within '.dd-list' do
+      expect(page).to have_css '.title', text: 'Pets'
+    end
+
+    save_page
+
+    expect(page).to have_css 'h2', text: 'Pets'
+
+    expect(page).to have_css '.category-title', text: 'All of the good dogs'
+    expect(page).not_to have_css '.category-title', text: 'All of the good tigers'
+    find('[data-controls="next"]').click
+    expect(page).not_to have_css '.category-title', text: 'All of the good dogs'
+    expect(page).to have_css '.category-title', text: 'All of the good tigers'
+  end
+
+  it 'only published searches are displayed' do
+    fill_in_prefetched_typeahead_field with: 'Pets', wait_for: '[data-type="browse_group_categories"] [data-browse-groups-fetched]'
+    within '.dd-list' do
+      expect(page).to have_css '.title', text: 'Pets'
+    end
+
+    save_page
+
+    expect(page).to have_css 'h2', text: 'Pets'
+    expect(page).to have_css '.box.category-1', count: 6, visible: false
+  end
+end

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/browse_group_admin_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+describe 'Browse Group Adminstration', js: true do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:exhibit_curator) { FactoryBot.create(:exhibit_curator, exhibit: exhibit) }
+  let!(:group1) do
+    FactoryBot.create(
+      :group,
+      title: 'Good group 1',
+      exhibit: exhibit
+    )
+  end
+
+  before { login_as exhibit_curator }
+
+  it 'is able to create new groups' do
+    visit spotlight.exhibit_searches_path(exhibit, anchor: 'browse-groups')
+
+    add_new_via_button('My New Group')
+
+    expect(page).to have_content 'The browse group was created.'
+    expect(page).to have_css('li.dd-item')
+    expect(page).to have_css('h4', text: 'My New Group')
+  end
+
+  it 'updates the page titles' do
+    visit spotlight.exhibit_searches_path(exhibit, anchor: 'browse-groups')
+
+    within("[data-id='#{group1.id}']") do
+      within('h4') do
+        expect(page).to have_content('Good group 1')
+        expect(page).to have_css('.title-field', visible: false)
+        click_link('Good group 1')
+        expect(page).to have_css('.title-field', visible: true)
+        find('.title-field').set('New good group 1')
+      end
+    end
+    click_button('Save changes')
+    within("[data-id='#{group1.id}']") do
+      within('h4') do
+        expect(page).to have_content('New good group 1')
+      end
+    end
+  end
+end

data/spec/features/javascript/edit_in_place_spec.rb

@@ -12,7 +12,7 @@ describe 'Edit in place', type: :feature, js: true do
 
       click_link 'Feature pages'
 
-      add_new_page_via_button('My New Feature Page')
+      add_new_via_button('My New Feature Page')
 
       expect(page).to have_css('h3', text: 'My New Feature Page')
 
@@ -38,7 +38,7 @@ describe 'Edit in place', type: :feature, js: true do
 
       click_link 'Feature pages'
 
-      add_new_page_via_button('My New Feature Page')
+      add_new_via_button('My New Feature Page')
 
       expect(page).to have_css('h3', text: 'My New Feature Page')
 
@@ -73,7 +73,7 @@ describe 'Edit in place', type: :feature, js: true do
       within('#nested-navigation') do
         expect(page).to have_css("#exhibit_main_navigations_attributes_0_label[type='hidden']", visible: false)
         expect(page).not_to have_css("#exhibit_main_navigations_attributes_0_label[type='text']")
-        click_link('Curated Features')
+        click_link('Curated features')
         expect(page).not_to have_css("#exhibit_main_navigations_attributes_0_label[type='hidden']")
         expect(page).to have_css("#exhibit_main_navigations_attributes_0_label[type='text']")
         fill_in 'exhibit_main_navigations_attributes_0_label', with: 'My Page Label'

data/spec/features/javascript/feature_page_admin_spec.rb

@@ -26,7 +26,7 @@ describe 'Feature Pages Adminstration', js: true do
 
     click_link 'Feature pages'
 
-    add_new_page_via_button('My New Page')
+    add_new_via_button('My New Page')
 
     expect(page).to have_content 'The feature page was created.'
     expect(page).to have_css('li.dd-item')

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/javascript/search_config_admin_spec.rb

@@ -120,7 +120,7 @@ describe 'Search Configuration Administration', js: true do
       within('#nested-sort-fields') do
         expect(page).to have_css("#blacklight_configuration_sort_fields_title_label[type='hidden']", visible: false)
         expect(page).not_to have_css("#blacklight_configuration_sort_fields_title_label[type='text']")
-        click_link('Title')
+        click_link('title')
         expect(page).not_to have_css("#blacklight_configuration_sort_fields_title_label[type='hidden']")
         expect(page).to have_css("#blacklight_configuration_sort_fields_title_label[type='text']")
         fill_in 'blacklight_configuration_sort_fields_title_label', with: 'My Title Label'