blacklight-spotlight 0.1.0 → 0.2.0

data/spec/lib/spotlight/catalog/access_controls_enforcement_spec.rb

@@ -10,7 +10,7 @@ describe Spotlight::Catalog::AccessControlsEnforcement do
   let(:solr_request) { Blacklight::Solr::Request.new }
 
   before do
-    subject.stub(current_exhibit: FactoryGirl.create(:exhibit))
+    allow(subject).to receive_messages(current_exhibit: FactoryGirl.create(:exhibit))
   end
 
   describe "#apply_permissive_visibility_filter" do
@@ -19,13 +19,13 @@ describe Spotlight::Catalog::AccessControlsEnforcement do
     end
 
     it "should allow curators to view everything" do
-      subject.stub(:can?).and_return(true)
+      allow(subject).to receive(:can?).and_return(true)
       subject.send(:apply_permissive_visibility_filter, solr_request, {})
       expect(solr_request.to_hash).to be_empty
     end
 
     it "should restrict searches to public items" do
-      subject.stub(:can?).and_return(false)
+      allow(subject).to receive(:can?).and_return(false)
 
       subject.send(:apply_permissive_visibility_filter, solr_request, {})
       expect(solr_request).to include :fq

data/spec/lib/spotlight/controller_spec.rb

@@ -9,7 +9,7 @@ describe Spotlight::Controller do
 
   describe "#current_exhibit" do
     it "should be nil by default" do
-      subject.current_exhibit.should be_nil
+      expect(subject.current_exhibit).to be_nil
     end
   end
 end

data/spec/lib/spotlight/document_presenter_spec.rb

@@ -15,14 +15,14 @@ describe Spotlight::DocumentPresenter do
     describe "with an array" do
       let(:document_attributes) { { 'full_title_tesim' => ['Main title & stuff'] } }
       it "should not escape html" do
-        subject.raw_document_heading.should == "Main title & stuff"
+        expect(subject.raw_document_heading).to eq("Main title & stuff")
       end
     end
 
     describe "with a single value " do
       let(:document_attributes) { { 'full_title_tesim' => 'Main title & stuff' } }
       it "should not escape html" do
-        subject.raw_document_heading.should == "Main title & stuff"
+        expect(subject.raw_document_heading).to eq("Main title & stuff")
       end
     end
   end

data/spec/lib/spotlight/routes_spec.rb

@@ -4,7 +4,7 @@ describe ActionDispatch::Routing::Mapper do
   describe "#spotlight_root" do
     subject { ActionDispatch::Routing::Mapper.new(ActionDispatch::Routing::RouteSet.new) }
     it "should make the root route" do
-      subject.should_receive(:root).with(to: "spotlight/default#index")
+      expect(subject).to receive(:root).with(to: "spotlight/default#index")
       subject.spotlight_root
     end
   end

data/spec/models/solr_document_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe SolrDocument do
+describe SolrDocument, :type => :model do
   subject { ::SolrDocument.new(id: 'abcd123') }
   its(:to_key) {should == ['abcd123']}
   its(:persisted?) {should be_truthy}
   before do
-    subject.stub(reindex: nil)
+    allow(subject).to receive_messages(reindex: nil)
   end
 
   let(:exhibit) { FactoryGirl.create(:exhibit) }
@@ -19,7 +19,7 @@ describe SolrDocument do
     expect {
       exhibit.tag(subject, with: "paris, normandy", on: :tags)
     }.to change { ActsAsTaggableOn::Tag.count}.by(2)
-    subject.tags_from(exhibit).should eq ['paris', 'normandy']
+    expect(subject.tags_from(exhibit)).to eq ['paris', 'normandy']
   end
 
   it "should have find" do
@@ -45,13 +45,13 @@ describe SolrDocument do
   describe "#update" do
     it "should store sidecar data on the sidecar object" do
       mock_sidecar = double
-      subject.stub(sidecar: mock_sidecar)
-      mock_sidecar.should_receive(:update).with(data: { 'a' => 1 })
+      allow(subject).to receive_messages(sidecar: mock_sidecar)
+      expect(mock_sidecar).to receive(:update).with(data: { 'a' => 1 })
       subject.update exhibit, sidecar: { data: { 'a' => 1 }}
     end
     it "should store tags" do
       subject.update exhibit, exhibit_tag_list: "paris, normandy"
-      subject.tags_from(exhibit).should eq ['paris', 'normandy']
+      expect(subject.tags_from(exhibit)).to eq ['paris', 'normandy']
     end
   end
 
@@ -96,13 +96,13 @@ describe SolrDocument do
 
   describe "#make_public!" do
     it "should set the object to public" do
-      subject.stub(:reindex)
+      allow(subject).to receive(:reindex)
       subject.make_public! exhibit
       expect(subject).not_to be_private exhibit
     end
 
     it "should augment existing sidecar data" do
-      subject.stub(:reindex)
+      allow(subject).to receive(:reindex)
 
       subject.update exhibit, sidecar: { data: { a: 1}} 
       subject.make_public! exhibit
@@ -112,9 +112,33 @@ describe SolrDocument do
 
   describe "#make_private!" do
     it "should set the object to private" do
