blacklight-spotlight 0.18.0 → 0.19.0

data/spec/models/spotlight/default_thumbnailable_concern_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::DefaultThumbnailable do
   let(:test_class) { Class.new }
   subject { test_class.new }

data/spec/models/spotlight/exhibit_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::Exhibit, type: :model do
   subject { FactoryGirl.build(:exhibit, title: 'Sample') }
 

data/spec/models/spotlight/feature_page_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::FeaturePage, type: :model do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   describe 'default_scope' do

data/spec/models/spotlight/featured_image_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::FeaturedImage do
   context 'with an uploaded resource' do
     subject { described_class.new }

data/spec/models/spotlight/field_metadata_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::FieldMetadata do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:repository) { double }

data/spec/models/spotlight/filter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::Filter do
   context 'with a simple string field' do
     subject { described_class.new(field: 'x', value: 'y') }

data/spec/models/spotlight/home_page_spec.rb

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

data/spec/models/spotlight/image_derivatives_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class TestSpotlightImageDerivatives
   include Spotlight::ImageDerivatives
 end

data/spec/models/spotlight/main_navigation_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::MainNavigation, type: :model do
   before do
     subject.exhibit = FactoryGirl.create(:exhibit)

data/spec/models/spotlight/masthead_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::Masthead, type: :model do
   describe '#masthead_exists?' do
     let(:masthead) { stub_model(described_class) }

data/spec/models/spotlight/page_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::Page, type: :model do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let!(:parent_page) { Spotlight::FeaturePage.create! exhibit: exhibit, published: true }

data/spec/models/spotlight/reindex_progress_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::ReindexProgress, type: :model do
   let(:start_time) { 20.minutes.ago }
   let(:finish_time) { 5.minutes.ago }

data/spec/models/spotlight/resource_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::Resource, type: :model do
   before do
     allow_any_instance_of(described_class).to receive(:update_index)

data/spec/models/spotlight/role_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::Role, type: :model do
   describe 'validations' do
     subject { described_class.new(args) }

data/spec/models/spotlight/search_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::Search, type: :model do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
 

data/spec/models/spotlight/site_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::Site do
   describe '.instance' do
     it 'is a singleton' do

data/spec/models/spotlight/sitemap_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'sitemap_generator'
 
 describe Spotlight::Sitemap do

data/spec/models/spotlight/solr_document_sidecar_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::SolrDocumentSidecar, type: :model do
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   before do

data/spec/models/spotlight/user_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::User do
   subject { Class.new }
   before { subject.extend described_class }

data/spec/routing/spotlight/exhibit_catalog_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 module Spotlight
   describe 'Catalog controller', type: :routing do

data/spec/routing/spotlight/pages_routing_spec.rb

@@ -1,44 +1,40 @@
-require 'spec_helper'
+describe 'FeaturePagesController and AboutPagesController', type: :routing do
+  describe 'routing' do
+    routes { Spotlight::Engine.routes }
 
-module Spotlight
-  describe 'FeaturePagesController and AboutPagesController', type: :routing do
-    describe 'routing' do
-      routes { Spotlight::Engine.routes }
-
-      it 'routes to #index' do
-        expect(get('/1/feature')).to route_to('spotlight/feature_pages#index', exhibit_id: '1')
-        expect(get('/1/about')).to route_to('spotlight/about_pages#index', exhibit_id: '1')
-      end
+    it 'routes to #index' do
+      expect(get('/1/feature')).to route_to('spotlight/feature_pages#index', exhibit_id: '1')
+      expect(get('/1/about')).to route_to('spotlight/about_pages#index', exhibit_id: '1')
+    end
 
-      it 'routes to #new' do
-        expect(get('/1/feature/new')).to route_to('spotlight/feature_pages#new', exhibit_id: '1')
-        expect(get('/1/about/new')).to route_to('spotlight/about_pages#new', exhibit_id: '1')
-      end
+    it 'routes to #new' do
+      expect(get('/1/feature/new')).to route_to('spotlight/feature_pages#new', exhibit_id: '1')
+      expect(get('/1/about/new')).to route_to('spotlight/about_pages#new', exhibit_id: '1')
+    end
 
