blacklight-spotlight 3.0.0.alpha.9 → 3.0.0.rc4

data/spec/factories/featured_images.rb

@@ -6,6 +6,10 @@ FactoryBot.define do
     iiif_tilesource { 'https://exhibits-stage.stanford.edu/images/78' }
   end
 
+  factory :temporary_image, class: 'Spotlight::TemporaryImage' do
+    image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
+  end
+
   factory :masthead, class: 'Spotlight::Masthead' do
     image { Rack::Test::UploadedFile.new(File.expand_path(File.join('..', 'fixtures', 'avatar.png'), __dir__)) }
   end

data/spec/factories/group.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :group, class: 'Spotlight::Group' do
+    exhibit
+
+    factory :group_with_searches do
+      transient do
+        searches_count { 5 }
+      end
+    end
+
+    after(:create) do |group, evaluator|
+      create_list(:search, evaluator.searches_count, groups: [group]) if evaluator.respond_to?(:searches_count)
+    end
+  end
+end

data/spec/factories/job_trackers.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :job_tracker, class: 'Spotlight::JobTracker' do
+    user
+    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/searches.rb

@@ -7,6 +7,16 @@ FactoryBot.define do
     sequence(:slug) { |n| "Search#{n}" }
 
     after(:build) { |search| search.thumbnail = FactoryBot.create(:featured_image) }
+
+    factory :search_with_groups do
+      transient do
+        groups_count { 2 }
+      end
+    end
+
+    after(:create) do |search, evaluator|
+      create_list(:group, evaluator.groups_count, searches: [search]) if evaluator.respond_to?(:groups_count)
+    end
   end
 
   factory :published_search, parent: :search do
@@ -15,7 +25,7 @@ FactoryBot.define do
 
   factory :default_search, class: 'Spotlight::Search' do
     exhibit
-    title { 'All Exhibit Items' }
+    title { 'All exhibit items' }
     long_description { 'All items in this exhibit.' }
 
     after(:build) { |search| search.thumbnail = FactoryBot.create(:featured_image) }

data/spec/features/add_contacts_spec.rb

@@ -17,7 +17,7 @@ describe 'Add a contact to an exhibit', type: :feature do
       fill_in 'Location', with: 'Rome'
       fill_in 'Telephone', with: '(555) 555-5555 ext. 12345 (mobile)'
 
-      click_button 'Save'
+      find('input[name="commit"]').click
     end
     expect(page).to have_content 'The contact was created.'
 

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
 
@@ -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/browse_category_admin_spec.rb

@@ -21,7 +21,7 @@ describe 'Browse Category Administration', type: :feature do
       expect(page).to have_css('#save-modal')
       fill_in 'search_title', with: 'Some search'
       expect do
-        click_button 'Save'
+        find('input[name="commit"]').click
         exhibit.searches.reload
       end.to change { exhibit.searches.count }.by 1
       expect(exhibit.searches.last.query_params).to eq 'q' => 'xyz'
@@ -32,7 +32,7 @@ describe 'Browse Category Administration', type: :feature do
       click_button 'Save this search'
       expect(page).to have_css('#save-modal')
       select search.title, from: 'id'
-      click_button 'Save'
+      find('input[name="commit"]').click
       expect(search.reload.query_params).to eq 'q' => 'xyz'
     end
   end
@@ -40,7 +40,7 @@ describe 'Browse Category Administration', type: :feature do
   describe 'edit' do
     it 'displays an edit form' do
       visit spotlight.edit_exhibit_search_path(exhibit, search)
-      expect(page).to have_css('h1 small', text: 'Edit Browse Category')
+      expect(page).to have_css('h1 small', text: 'Edit browse category')
       expect(find_field('search_title').value).to eq search.title
       within '.appliedParams' do
         expect(page).to have_content 'Genre'
@@ -48,6 +48,38 @@ describe 'Browse Category Administration', type: :feature do
       end
     end
 
+    describe 'with a group present' do
+      let!(:group) { FactoryBot.create(:group, exhibit: exhibit, title: 'Good group') }
+
+      it 'enables group selection' do
+        visit spotlight.edit_exhibit_search_path(exhibit, search)
+        click_link 'Group'
+        expect(page).to have_content 'You can add this browse category'
+
+        within '#search-group' do
+          expect(find('input[type="checkbox"]')).not_to be_checked
+          check 'Good group'
+        end
+
+        click_button 'Save changes'
+        expect(page).to have_content('The browse category was successfully updated.')
+        visit spotlight.edit_exhibit_search_path(exhibit, search)
+        click_link 'Group'
+
+        within '#search-group' do
+          expect(find('input[type="checkbox"]')).to be_checked
+        end
+      end
+    end
+
+    describe 'without a group present' do
+      it 'displays no group help text' do
+        visit spotlight.edit_exhibit_search_path(exhibit, search)
+        click_link 'Group'
+        expect(page).to have_content 'You cannot add this browse category'
+      end
+    end
+
     it 'attaches a masthead image' do
       visit spotlight.edit_exhibit_search_path exhibit, search
 