-      subject.stub(:reindex)
+      allow(subject).to receive(:reindex)
       subject.make_private! exhibit
       expect(subject).to be_private exhibit
     end
   end
+
+  describe 'uploaded resources' do
+    let(:uploaded_resource) {
+      SolrDocument.new(
+        Spotlight::Engine.config.full_image_field => "ImageData",
+        spotlight_resource_type_ssm: "spotlight/resources/uploads"
+      )
+    }
+    it 'should not include Spotlight::SolrDocument::UploadedResource when the correct fields are present' do
+      expect(subject).to_not be_kind_of Spotlight::SolrDocument::UploadedResource
+    end
+    it 'should include Spotlight::SolrDocument::UploadedResource when the correct fields are present' do
+      expect(uploaded_resource).to be_kind_of Spotlight::SolrDocument::UploadedResource
+    end
+    describe '#uploaded_resource?' do
+      it 'should return false if the correct fields are not present' do
+        expect(subject).to_not be_uploaded_resource
+      end
+      it 'should return true when the correct fields are present' do
+        expect(uploaded_resource).to be_uploaded_resource
+      end
+    end
+  end
+
 end

data/spec/models/spotlight/ability_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 require 'cancan/matchers'
 
-describe Spotlight::Ability do
+describe Spotlight::Ability, :type => :model do
   before do
-    Spotlight::Search.any_instance.stub(:default_featured_image)
+    allow_any_instance_of(Spotlight::Search).to receive(:default_featured_image)
   end
   let(:exhibit) { FactoryGirl.create(:exhibit) }
   let(:search) {FactoryGirl.create(:published_search, exhibit: exhibit)}
@@ -13,19 +13,19 @@ describe Spotlight::Ability do
 
   describe "a user with no roles" do
     let(:user) { nil }
-    it { should_not be_able_to(:create, exhibit) }
-    it { should be_able_to(:read, exhibit) }
-    it { should be_able_to(:read, page) }
-    it { should_not be_able_to(:create, Spotlight::Page.new(exhibit: exhibit)) }
-    it { should be_able_to(:read, search) }
-    it { should_not be_able_to(:read, unpublished_search) }
-    it { should_not be_able_to(:tag, exhibit) }
+    it { is_expected.not_to be_able_to(:create, exhibit) }
+    it { is_expected.to be_able_to(:read, exhibit) }
+    it { is_expected.to be_able_to(:read, page) }
+    it { is_expected.not_to be_able_to(:create, Spotlight::Page.new(exhibit: exhibit)) }
+    it { is_expected.to be_able_to(:read, search) }
+    it { is_expected.not_to be_able_to(:read, unpublished_search) }
+    it { is_expected.not_to be_able_to(:tag, exhibit) }
   end
 
   describe "a superadmin" do
     let(:user) { FactoryGirl.create(:site_admin) }
 
-    it { should be_able_to(:create,  Spotlight::Exhibit) }
+    it { is_expected.to be_able_to(:create,  Spotlight::Exhibit) }
 
   end
 
@@ -33,49 +33,49 @@ describe Spotlight::Ability do
     let(:user) { FactoryGirl.create(:exhibit_admin, exhibit: exhibit) }
     let(:role) { FactoryGirl.create(:role, exhibit: exhibit) }
 
-    it { should be_able_to(:update, exhibit) }
+    it { is_expected.to be_able_to(:update, exhibit) }
 
-    it { should be_able_to(:index,   role) }
-    it { should be_able_to(:destroy, role) }
-    it { should be_able_to(:update,  role) }
-    it { should be_able_to(:create,  Spotlight::Role) }
-    it { should_not be_able_to(:create,  Spotlight::Exhibit) }
-    it { should be_able_to(:import,  exhibit) }
-    it { should be_able_to(:process_import,  exhibit) }
-    it { should be_able_to(:destroy,  exhibit) }
+    it { is_expected.to be_able_to(:index,   role) }
+    it { is_expected.to be_able_to(:destroy, role) }
+    it { is_expected.to be_able_to(:update,  role) }
+    it { is_expected.to be_able_to(:create,  Spotlight::Role) }
+    it { is_expected.not_to be_able_to(:create,  Spotlight::Exhibit) }
+    it { is_expected.to be_able_to(:import,  exhibit) }
+    it { is_expected.to be_able_to(:process_import,  exhibit) }
+    it { is_expected.to be_able_to(:destroy,  exhibit) }
 
     let(:blacklight_config) { role.exhibit.blacklight_configuration }
-    it { should be_able_to(:edit, Spotlight::Appearance.new(blacklight_config)) }
+    it { is_expected.to be_able_to(:edit, Spotlight::Appearance.new(blacklight_config)) }
   end
 
   describe "a user with curate role" do
     let(:user) { FactoryGirl.create(:exhibit_curator, exhibit: exhibit) }
 
-    it { should_not be_able_to(:update, exhibit) }
-    it { should be_able_to(:curate, exhibit) }
-    it { should be_able_to(:read, exhibit) }
+    it { is_expected.not_to be_able_to(:update, exhibit) }
+    it { is_expected.to be_able_to(:curate, exhibit) }
+    it { is_expected.to be_able_to(:read, exhibit) }
 