-      it 'routes to #show' do
-        expect(get('/1/feature/2')).to route_to('spotlight/feature_pages#show', id: '2', exhibit_id: '1')
-        expect(get('/1/about/2')).to route_to('spotlight/about_pages#show', id: '2', exhibit_id: '1')
-      end
+    it 'routes to #show' do
+      expect(get('/1/feature/2')).to route_to('spotlight/feature_pages#show', id: '2', exhibit_id: '1')
+      expect(get('/1/about/2')).to route_to('spotlight/about_pages#show', id: '2', exhibit_id: '1')
+    end
 
-      it 'routes to #edit' do
-        expect(get('/1/feature/2/edit')).to route_to('spotlight/feature_pages#edit', id: '2', exhibit_id: '1')
-        expect(get('/1/about/2/edit')).to route_to('spotlight/about_pages#edit', id: '2', exhibit_id: '1')
-      end
+    it 'routes to #edit' do
+      expect(get('/1/feature/2/edit')).to route_to('spotlight/feature_pages#edit', id: '2', exhibit_id: '1')
+      expect(get('/1/about/2/edit')).to route_to('spotlight/about_pages#edit', id: '2', exhibit_id: '1')
+    end
 
-      it 'routes to #create' do
-        expect(post('/1/feature')).to route_to('spotlight/feature_pages#create', exhibit_id: '1')
-        expect(post('/1/about')).to route_to('spotlight/about_pages#create', exhibit_id: '1')
-      end
+    it 'routes to #create' do
+      expect(post('/1/feature')).to route_to('spotlight/feature_pages#create', exhibit_id: '1')
+      expect(post('/1/about')).to route_to('spotlight/about_pages#create', exhibit_id: '1')
+    end
 
-      it 'routes to #update' do
-        expect(put('/1/feature/2')).to route_to('spotlight/feature_pages#update', id: '2', exhibit_id: '1')
-        expect(put('/1/about/2')).to route_to('spotlight/about_pages#update', id: '2', exhibit_id: '1')
-      end
+    it 'routes to #update' do
+      expect(put('/1/feature/2')).to route_to('spotlight/feature_pages#update', id: '2', exhibit_id: '1')
+      expect(put('/1/about/2')).to route_to('spotlight/about_pages#update', id: '2', exhibit_id: '1')
+    end
 
-      it 'routes to #destroy' do
-        expect(delete('/1/feature/2')).to route_to('spotlight/feature_pages#destroy', id: '2', exhibit_id: '1')
-        expect(delete('/1/about/2')).to route_to('spotlight/about_pages#destroy', id: '2', exhibit_id: '1')
-      end
+    it 'routes to #destroy' do
+      expect(delete('/1/feature/2')).to route_to('spotlight/feature_pages#destroy', id: '2', exhibit_id: '1')
+      expect(delete('/1/about/2')).to route_to('spotlight/about_pages#destroy', id: '2', exhibit_id: '1')
     end
   end
 end

data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Spotlight::ExhibitExportSerializer do
   let!(:source_exhibit) { FactoryGirl.create(:exhibit) }
 

data/spec/services/spotlight/carrierwave_file_resolver_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+RSpec.describe Spotlight::CarrierwaveFileResolver do
+  let(:masthead) { FactoryGirl.create(:masthead) }
+  let(:resolver) { described_class.new }
+
+  describe 'finding the file' do
+    subject { Riiif::Image.file_resolver.find(masthead.id) }
+
+    it 'is found' do
+      expect(subject).to be_kind_of Riiif::File
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -68,8 +68,14 @@ RSpec.configure do |config|
 
   config.filter_run_excluding js: true if ENV['CI']
 
