blacklight-spotlight 0.17.1 → 0.18.0

data/spec/helpers/spotlight/application_helper_spec.rb

@@ -36,13 +36,13 @@ describe Spotlight::ApplicationHelper, type: :helper do
 
       # controller provided helper.
       allow(helper).to receive(:search_action_url) do |*args|
-        spotlight.exhibit_catalog_index_path(helper.current_exhibit, *args)
+        spotlight.search_exhibit_catalog_path(helper.current_exhibit, *args)
       end
     end
 
     it 'is a url for a search with the given tag facet' do
       allow(SolrDocument).to receive_messages(solr_field_for_tagger: :exhibit_tags)
-      expected = spotlight.exhibit_catalog_index_path(exhibit_id: helper.current_exhibit, f: { exhibit_tags: ['tag_value'] })
+      expected = spotlight.search_exhibit_catalog_path(exhibit_id: helper.current_exhibit, f: { exhibit_tags: ['tag_value'] })
       expect(helper.url_to_tag_facet('tag_value')).to eq expected
     end
   end
@@ -133,27 +133,6 @@ describe Spotlight::ApplicationHelper, type: :helper do
     end
   end
 
-  describe 'save_search rendering' do
-    let(:current_exhibit) { FactoryGirl.create(:exhibit) }
-    before { allow(helper).to receive_messages(current_exhibit: current_exhibit) }
-    describe 'render_save_this_search?' do
-      it 'returns false if we are on the items admin screen' do
-        allow(helper).to receive(:"can?").with(:curate, current_exhibit).and_return(true)
-        allow(helper).to receive(:params).and_return(controller: 'spotlight/catalog', action: 'admin')
-        expect(helper.render_save_this_search?).to be_falsey
-      end
-      it 'returns true if we are not on the items admin screen' do
-        allow(helper).to receive(:"can?").with(:curate, current_exhibit).and_return(true)
-        allow(helper).to receive(:params).and_return(controller: 'spotlight/catalog', action: 'index')
-        expect(helper.render_save_this_search?).to be_truthy
-      end
-      it 'returns false if a user cannot curate the object' do
-        allow(helper).to receive(:"can?").with(:curate, current_exhibit).and_return(false)
-        expect(helper.render_save_this_search?).to be_falsey
-      end
-    end
-  end
-
   describe '#uploaded_field_label' do
     let :field do
       OpenStruct.new field_name: 'x'

data/spec/helpers/spotlight/main_app_helpers_spec.rb

@@ -34,69 +34,11 @@ describe Spotlight::MainAppHelpers, type: :helper do
       before { allow(helper).to receive_messages current_exhibit: nil }
       its(:show_contact_form?) { should be_falsey }
     end
-  end
-
-  describe '#field_enabled?' do
-    let(:field) { FactoryGirl.create(:custom_field) }
-    let(:controller) { OpenStruct.new }
-    before do
-      controller.extend(Blacklight::Catalog)
-      allow(helper).to receive(:controller).and_return(controller)
-      allow(helper).to receive(:document_index_view_type).and_return(nil)
-      allow(field).to receive(:enabled).and_return(true)
-    end
-    context 'for sort fields' do
-      let(:field) { Blacklight::Configuration::SortField.new enabled: true }
-      it 'uses the enabled property for sort fields' do
-        expect(helper.field_enabled?(field)).to eq true
-      end
-    end
 