-    it { should be_able_to(:create, Spotlight::Search) }
-    it { should be_able_to(:update_all, Spotlight::Search) }
-    it { should be_able_to(:update, search) }
-    it { should be_able_to(:destroy, search) }
+    it { is_expected.to be_able_to(:create, Spotlight::Search) }
+    it { is_expected.to be_able_to(:update_all, Spotlight::Search) }
+    it { is_expected.to be_able_to(:update, search) }
+    it { is_expected.to be_able_to(:destroy, search) }
 
-    it { should be_able_to(:create, Spotlight::Page) }
-    it { should be_able_to(:update_all, Spotlight::Page) }
-    it { should be_able_to(:update, page) }
-    it { should be_able_to(:destroy, page) }
+    it { is_expected.to be_able_to(:create, Spotlight::Page) }
+    it { is_expected.to be_able_to(:update_all, Spotlight::Page) }
+    it { is_expected.to be_able_to(:update, page) }
+    it { is_expected.to be_able_to(:destroy, page) }
 
-    it { should be_able_to(:tag, exhibit) }
+    it { is_expected.to be_able_to(:tag, exhibit) }
 
     let(:contact) { FactoryGirl.create(:contact, exhibit: exhibit) }
 
-    it { should be_able_to(:edit, contact) }
-    it { should be_able_to(:new, contact) }
-    it { should be_able_to(:create, contact) }
-    it { should be_able_to(:destroy, contact) }
+    it { is_expected.to be_able_to(:edit, contact) }
+    it { is_expected.to be_able_to(:new, contact) }
+    it { is_expected.to be_able_to(:create, contact) }
+    it { is_expected.to be_able_to(:destroy, contact) }
 
     let(:role) { FactoryGirl.create(:role, exhibit: user.roles.first.exhibit) }
     let(:blacklight_config) { role.exhibit.blacklight_configuration }
-    it { should_not be_able_to(:edit, Spotlight::Appearance.new(blacklight_config)) }
+    it { is_expected.not_to be_able_to(:edit, Spotlight::Appearance.new(blacklight_config)) }
   end
 end

data/spec/models/spotlight/about_page_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Spotlight::AboutPage do
+describe Spotlight::AboutPage, :type => :model do
   let(:page) { Spotlight::AboutPage.create! exhibit: FactoryGirl.create(:exhibit)  }
-  it {should_not be_feature_page}
-  it {should be_about_page}
+  it {is_expected.not_to be_feature_page}
+  it {is_expected.to be_about_page}
   it "should display the sidebar" do
     expect(page.display_sidebar?).to be_truthy
   end

data/spec/models/spotlight/appearance_spec.rb

@@ -1,26 +1,44 @@
 require 'spec_helper'
 
-describe Spotlight::Appearance do
+describe Spotlight::Appearance, :type => :model do
   let(:config) { FactoryGirl.create(:exhibit).blacklight_configuration }
   subject { Spotlight::Appearance.new config }
 
-  its(:sort_options) { should eq ["title", "type", "date", "source", "identifier"] }
+  describe '#allowed_params' do
+    it 'should include all the sort types and the settable options' do
+      [:relevance, :title, :type, :date, :source, :identifier].each do |sort|
+        expect(subject.allowed_params[sort]). to eq [:enabled, :label, :weight]
+      end
+    end
+  end
 
-  its(:allowed_params) { should eq [:relevance, :title, :type, :date, :source, :identifier] }
+  describe '#searchable' do
+    it 'should be delegated to the exhibit' do
+      expect(config.exhibit).to receive(:searchable)
+      subject.searchable
+    end
+  end
 
-  it "enable_sort_fields" do
-    expect(subject.send(:enable_sort_fields, ['title', 'type'])).to eq( { 'sort_title_ssi asc' => {show: true}, 'sort_type_ssi asc' => {show: true}})
+  describe '#exhibit_params' do
+    it 'should include the searchable parameter' do
+      expect(subject.send(:exhibit_params, searchable: true)).to eq({searchable: true})
+    end
+    it 'should include the main_navigations_attribute parameter when main_navigations is present' do
+      expect(subject.send(:exhibit_params, searchable: false, main_navigations: {a: :a})[:main_navigations_attributes]).to eq([:a])
+    end
   end
 
   describe "#sort_fields" do
     subject { Spotlight::Appearance.new(config).sort_fields }
     describe "when fields are set" do
       before do
-        config.sort_fields = {"score desc, sort_title_ssi asc"=> {show: true}, 'sort_type_ssi asc' => {show: true}}
+        config.sort_fields = {"relevance"=> {enabled: true}, 'type' => {enabled: true}}
+      end
+      it 'should be true' do
+        expect(subject[:relevance][:enabled]).to be_truthy
+        expect(subject[:type][:enabled]).to be_truthy
+        expect(subject[:title][:enabled]).to be_falsey
       end
-      its(:relevance) { should be_truthy }
-      its(:type) { should be_truthy }
-      its(:title) { should be_falsey }
     end
   end
 end