blacklight-spotlight 3.0.0.rc1 → 3.0.0.rc6

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

@@ -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/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

@@ -23,13 +23,14 @@ 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'
+    expect(page).to have_selector '.breadcrumb-item.active', text: 'Search results'
   end
 
   describe 'Non-spotlight #show' do

data/spec/features/dashboard_spec.rb

@@ -21,14 +21,14 @@ describe 'Dashboard', type: :feature do
 
   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