-  config.include Devise::TestHelpers, type: :controller
-  config.include Devise::TestHelpers, type: :view
+  if defined? Devise::Test::ControllerHelpers
+    config.include Devise::Test::ControllerHelpers, type: :controller
+    config.include Devise::Test::ControllerHelpers, type: :view
+  else
+    config.include Devise::TestHelpers, type: :controller
+    config.include Devise::TestHelpers, type: :view
+  end
+
   config.include Spotlight::TestViewHelpers, type: :view
   config.include Warden::Test::Helpers, type: :feature
 

data/spec/uploaders/spotlight/item_uploader_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'carrierwave/test/matchers'
 
 describe Spotlight::ItemUploader do

data/spec/views/_user_util_links.html.erb_spec.rb

@@ -1,89 +1,85 @@
-require 'spec_helper'
+describe '_user_util_links', type: :view do
+  let(:current_exhibit) { FactoryGirl.create(:exhibit) }
+  before do
+    allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
+    allow(view).to receive(:current_user).and_return(current_user)
+    allow(view).to receive(:current_exhibit).and_return(current_exhibit)
+    allow(view).to receive_messages(show_contact_form?: true)
+  end
 
-module Spotlight
-  describe '_user_util_links', type: :view do
-    let(:current_exhibit) { FactoryGirl.create(:exhibit) }
-    before do
-      allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
-      allow(view).to receive(:current_user).and_return(current_user)
-      allow(view).to receive(:current_exhibit).and_return(current_exhibit)
-      allow(view).to receive_messages(show_contact_form?: true)
+  describe 'when user is not logged in' do
+    let(:current_user) { nil }
+    it 'renders the links' do
+      render
+      expect(rendered).to have_link 'Sign in'
+      expect(rendered).to have_link 'Feedback'
     end
+  end
 
-    describe 'when user is not logged in' do
-      let(:current_user) { nil }
-      it 'renders the links' do
-        render
-        expect(rendered).to have_link 'Sign in'
-        expect(rendered).to have_link 'Feedback'
-      end
+  describe 'when show_contact_form is false' do
+    let(:current_user) { nil }
+    before do
+      allow(view).to receive_messages(show_contact_form?: false)
     end
+    it 'does not render the feedback link' do
+      render
+      expect(rendered).to_not have_link 'Feedback'
+    end
+  end
 
-    describe 'when show_contact_form is false' do
-      let(:current_user) { nil }
-      before do
-        allow(view).to receive_messages(show_contact_form?: false)
-      end
-
-      it 'does not render the feedback link' do
-        render
-        expect(rendered).to_not have_link 'Feedback'
-      end
+  describe 'when user is logged in' do
+    let(:current_user) { Spotlight::Engine.user_class.new }
+    it 'renders the links' do
+      render
+      expect(rendered).to have_link 'Feedback'
+      expect(rendered).to_not have_link 'Dashboard'
+      expect(rendered).to have_link 'Sign out'
     end
+  end
 
-    describe 'when user is logged in' do
-      let(:current_user) { Spotlight::Engine.user_class.new }
-      it 'renders the links' do
-        render
-        expect(rendered).to have_link 'Feedback'
-        expect(rendered).to_not have_link 'Dashboard'
-        expect(rendered).to have_link 'Sign out'
-      end
+  describe 'when user is a curator' do
+    let(:current_user) { Spotlight::Engine.user_class.new }
+    before do
+      allow(view).to receive(:can?).with(:update, current_exhibit).and_return(false)
+      allow(view).to receive(:can?).with(:create, Spotlight::Exhibit).and_return(false)
+      allow(view).to receive(:can?).with(:curate, current_exhibit).and_return(true)
+    end
+    it 'renders the links' do
+      render
+      expect(rendered).to have_link 'Feedback'
+      expect(rendered).to have_link 'Dashboard'
+      expect(rendered).to have_link 'Sign out'
     end
+  end
 