-    context 'for search fields' do
-      let(:field) { Blacklight::Configuration::SearchField.new enabled: true }
-      it 'uses the enabled property for search fields' do
-        expect(helper.field_enabled?(field)).to eq true
-      end
-    end
-
-    it 'returns the value of field#show if the action_name is "show"' do
-      allow(field).to receive(:show).and_return(:value)
-      allow(helper).to receive(:action_name).and_return('show')
-      expect(helper.field_enabled?(field)).to eq :value
-    end
-    it 'returns the value of field#show if the action_name is "edit"' do
-      allow(field).to receive(:show).and_return(:value)
-      allow(helper).to receive(:action_name).and_return('edit')
-      expect(helper.field_enabled?(field)).to eq :value
-    end
-    it 'returns the value of the original if condition' do
-      allow(field).to receive(:upstream_if).and_return false
-      expect(helper.field_enabled?(field)).to eq false
-    end
-  end
-
-  describe '#enabled_in_spotlight_view_type_configuration?' do
-    let(:controller) { OpenStruct.new }
-    let(:view) { OpenStruct.new }
-    before do
-      controller.extend(Blacklight::Catalog)
-      allow(helper).to receive(:controller).and_return(controller)
-    end
-
-    it 'respects the original if condition' do
-      view.upstream_if = false
-      expect(helper.enabled_in_spotlight_view_type_configuration?(view)).to eq false
-    end
-
-    it 'is true if there is no exhibit context' do
-      allow(helper).to receive(:current_exhibit).and_return(nil)
-      expect(helper.enabled_in_spotlight_view_type_configuration?(view)).to eq true
-    end
-
-    it "is true if we're in a page context" do
-      allow(helper).to receive(:current_exhibit).and_return(nil)
-      allow(controller).to receive(:is_a?).with(Spotlight::PagesController).and_return(true)
-      expect(helper.enabled_in_spotlight_view_type_configuration?(view)).to eq true
+    context 'with a default contact address' do
+      before { allow(Spotlight::Engine.config).to receive_messages default_contact_email: 'root@localhost' }
+      before { allow(helper).to receive_messages current_exhibit: exhibit }
+      its(:show_contact_form?) { should be_truthy }
     end
   end
 end

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -59,8 +59,7 @@ module Spotlight
       let(:search_result) { [double('response'), double('documents')] }
 
       it 'returns the results for a given search browse category' do
-        allow(helper).to receive(:search_params_logic).and_return([])
-        expect(helper).to receive(:search_results).with({ 'q' => 'query' }, []).and_return(search_result)
+        expect(helper).to receive(:search_results).with('q' => 'query').and_return(search_result)
         expect(helper.get_search_widget_search_results(good)).to eq search_result
       end
       it "returns an empty array when requesting a search that doesn't exist" do

data/spec/models/sir_trevor_rails/blocks/browse_block_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe SirTrevorRails::Blocks::BrowseBlock do
+  let(:page) { FactoryGirl.create(:feature_page) }
+  let(:block_data) { {} }
+  subject { described_class.new({ type: '', data: block_data }, page) }
+
+  describe '#items' do
+    it 'is the array of items with display set to true' do
+      block_data[:item] = {
+        '0': { id: 'abc123', display: 'true' },
+        '1': { id: 'xyz321', display: 'false' }
+      }
+      expect(subject.items.length).to eq 1
+      expect(subject.items).to eq([{ id: 'abc123', display: 'true' }])
+    end
+
+    it 'is an empty array when there is no browse category' do
+      expect(subject.items).to eq([])
+    end
+  end
+end

data/spec/{lib/spotlight/catalog/access_controls_enforcement_spec.rb → models/spotlight/access_controls_enforcement_search_builder_spec.rb}

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Spotlight::Catalog::AccessControlsEnforcement do
+describe Spotlight::AccessControlsEnforcementSearchBuilder do
   class MockSearchBuilder < Blacklight::SearchBuilder
     attr_reader :blacklight_params, :scope
     def initialize(blacklight_params, scope)
       @blacklight_params = blacklight_params
       @scope = scope
     end
-    include Spotlight::Catalog::AccessControlsEnforcement::SearchBuilder
+    include Spotlight::AccessControlsEnforcementSearchBuilder
     include Blacklight::Solr::SearchBuilderBehavior
 
     def blacklight_config
@@ -21,19 +21,6 @@ describe Spotlight::Catalog::AccessControlsEnforcement do
   let(:solr_request) { Blacklight::Solr::Request.new }
   let(:blacklight_params) { Hash.new }
 
-  describe '.search_params_logic' do
-    class MockCatalogController
-      include Blacklight::SearchHelper
-      include Spotlight::Catalog::AccessControlsEnforcement
-    end
-
-    subject { MockCatalogController.new }
-
-    it 'adds the filter to the params logic' do
-      expect(subject.search_params_logic).to include :apply_permissive_visibility_filter
-    end
-  end
-
   describe '#apply_permissive_visibility_filter' do
     it 'allows curators to view everything' do
       allow(scope).to receive(:can?).and_return(true)
