blacklight-spotlight 0.18.0 → 0.19.0

data/spec/features/exhibit_masthead_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Add and update the site masthead', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/exhibits/add_tags_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'Add tags to an item in an exhibit', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/exhibits/administration_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'Exhibit Administration', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/exhibits/custom_metadata_fields_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'Adding custom metadata fields', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/exhibits/edit_metadata_fields_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe 'Editing metadata fields', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/features/exhibits_index_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Exhibits index page', type: :feature do
   context 'with multiple exhibits' do
     let!(:exhibit) { FactoryGirl.create(:exhibit, title: 'Some Exhibit Title') }

data/spec/features/feature_page_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Feature page', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/home_page_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 describe 'Home page', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/import_exhibit_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'tempfile'
 
 describe 'Allow exhibit admins to import and export content from an exhibit', type: :feature, js: true do

data/spec/features/item_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Item Administration', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/javascript/about_page_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'About Pages Adminstration', js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/javascript/block_controls_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Block controls' do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

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

@@ -33,4 +33,12 @@ describe 'Featured Browse Category Block', type: :feature, js: true do
     expect(page).to have_css('.category-title', text: search2.title)
     expect(page).to have_css('.item-count', text: /\d+ items/i)
   end
+
+  it 'allows the curator to omit document counts' do
+    uncheck 'Include item counts?'
+    fill_in_typeahead_field with: 'Title1'
+    save_page
+
+    expect(page).not_to have_css('.item-count', text: /\d+ items/i)
+  end
 end

data/spec/features/javascript/edit_in_place_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Edit in place', type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/javascript/feature_page_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Feature Pages Adminstration', js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/javascript/home_page_edit_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Editing the Home Page', js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/javascript/metadata_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Metadata Administration', js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/javascript/multi_image_select_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Multi image selector', type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/javascript/preview_block_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Block preview' do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/javascript/reindex_monitor_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Reindex Monitor', js: true do
   let(:resources) do
     [FactoryGirl.create(:resource, updated_at: Time.zone.now, index_status: 1)]

data/spec/features/javascript/roles_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Roles Admin', type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_admin) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/javascript/rule_block_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Horizontal rule block', type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/javascript/search_config_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Search Configuration Administration', js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/javascript/search_context_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Search contexts' do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:exhibit_curator) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }

data/spec/features/main_navigation_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Main navigation labels are settable', type: :feature do
   let!(:exhibit) { FactoryGirl.create(:exhibit) }
   let!(:about) { FactoryGirl.create(:about_page, exhibit: exhibit, published: true) }

data/spec/features/metadata_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Metadata Administration', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/report_a_problem_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Report a Problem', type: :feature do
   let!(:exhibit) { FactoryGirl.create(:exhibit) }
   it 'does not have a header link' do

data/spec/features/site_admin_management_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Site admin management', js: true do
   let(:user) { FactoryGirl.create(:site_admin) }
   let(:existing_user) { FactoryGirl.create(:exhibit_visitor) }

data/spec/features/site_masthead_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Add and update the site masthead', type: :feature do
   let(:user) { FactoryGirl.create(:site_admin) }
 
@@ -60,9 +58,7 @@ describe 'Add and update the site masthead', type: :feature do
     end
 
     click_button 'Save changes'
-
     expect(page).to have_content('The site was successfully updated.')
-
     expect(page).to have_css('.image-masthead .background-container')
   end
   it 'does not display an uploaded masthead if configured to not display' do
@@ -77,9 +73,7 @@ describe 'Add and update the site masthead', type: :feature do
     end
 
     click_button 'Save changes'
-
     expect(page).to have_content('The site was successfully updated.')
-
     expect(page).to_not have_css('.image-masthead .background-container')
   end
 end

data/spec/features/slideshow_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Slideshow', type: :feature, js: true do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/features/tags_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'Tags Administration', type: :feature do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let!(:tagging) { FactoryGirl.create(:tagging, tagger: exhibit) }