-    describe 'when user is a curator' do
-      let(:current_user) { Spotlight::Engine.user_class.new }
-      before do
-        allow(view).to receive(:can?).with(:update, current_exhibit).and_return(false)
-        allow(view).to receive(:can?).with(:create, Spotlight::Exhibit).and_return(false)
-        allow(view).to receive(:can?).with(:curate, current_exhibit).and_return(true)
-      end
-      it 'renders the links' do
-        render
-        expect(rendered).to have_link 'Feedback'
-        expect(rendered).to have_link 'Dashboard'
-        expect(rendered).to have_link 'Sign out'
-      end
+  describe 'when user is an admin' do
+    let(:current_user) { Spotlight::Engine.user_class.new }
+    before do
+      allow(view).to receive(:can?).with(:update, current_exhibit).and_return(true)
+      allow(view).to receive(:can?).with(:create, Spotlight::Exhibit).and_return(false)
+      allow(view).to receive(:can?).with(:curate, current_exhibit).and_return(true)
     end
-    describe 'when user is an admin' do
-      let(:current_user) { Spotlight::Engine.user_class.new }
-      before do
-        allow(view).to receive(:can?).with(:update, current_exhibit).and_return(true)
-        allow(view).to receive(:can?).with(:create, Spotlight::Exhibit).and_return(false)
-        allow(view).to receive(:can?).with(:curate, current_exhibit).and_return(true)
-      end
-      it 'renders the links' do
-        render
-        expect(rendered).to have_link 'Feedback'
-        expect(rendered).to have_link 'Dashboard'
-        expect(rendered).to have_link 'Sign out'
-      end
+    it 'renders the links' do
+      render
+      expect(rendered).to have_link 'Feedback'
+      expect(rendered).to have_link 'Dashboard'
+      expect(rendered).to have_link 'Sign out'
     end
+  end
 
-    describe 'when user is a site-wide admin' do
-      let(:current_user) { Spotlight::Engine.user_class.new }
-      before do
-        allow(view).to receive(:can?).with(:update, current_exhibit).and_return(true)
-        allow(view).to receive(:can?).with(:create, Spotlight::Exhibit).and_return(true)
-        allow(view).to receive(:can?).with(:curate, current_exhibit).and_return(true)
-      end
-      it 'renders the links' do
-        render
-        expect(rendered).to have_link 'Feedback'
-        expect(rendered).to have_link 'Dashboard'
-        expect(rendered).to have_link 'Create Exhibit'
-        expect(rendered).to have_link 'Sign out'
-      end
+  describe 'when user is a site-wide admin' do
+    let(:current_user) { Spotlight::Engine.user_class.new }
+    before do
+      allow(view).to receive(:can?).with(:update, current_exhibit).and_return(true)
+      allow(view).to receive(:can?).with(:create, Spotlight::Exhibit).and_return(true)
+      allow(view).to receive(:can?).with(:curate, current_exhibit).and_return(true)
+    end
+    it 'renders the links' do
+      render
+      expect(rendered).to have_link 'Feedback'
+      expect(rendered).to have_link 'Dashboard'
+      expect(rendered).to have_link 'Create Exhibit'
+      expect(rendered).to have_link 'Sign out'
     end
   end
 end

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

@@ -1,17 +1,12 @@
-require 'spec_helper'
-
-module Spotlight
-  describe 'shared/_analytics', type: :view do
-    it 'is empty without Google Analytics configured' do
-      render
-      expect(rendered).to be_empty
-    end
-
-    it 'renders the GA script tag if the web property id is configured' do
-      allow(Spotlight::Engine.config).to receive(:ga_web_property_id).and_return('XYZ-234')
-      render
-      expect(rendered).to have_selector 'script', visible: false
-      expect(rendered).to have_content 'XYZ-234'
-    end
+describe 'shared/_analytics', type: :view do
+  it 'is empty without Google Analytics configured' do
+    render
+    expect(rendered).to be_empty
+  end
+  it 'renders the GA script tag if the web property id is configured' do
+    allow(Spotlight::Engine.config).to receive(:ga_web_property_id).and_return('XYZ-234')
+    render
+    expect(rendered).to have_selector 'script', visible: false
+    expect(rendered).to have_content 'XYZ-234'
   end
 end