@@ -63,7 +95,7 @@ describe 'Browse Category Administration', type: :feature do
 
       click_button 'Save changes'
 
-      expect(page).to have_content('The search was successfully updated.')
+      expect(page).to have_content('The browse category was successfully updated.')
 
       search.reload
 
@@ -83,7 +115,7 @@ describe 'Browse Category Administration', type: :feature do
 
       click_button 'Save changes'
 
-      expect(page).to have_content('The search was successfully updated.')
+      expect(page).to have_content('The browse category was successfully updated.')
 
       search.reload
 
@@ -97,7 +129,7 @@ describe 'Browse Category Administration', type: :feature do
       check 'Search box'
 
       click_button 'Save changes'
-      expect(page).to have_content('The search was successfully updated.')
+      expect(page).to have_content('The browse category was successfully updated.')
       search.reload
 
       expect(search.search_box).to eq true
@@ -109,7 +141,7 @@ describe 'Browse Category Administration', type: :feature do
 
       click_button 'Save changes'
 
-      expect(page).to have_content('The search was successfully updated.')
+      expect(page).to have_content('The browse category was successfully updated.')
 
       search.reload
 

data/spec/features/browse_category_navigation_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+describe 'Browse pages' do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let!(:search) { FactoryBot.create(:search, title: 'Some Saved Search', exhibit: exhibit, published: true) }
+  let!(:search_2) { FactoryBot.create(:search, title: 'Some Other Saved Search', exhibit: exhibit, published: true) }
+  let!(:group) { FactoryBot.create(:group, title: 'Awesome group', exhibit: exhibit, published: true, searches: [search]) }
+
+  describe 'landing page' do
+    before do
+      visit spotlight.exhibit_browse_index_path(exhibit)
+    end
+
+    it 'displays all categories and tabs for each group' do
+      within '.browse-group-navigation' do
+        expect(page).to have_css 'li.nav-item a.nav-link.active', text: 'All'
+        expect(page).to have_css 'li.nav-item a.nav-link', count: exhibit.groups.count + 1
+      end
+      within '.browse-landing' do
+        expect(page).to have_css '.category', count: 2
+      end
+    end
+
+    it 'filters browse categories when navigated' do
+      within '.browse-group-navigation' do
+        click_link group.title
+        expect(page).to have_css 'li.nav-item a.nav-link.active', text: group.title
+      end
+      within '.browse-landing' do
+        expect(page).to have_css '.category', count: 1
+      end
+    end
+
+    it 'clicking through from the context of a category provides the breadcrums' do
+      within '.browse-group-navigation' do
+        click_link group.title
+        expect(page).to have_css 'li.nav-item a.nav-link.active', text: group.title
+      end
+      click_link 'Some Saved Search'
+      expect(page).to have_css 'ul.breadcrumb li.breadcrumb-item', count: 4
+      expect(page).to have_css 'li.breadcrumb-item', text: 'Awesome group'
+    end
+  end
+end

data/spec/features/browse_category_spec.rb

@@ -100,7 +100,7 @@ describe 'Browse pages' do
       it 'uses the appropriate view config' do
         visit spotlight.exhibit_browse_path(exhibit, search)
 
-        expect(page).to have_css('#documents.gallery .document', count: 1)
+        expect(page).to have_css('#documents.documents-gallery .document', count: 1)
 
         within '.document' do
           expect(page).not_to have_css('dt')
@@ -113,7 +113,7 @@ describe 'Browse pages' do
       it 'renders the gallery view' do
         visit spotlight.exhibit_browse_path(exhibit, search)
         expect(page).to have_selector '.view-type-gallery.active'
-        expect(page).to have_selector '#documents.gallery'
+        expect(page).to have_selector '#documents.documents-gallery'
       end
     end
 

data/spec/features/catalog_spec.rb

@@ -23,13 +23,13 @@ describe 'Catalog', type: :feature do
 
     it "has a 'Item Visiblity' facet" do
       visit spotlight.search_exhibit_catalog_path(exhibit)
-      expect(page).to have_selector '.card-header', text: 'Item Visibility'
+      expect(page).to have_selector '.card-header', text: 'Item visibility'
     end
   end
 
   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_breadcrumbs 'Home', 'Search results'
   end
 
   describe 'Non-spotlight #show' do

data/spec/features/create_exhibit_spec.rb

@@ -24,7 +24,7 @@ describe 'Create a new exhibit', type: :feature do
 
     fill_in 'Title', with: 'My exhibit title'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
 
     expect(page).to have_content 'The exhibit was created.'
     expect(Spotlight::Exhibit.last.slug).to eq 'my-exhibit-title'
@@ -39,7 +39,7 @@ describe 'Create a new exhibit', type: :feature do
     fill_in 'Title', with: 'My exhibit title'
     fill_in 'URL slug', with: 'custom-slug'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
 
     expect(page).to have_content 'The exhibit was created.'
     expect(Spotlight::Exhibit.last.slug).to eq 'custom-slug'