@@ -53,7 +40,7 @@ describe Spotlight::Catalog::AccessControlsEnforcement do
       allow(subject).to receive(:can?).and_return(true)
       subject.apply_permissive_visibility_filter(solr_request)
       expect(solr_request).to include :fq
-      expect(solr_request[:fq]).not_to include "spotlight_exhibit_slug_#{exhibit.slug}_bsi:true"
+      expect(solr_request[:fq]).not_to include "{!term f=spotlight_exhibit_slug_#{exhibit.slug}_bsi}true"
     end
   end
 
@@ -69,7 +56,7 @@ describe Spotlight::Catalog::AccessControlsEnforcement do
         subject.apply_exhibit_resources_filter(solr_request)
 
         expect(solr_request).to include :fq
-        expect(solr_request[:fq]).to include "spotlight_exhibit_slug_#{exhibit.slug}_bsi:true"
+        expect(solr_request[:fq]).to include "{!term f=spotlight_exhibit_slug_#{exhibit.slug}_bsi}true"
       end
     end
 
@@ -86,7 +73,7 @@ describe Spotlight::Catalog::AccessControlsEnforcement do
         subject.apply_exhibit_resources_filter(solr_request)
 
         expect(solr_request).to include :fq
-        expect(solr_request[:fq]).to include '{!raw f=author_ssim}Coyne, Justin'
+        expect(solr_request[:fq]).to include '{!term f=author_ssim}Coyne, Justin'
       end
     end
   end

data/spec/models/spotlight/contact_form_spec.rb

@@ -0,0 +1,35 @@
+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) }
+
+  context 'with a site-wide contact email' do
+    before { allow(Spotlight::Engine.config).to receive_messages default_contact_email: 'root@localhost' }
+
+    it 'sends the email to the configured contact' do
+      expect(subject.headers[:to]).to eq Spotlight::Engine.config.default_contact_email
+    end
+
+    context 'with exhibit-specific contacts' do
+      before { exhibit.contact_emails.create(email: 'curator@example.com', confirmed_at: Time.zone.now) }
+
+      it 'appends exhibit-specific contacts as cc recipients' do
+        expect(subject.headers[:cc]).to eq 'curator@example.com'
+      end
+    end
+  end
+
+  context 'with exhibit-specific contacts' do
+    before { exhibit.contact_emails.create(email: 'curator@example.com', confirmed_at: Time.zone.now) }
+    before { exhibit.contact_emails.create(email: 'addl_curator@example.com', confirmed_at: Time.zone.now) }
+
+    it 'sends the email to the first contact' do
+      expect(subject.headers[:to]).to eq 'curator@example.com'
+    end
+
+    it 'appends exhibit-specific contacts as cc recipients' do
+      expect(subject.headers[:cc]).to eq 'curator@example.com, addl_curator@example.com'
+    end
+  end
+end

data/spec/models/spotlight/custom_field_spec.rb

@@ -69,6 +69,12 @@ describe Spotlight::CustomField, type: :model do
       subject.save
       expect(subject.field).to end_with Spotlight::Engine.config.solr_fields.string_suffix
     end
+
+    it 'begins with readonly if it is readonly' do
+      subject.readonly_field = true
+      subject.save
+      expect(subject.field).to start_with('readonly_')
+    end
   end
 
   describe '#solr_field' do

data/spec/models/spotlight/exhibit_spec.rb

@@ -82,7 +82,8 @@ describe Spotlight::Exhibit, type: :model do
     before do
       subject.contacts_attributes = [
         { 'show_in_sidebar' => '0', 'name' => 'Justin Coyne', 'contact_info' => { 'email' => 'jcoyne@justincoyne.com', 'title' => '', 'location' => 'US' } },
-        { 'show_in_sidebar' => '0', 'name' => '', 'contact_info' => { 'email' => '', 'title' => 'Librarian', 'location' => '' } }]
+        { 'show_in_sidebar' => '0', 'name' => '', 'contact_info' => { 'email' => '', 'title' => 'Librarian', 'location' => '' } }
+      ]
     end
     it 'accepts nested contacts' do
       expect(subject.contacts.size).to eq 2