data/spec/features/user_admin_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe 'User Administration', type: :feature do
   let!(:exhibit) { FactoryGirl.create(:exhibit) }
   let!(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::ApplicationHelper, type: :helper do
   describe '#application_name' do

data/spec/helpers/spotlight/browse_helper_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::BrowseHelper, type: :helper do
   it 'defaults to the gallery' do

data/spec/helpers/spotlight/crud_link_helpers_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 module Spotlight
   describe CrudLinkHelpers, type: :helper do

data/spec/helpers/spotlight/jcrop_helper_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::JcropHelper do
   describe '.default_thumbnail_jcrop_options' do

data/spec/helpers/spotlight/main_app_helpers_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::MainAppHelpers, type: :helper do
   describe '#show_contact_form?' do

data/spec/helpers/spotlight/navbar_helper_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 module Spotlight
   describe NavbarHelper, type: :helper do

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 module Spotlight
   describe PagesHelper, type: :helper do

data/spec/helpers/spotlight/roles_helper_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::RolesHelper, type: :helper do
   it 'is a list of options' do

data/spec/helpers/spotlight/search_configurations_helper_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::SearchConfigurationsHelper, type: :helper do
   describe '#translate_sort_fields' do

data/spec/helpers/spotlight/title_helper_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::TitleHelper, type: :helper do
   before do

data/spec/jobs/spotlight/default_thumbnail_job_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::DefaultThumbnailJob do
   let(:thumbnailable) { double('Thumbnailable') }

data/spec/jobs/spotlight/reindex_job_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::ReindexJob do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/jobs/spotlight/rename_sidecar_field_job_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::RenameSidecarFieldJob do
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/lib/spotlight/controller_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::Controller do
   class MockController < ActionController::Base

data/spec/mailers/spotlight/indexing_complete_mailer_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::IndexingCompleteMailer do
   let(:user) { double(email: 'test@example.com') }

data/spec/models/solr_document_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe SolrDocument, type: :model do
   subject { described_class.new(id: 'abcd123') }
   its(:to_key) { should == ['abcd123'] }

data/spec/models/spotlight/ability_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'cancan/matchers'
 
 describe Spotlight::Ability, type: :model do

data/spec/models/spotlight/about_page_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::AboutPage, type: :model do
   let(:page) { described_class.create! exhibit: FactoryGirl.create(:exhibit) }
   it { is_expected.not_to be_feature_page }

data/spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::AccessControlsEnforcementSearchBuilder do
   class MockSearchBuilder < Blacklight::SearchBuilder
     attr_reader :blacklight_params, :scope

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::BlacklightConfiguration, type: :model do
   subject { described_class.new }
   let(:blacklight_config) { Blacklight::Configuration.new }
@@ -79,6 +77,11 @@ describe Spotlight::BlacklightConfiguration, type: :model do
       expect(subject.blacklight_config.facet_fields['b'].sort).to eq 'index'
     end
 
+    it 'respects upstream configuration that disables the field entirely' do
+      blacklight_config.add_facet_field 'a', if: false
+      expect(subject.blacklight_config.facet_fields['a'].if).to eq false
+    end
+
     context 'custom fields' do
       it 'includes any custom fields' do
         allow(subject).to receive_messages(custom_facet_fields: { 'a' => double(if: nil, :if= => true, merge!: true, validate!: true, normalize!: true) })
@@ -346,6 +349,11 @@ describe Spotlight::BlacklightConfiguration, type: :model do
       expect(subject.blacklight_config.search_fields.select { |_k, v| v.enabled == true }).to include('a', 'c')
       expect(subject.blacklight_config.search_fields.select { |_k, v| v.enabled == true }).not_to include('b', 'd')
     end
+
+    it 'respects upstream configuration that disables the field entirely' do
+      blacklight_config.add_search_field 'a', if: false
+      expect(subject.blacklight_config.search_fields['a'].if).to eq false
+    end
   end
 
   describe 'per page' do

data/spec/models/spotlight/contact_email_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::ContactEmail, type: :model do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   subject { described_class.new(exhibit: exhibit) }
@@ -18,12 +16,6 @@ describe Spotlight::ContactEmail, type: :model do
     before { subject.email = 'foo@example.com' }
     it { is_expected.to be_valid }
 
-    describe 'when saved' do
-      it 'sends a confirmation' do
-        expect(subject).to receive(:send_devise_notification)
-        subject.save
-      end
-    end
     describe '#send_devise_notification' do
       it 'sends stuff' do
         expect do

data/spec/models/spotlight/contact_form_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::ContactForm do
   subject { described_class.new(name: 'Root', email: 'user@example.com').tap { |c| c.current_exhibit = exhibit } }
   let(:exhibit) { FactoryGirl.create(:exhibit) }

data/spec/models/spotlight/contact_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::Contact, type: :model do
   context '#show_in_sidebar' do
     it 'is an attribute' do

data/spec/models/spotlight/custom_field_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 describe Spotlight::CustomField, type: :model do
   describe '#label' do