@@ -51,14 +51,15 @@ describe 'Create a new exhibit', type: :feature do
     fill_in 'Title', with: 'My exhibit title'
     fill_in 'URL slug', with: 'custom-slug'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
 
     visit spotlight.new_exhibit_path
 
     fill_in 'Title', with: 'My exhibit title'
     fill_in 'URL slug', with: 'custom-slug'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
+
     expect(page).to have_content 'has already been taken'
   end
 end

data/spec/features/dashboard_spec.rb

@@ -2,11 +2,6 @@
 
 describe 'Dashboard', type: :feature do
   let(:exhibit) { FactoryBot.create(:exhibit) }
-  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
-  before do
-    login_as(admin)
-  end
-
   let!(:parent_feature_page) do
     FactoryBot.create(:feature_page, title: 'Parent Page', exhibit: exhibit)
   end
@@ -18,17 +13,22 @@ describe 'Dashboard', type: :feature do
       exhibit: exhibit
     )
   end
+  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
+  before do
+    login_as(admin)
+  end
 
   it 'includes a list of recently edited feature pages' do
     visit spotlight.exhibit_dashboard_path(exhibit)
-    expect(page).to have_content 'Recent Site Building Activity'
+    expect(page).to have_content 'Recent site building activity'
     expect(page).to have_content 'Parent Page'
     expect(page).to have_content 'Child Page'
   end
 
   it 'includes a list of recently indexed items' do
     visit spotlight.exhibit_dashboard_path(exhibit)
-    expect(page).to have_content 'Recently Updated Items'
+    expect(page).to have_content 'Recently updated items'
     expect(page).to have_selector('#documents')
   end
 end

data/spec/features/edit_search_fields_spec.rb

@@ -54,7 +54,7 @@ describe 'Search Administration', type: :feature do
         visit spotlight.edit_exhibit_search_configuration_path(exhibit)
 
         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)')
+        expect(page).to have_css('#nested-sort-fields .dd-item:nth-child(5) h3', text: 'date (new to old)')
 
         uncheck 'blacklight_configuration_sort_fields_title_enabled'
         uncheck 'blacklight_configuration_sort_fields_identifier_enabled'
@@ -72,7 +72,7 @@ describe 'Search Administration', type: :feature do
         expect(find('#blacklight_configuration_sort_fields_identifier_enabled')).not_to be_checked
 
         # Type is now sorted last
-        expect(page).to have_css('#nested-sort-fields .dd-item:nth-child(5) h3', text: 'Type')
+        expect(page).to have_css('#nested-sort-fields .dd-item:nth-child(5) h3', text: 'type')
       end
     end
   end

data/spec/features/exhibits/administration_spec.rb

@@ -63,9 +63,9 @@ describe 'Exhibit Administration', type: :feature do
     it 'updates the aria-labels properly', js: true do
       visit spotlight.edit_exhibit_path(exhibit)
 
-      expect(find_field(email_id_0)['aria-label']).to eq 'Contact email 1'
+      expect(find_field(email_id_0)['aria-label']).to eq 'Recipient email 1'
       find('#another-email').click
-      expect(find_field(email_id_1)['aria-label']).to eq 'Contact email 2'
+      expect(find_field(email_id_1)['aria-label']).to eq 'Recipient email 2'
     end
 
     it 'allows deletion of contact email addresses', js: true do
@@ -135,7 +135,7 @@ describe 'Exhibit Administration', type: :feature do
         find_all('.contact-email-delete').first.click
       end
 
-      expect(page).to have_css("##{hidden_input_id_0}~div span.contact-email-delete-error", text: 'Problem deleting contact email: Not Found')
+      expect(page).to have_css("##{hidden_input_id_0}~div span.contact-email-delete-error", text: 'Problem deleting recipient: Not Found')
     end
   end
 end

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

@@ -13,7 +13,7 @@ describe 'Language', type: :feature do
     it 'successfully adds languages' do
       within '#language' do
         select 'Albanian'
-        click_button 'Add language'
+        find('input[name="commit"]').click
       end
       expect(page).to have_css '.flash_messages', text: 'The language was created.'
       within '#language' do
@@ -27,7 +27,7 @@ describe 'Language', type: :feature do
     it 'successfully updates the language' do
       within '#language' do
         select 'Albanian'
-        click_button 'Add language'
+        find('input[name="commit"]').click
       end
       expect(page).to have_css '.flash_messages', text: 'The language was created.'
       within '#language' do
@@ -43,7 +43,7 @@ describe 'Language', type: :feature do
     it 'successfully updates the language' do
       within '#language' do
         select 'Albanian'
-        click_button 'Add language'
+        find('input[name="commit"]').click
       end
       expect(page).to have_css '.flash_messages', text: 'The language was created.'
       within '#language' do