@@ -230,7 +231,7 @@ describe Spotlight::Exhibit, type: :model do
       end
 
       it 'filters the solr results using the exhibit filter' do
-        expected_query_params = { fq: ["spotlight_exhibit_slug_#{subject.slug}_bsi:true"] }
+        expected_query_params = { fq: ["{!term f=spotlight_exhibit_slug_#{subject.slug}_bsi}true"] }
         allow_any_instance_of(Blacklight::Solr::Repository).to receive(:search).with(hash_including(expected_query_params)).and_return(double(documents: []))
         expect(subject.solr_documents.to_a).to be_blank
       end

data/spec/models/spotlight/search_spec.rb

@@ -97,7 +97,7 @@ describe Spotlight::Search, type: :model do
 
   describe '#search_params' do
     it 'maps the search to the appropriate facet values' do
-      expect(subject.search_params.to_hash).to include 'fq' => array_including('{!raw f=genre_sim}map')
+      expect(subject.search_params.to_hash).to include 'fq' => array_including('{!term f=genre_sim}map')
     end
 
     context 'with filter_resources_by_exhibit configured' do
@@ -106,7 +106,7 @@ describe Spotlight::Search, type: :model do
       end
 
       it 'includes the exhibit context' do
-        expect(subject.search_params.to_hash).to include 'fq' => array_including("spotlight_exhibit_slug_#{exhibit.slug}_bsi:true")
+        expect(subject.search_params.to_hash).to include 'fq' => array_including("{!term f=spotlight_exhibit_slug_#{exhibit.slug}_bsi}true")
       end
     end
   end

data/spec/spec_helper.rb

@@ -72,6 +72,13 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, type: :view
   config.include Spotlight::TestViewHelpers, type: :view
   config.include Warden::Test::Helpers, type: :feature
+
+  config.include(ControllerLevelHelpers, type: :helper)
+  config.before(:each, type: :helper) { initialize_controller_helpers(helper) }
+
+  config.include(ControllerLevelHelpers, type: :view)
+  config.before(:each, type: :view) { initialize_controller_helpers(view) }
+
   config.after(:each, type: :feature) { Warden.test_reset! }
   config.include Controllers::EngineHelpers, type: :controller
   config.include Capybara::DSL

data/spec/support/helpers/controller_level_helpers.rb

@@ -0,0 +1,13 @@
+module ControllerLevelHelpers
+  def search_state
+    @search_state ||= Blacklight::SearchState.new(params, blacklight_config)
+  end
+
+  def blacklight_configuration_context
+    @blacklight_configuration_context ||= Blacklight::Configuration::Context.new(controller)
+  end
+
+  def initialize_controller_helpers(helper)
+    helper.extend ControllerLevelHelpers
+  end
+end

data/spec/test_app_templates/catalog_controller.rb

@@ -1,6 +1,7 @@
 class CatalogController < ApplicationController
   include Blacklight::Catalog
   helper Openseadragon::OpenseadragonHelper
+  before_action :set_paper_trail_whodunnit
 
   configure_blacklight do |config|
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -4,7 +4,7 @@ class TestAppGenerator < Rails::Generators::Base
   source_root '../spec/test_app_templates'
 
   def add_gems
-    gem 'blacklight', '~> 5.16'
+    gem 'blacklight', '~> 6.0'
     gem 'blacklight-gallery', '>= 0.3.0'
     gem 'jettywrapper'
     Bundler.with_clean_env do
@@ -48,4 +48,12 @@ class TestAppGenerator < Rails::Generators::Base
 EOF
     end
   end
+
+  def disable_papertrail_associations
+    initializer 'paper_trail.rb' do
+      <<-EOF
+        PaperTrail.config.track_associations = false
+      EOF
+    end
+  end
 end

data/spec/views/shared/_footer.html.erb_spec.rb

@@ -16,9 +16,9 @@ module Spotlight
 
     it 'displays social media links' do
       render
-      expect(rendered).to have_selector('footer .social-share-button a.social-share-button-twitter[title="Twitter"]')
-      expect(rendered).to have_selector('footer .social-share-button a.social-share-button-facebook[title="Facebook"]')
-      expect(rendered).to have_selector('footer .social-share-button a.social-share-button-google_plus[title="Google+"]')
+      expect(rendered).to have_selector('footer .social-share-button a.ssb-icon[title="Twitter"]')
+      expect(rendered).to have_selector('footer .social-share-button a.ssb-icon[title="Facebook"]')
+      expect(rendered).to have_selector('footer .social-share-button a.ssb-icon[title="Google+"]')
     end
   end
 end

data/spec/views/spotlight/about_pages/index.html.erb_spec.rb

@@ -6,23 +6,19 @@ describe 'spotlight/about_pages/index.html.erb', type: :view do
       stub_model(Spotlight::AboutPage,
                  title: 'Title1',
                  content: '[]',
-                 exhibit: exhibit
-                ),
+                 exhibit: exhibit),
       stub_model(Spotlight::AboutPage,
                  title: 'Title2',
                  content: '[]',
-                 exhibit: exhibit
-                )
+                 exhibit: exhibit)
     ]
   end
   let(:contacts) do
     [
       stub_model(Spotlight::Contact,
-                 exhibit: exhibit
-                ),
+                 exhibit: exhibit),
       stub_model(Spotlight::Contact,
-                 exhibit: exhibit
-                )
+                 exhibit: exhibit)
     ]
   end
   let(:exhibit) { stub_model(Spotlight::Exhibit) }
@@ -48,9 +44,9 @@ describe 'spotlight/about_pages/index.html.erb', type: :view do
     expect(rendered).to have_selector '.panel-title', text: 'Title2'
 
     expect(rendered).to have_selector '.contacts_admin ol.dd-list li[data-id]', count: 2
-    expect(rendered).to have_selector '.contacts_admin ol.dd-list li input[data-property=weight]', count: 2
-    expect(rendered).to have_selector '.contacts_admin ol.dd-list li input#exhibit_contacts_attributes_0_id'
-    expect(rendered).to have_selector '.contacts_admin ol.dd-list li input#exhibit_contacts_attributes_1_id'
+    expect(rendered).to have_selector '.contacts_admin ol.dd-list li input[data-property=weight]', visible: false, count: 2
+    expect(rendered).to have_selector '.contacts_admin ol.dd-list li input#exhibit_contacts_attributes_0_id', visible: false
+    expect(rendered).to have_selector '.contacts_admin ol.dd-list li input#exhibit_contacts_attributes_1_id', visible: false
   end
 
   describe 'Save button' do

data/spec/views/spotlight/catalog/admin.html.erb_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 module Spotlight
   describe 'spotlight/catalog/admin.html.erb', type: :view do
     let(:exhibit) { stub_model(Spotlight::Exhibit) }
+    let(:blacklight_config) { CatalogController.blacklight_config }
     before do
-      allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+      allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+      allow(exhibit).to receive(:blacklight_config).and_return(blacklight_config)
       allow(view).to receive(:spotlight_page_path_for).and_return(nil)
       allow(view).to receive(:current_exhibit).and_return(exhibit)
       allow(view).to receive(:new_exhibit_resource_path).and_return('')

data/spec/views/spotlight/home_pages/_empty.html.erb_spec.rb

@@ -8,7 +8,7 @@ describe 'spotlight/home_pages/_empty.html.erb', type: :view do
                                       edit_exhibit_path: '/',
                                       edit_exhibit_appearance_path: '/',
                                       exhibit_roles_path: '/',
-                                      admin_exhibit_catalog_index_path: '/',
+                                      admin_exhibit_catalog_path: '/',
                                       edit_exhibit_metadata_configuration_path: '/',
                                       edit_exhibit_search_configuration_path: '/')
     end

data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb

@@ -11,7 +11,8 @@ module Spotlight
         current_exhibit: exhibit,
         blacklight_config: exhibit.blacklight_configuration,
         available_view_fields: { some_view_type: 1, another_view_type: 2 },
-        select_deselect_button: nil)
+        select_deselect_button: nil
+      )
     end
 
     let(:facet_field) { Blacklight::Configuration::FacetField.new }